liuyuqi-dellpc 5 years ago
parent
commit
66a3b45e1b

+ 3 - 3
res/layout/activity_main.xml

@@ -34,15 +34,15 @@
             android:id="@+id/edt_port"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="1080" />
+            android:text="@string/v_port" />
 
         <Button
             android:id="@+id/button1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/set_wifi_proxy"
-            android:layout_marginTop="50sp" />
+            android:layout_marginTop="50sp"
+            android:text="@string/set_wifi_proxy" />
     </LinearLayout>
 
 </RelativeLayout>

+ 2 - 1
res/values/strings.xml

@@ -5,8 +5,9 @@
     <string name="hello_world">Hello world!</string>
     <string name="action_settings">Settings</string>
     <string name="port_">port:</string>
+    <string name="v_port">1080</string>
     <string name="v_host">192.168.6.100</string>
     <string name="set_wifi_proxy">设置WIFI代理</string>
     <string name="cancel_wifi_proxy">取消WIFI代理</string>
 
-</resources>
+</resources>

+ 2 - 2
src/me/yoqi/wifiproxy/MainActivity.java

@@ -39,8 +39,8 @@ public class MainActivity extends AppCompatActivity {
 
 		// 恢复设置
 		sharedPreferences = mContext.getSharedPreferences("setting", Context.MODE_PRIVATE);
-		String host = sharedPreferences.getString("host", "192.168.6.100");
-		String port = sharedPreferences.getString("port", "1080");
+		String host = sharedPreferences.getString("host", getString(R.string.v_host));
+		String port = sharedPreferences.getString("port", getString(R.string.v_port));
 		edt_host.setText(host);
 		edt_port.setText(port);
 

+ 2 - 1
src/me/yoqi/wifiproxy/utils/WifiProxyManager.java

@@ -60,7 +60,6 @@ public class WifiProxyManager {
 	 * @param mIpConfiguration
 	 */
 	private static void setDeclardFildObject(WifiConfiguration config, String string, Object mIpConfiguration) {
-		// TODO Auto-generated method stub
 
 	}
 
@@ -125,6 +124,7 @@ public class WifiProxyManager {
 			wifiManager.disconnect();
 			wifiManager.reconnect();
 		} catch (Exception e) {
+			
 		}
 	}
 
@@ -159,6 +159,7 @@ public class WifiProxyManager {
 			wifiManager.disconnect();
 			wifiManager.reconnect();
 		} catch (Exception e) {
+			
 		}
 	}
 }