liuzhenxing 3 年之前
父節點
當前提交
d8eb824176

+ 1 - 0
.idea/misc.xml

@@ -47,6 +47,7 @@
         <entry key="app/src/main/res/layout/view_message_text.xml" value="0.1" />
         <entry key="app/src/main/res/layout/view_sure.xml" value="0.1" />
         <entry key="app/src/main/res/layout/view_textview.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/wifi_connected_activity.xml" value="0.14311043566362716" />
       </map>
     </option>
   </component>

+ 0 - 1
app/src/main/java/com/xplora/xpsettings/Activity/WiFiControlActivity.java

@@ -17,7 +17,6 @@ public class WiFiControlActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.wifi_connected_activity);
-
         initData();
         initView();
     }

+ 19 - 12
app/src/main/res/layout/wifi_connected_activity.xml

@@ -9,38 +9,45 @@
     <Button
         android:id="@+id/button0"
         android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_marginStart="5dp"
-        android:layout_marginEnd="5dp"
+        android:layout_height="34dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
         android:layout_alignBottom="@+id/button1"
-        android:layout_marginBottom="32dp"
+        android:layout_marginBottom="38dp"
         android:background="@drawable/button_shape"
         android:textColor="#FFFFFFFF"
+        android:textSize="12sp"
+        android:textFontWeight="700"
         >
     </Button>
 
     <Button
         android:id="@+id/button1"
         android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_marginStart="5dp"
-        android:layout_marginEnd="5dp"
+        android:layout_height="34dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
         android:layout_alignBottom="@+id/button2"
-        android:layout_marginBottom="32dp"
+        android:layout_marginBottom="38dp"
         android:background="@drawable/button_shape"
         android:textColor="#FFFFFFFF"
+        android:textSize="12sp"
+        android:textFontWeight="700"
         >
     </Button>
 
     <Button
         android:id="@+id/button2"
         android:layout_width="match_parent"
-        android:layout_height="30dp"
-        android:layout_marginStart="5dp"
-        android:layout_marginEnd="5dp"
+        android:layout_height="34dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="30dp"
         android:layout_alignParentBottom="true"
         android:background="@drawable/button_shape"
-        android:textColor="#FF0DA8FF"
+        android:textColor="#FFFF1E54"
+        android:textSize="12sp"
+        android:textFontWeight="700"
         >
     </Button>
 

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -7,7 +7,7 @@
     <string name="button_retry">Retry</string>
     <string name="button_gotowifi">Go to WiFi</string>
     <string name="button_updatenow">Update Now</string>
-    <string name="button_disconnected">Disconnected</string>
+    <string name="button_disconnected">Disconnect</string>
     <string name="button_connect">Connect</string>
     <string name="button_forget">Forget</string>