fix 壁纸切换不保存的错误

zcloud01 · zcloud01 · commit 5d44a69f50e8 · 2014-09-29T19:32:02.000+08:00
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -36,9 +36,9 @@
 	<string name="ani_time2">500</string>
 	<string name="ani_timestartof">150</string>
 	
-	<string name="no_network">请检查网络设置！</string>
+	<string name="no_network">请检查网络设置</string>
 	<string name="network_exception">网络异常，请稍后再试</string>
-	<string name="no_update">暂无更新！</string>
+	<string name="no_update">暂无更新</string>
 	
 	<string-array name="save_days">
 	    <item>3天</item>
@@ -55,4 +55,6 @@
     <string name="hourago">小时前</string>
     <string name="dayago">天前</string>
 	
+    <string name="bg_switch_success">设置成功</string>
+    
 </resources>
diff --git a/src/com/dreamteam/app/commons/CopyOfSeriaHelper.java b/src/com/dreamteam/app/commons/CopyOfSeriaHelper.java
diff --git a/src/com/dreamteam/app/ui/Main.java b/src/com/dreamteam/app/ui/Main.java
@@ -262,7 +262,8 @@ private void switchMode()
 		if(isNight)
 		{
 			isNight = false;
-			bgLayout.setBackgroundResource(R.drawable.home_bg_default);
+			int resid = AppContext.getPrefrences(this).getInt("home_bg", R.drawable.home_bg_default);
+			bgLayout.setBackgroundResource(resid);
 			switchModeBtn.setImageResource(R.drawable.composer_sun);
 			Toast.makeText(Main.this, R.string.switch2Day, Toast.LENGTH_SHORT).show();
 		}
@@ -342,7 +343,11 @@ private void initView()
 		switchModeBtn = (ImageButton) findViewById(R.id.composer_btn_moon);
 		pageTv = (TextView) findViewById(R.id.home_page_tv);
 		homeLoadingLayout = (RelativeLayout) findViewById(R.id.home_loading_layout);
+		
 		bgLayout = (RelativeLayout) findViewById(R.id.home_bg_layout);
+		int resid = AppContext.getPrefrences(this).getInt("home_bg", R.drawable.home_bg_default); 
+		bgLayout.setBackgroundResource(resid);
+		
 		mPager = (ViewPager) findViewById(R.id.home_pager);
 		mPager.setOnPageChangeListener(new OnPageChangeListener()
 		{
diff --git a/src/com/dreamteam/app/ui/SwitchBg.java b/src/com/dreamteam/app/ui/SwitchBg.java
@@ -45,9 +45,8 @@ public void onCreate(Bundle savedInstanceState)
 	{
 		super.onCreate(savedInstanceState);
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
-
 		setContentView(R.layout.switch_bg);
-
+		
 		mSwitcher = (ImageSwitcher) findViewById(R.id.switcher);
 		mSwitcher.setFactory(this);
 		mSwitcher.setInAnimation(AnimationUtils.loadAnimation(this,
@@ -83,7 +82,7 @@ public void onClick(View v)
 				intent.setAction(SWITCH_HOME_BG);
 				intent.putExtra("home_bg_id", mImageIds[selectedPosition]);
 				sendBroadcast(intent);
-				Toast.makeText(SwitchBg.this, "设置成功！", Toast.LENGTH_SHORT).show();
+				Toast.makeText(SwitchBg.this, R.string.bg_switch_success, Toast.LENGTH_SHORT).show();
 			}
 		});
 	}

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ public void onCreate(Bundle savedInstanceState)`
`45`	`45`	`{`
`46`	`46`	`super.onCreate(savedInstanceState);`
`47`	`47`	`requestWindowFeature(Window.FEATURE_NO_TITLE);`
`48`		`-`
`49`	`48`	`setContentView(R.layout.switch_bg);`
`50`		`-`
	`49`	`+`
`51`	`50`	`mSwitcher = (ImageSwitcher) findViewById(R.id.switcher);`
`52`	`51`	`mSwitcher.setFactory(this);`
`53`	`52`	`mSwitcher.setInAnimation(AnimationUtils.loadAnimation(this,`
`@@ -83,7 +82,7 @@ public void onClick(View v)`
`83`	`82`	`intent.setAction(SWITCH_HOME_BG);`
`84`	`83`	`intent.putExtra("home_bg_id", mImageIds[selectedPosition]);`
`85`	`84`	`sendBroadcast(intent);`
`86`		`- Toast.makeText(SwitchBg.this, "设置成功！", Toast.LENGTH_SHORT).show();`
	`85`	`+ Toast.makeText(SwitchBg.this, R.string.bg_switch_success, Toast.LENGTH_SHORT).show();`
`87`	`86`	`}`
`88`	`87`	`});`
`89`	`88`	`}`