From b87c2e99b94684f6ca0905105d28ab09fc46fd1d Mon Sep 17 00:00:00 2001
From: tongtongstudio <tongtongstudio@outlook.com>
Date: Thu, 17 Nov 2022 09:36:01 +0800
Subject: [PATCH] =?UTF-8?q?version:6.3=20fix:=20update:=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=AE=A1=E6=8E=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |   1 +
 .../aios/fragment/custom/CustomPresenter.java |   2 +-
 .../com/uiui/aios/manager/AmapManager.java    |   7 +-
 .../aios/network/NetInterfaceManager.java     |   6 ++
 app/src/main/res/drawable-hdpi/font_size.png  | Bin 1559 -> 2698 bytes
 .../main/res/drawable/shape_thumb_icon.xml    |   3 +
 .../main/res/layout-land/fragment_control.xml |  80 ++++++++---------
 app/src/main/res/layout-land/item_weather.xml |   6 +-
 .../main/res/layout-port/fragment_control.xml |  82 +++++++++---------
 app/src/main/res/layout-port/item_weather.xml |   6 +-
 11 files changed, 105 insertions(+), 92 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d8e2e6e..ba64424 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,8 +16,8 @@ android {
         applicationId "com.uiui.aios"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 53
-        versionName "6.2"
+        versionCode 54
+        versionName "6.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6070f49..a4ccb22 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -88,6 +88,7 @@
             android:resizeableActivity="true"
             android:resumeWhilePausing="true"
             android:stateNotNeeded="true"
+            android:configChanges="orientation|screenSize|keyboardHidden"
             android:taskAffinity="com.example.taskaffinity.newtask"
             android:windowSoftInputMode="adjustPan">
             <intent-filter>
diff --git a/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java b/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java
index ac5e732..78fb312 100644
--- a/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java
+++ b/app/src/main/java/com/uiui/aios/fragment/custom/CustomPresenter.java
@@ -134,7 +134,7 @@ public class CustomPresenter implements CustomContact.Presenter {
 
     @Override
     public void getAlarmClock() {
-        NetInterfaceManager.getInstance().getAlarmClock(new NetInterfaceManager.AlarmClockCallback() {
+        NetInterfaceManager.getInstance().getAlarmClockFragment(lifecycle, new NetInterfaceManager.AlarmClockCallback() {
             @Override
             public void setAlarmClock(List<AlarmClockData> alarmClockList) {
                 AlarmClockData alarmClockData = AlarmUtils.getInstance().getRecentAlarmClock();
diff --git a/app/src/main/java/com/uiui/aios/manager/AmapManager.java b/app/src/main/java/com/uiui/aios/manager/AmapManager.java
index 5e8cc74..95dd435 100644
--- a/app/src/main/java/com/uiui/aios/manager/AmapManager.java
+++ b/app/src/main/java/com/uiui/aios/manager/AmapManager.java
@@ -8,6 +8,7 @@ import com.amap.api.location.AMapLocation;
 import com.amap.api.location.AMapLocationClient;
 import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.location.AMapLocationListener;
+import com.blankj.utilcode.util.SPUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.tencent.mmkv.MMKV;
@@ -97,7 +98,7 @@ public class AmapManager {
 
     public AMapLocation getNowAMapLocation() {
         if (nowAMapLocation == null) {
-            String aMapLocationjson = mMMKV.decodeString(AMAPLOCATION_JSON_KEY, "");
+            String aMapLocationjson = SPUtils.getInstance().getString(AMAPLOCATION_JSON_KEY, "");
             Type type = new TypeToken<AMapLocation>() {
             }.getType();
             AMapLocation aMapLocation = new Gson().fromJson(aMapLocationjson, type);
@@ -116,12 +117,12 @@ public class AmapManager {
                 Log.d(TAG, "onLocationChanged: " + aMapLocation.toStr());
                 if (aMapLocation.getErrorCode() == 0) {
                     nowAMapLocation = aMapLocation;
-                    mMMKV.encode(AMAPLOCATION_JSON_KEY, aMapLocation.toStr());
+                    SPUtils.getInstance().put(AMAPLOCATION_JSON_KEY, aMapLocation.toStr());
                     mMMKV.encode(LONGITUDE_KEY, String.valueOf(aMapLocation.getLongitude()));
                     mMMKV.encode(LATITUDE_KEY, String.valueOf(aMapLocation.getLatitude()));
                     mMMKV.encode(ADDRESS_KEY, aMapLocation.getAddress());
                 } else {
-                    mMMKV.encode(AMAPLOCATION_JSON_KEY, "");
+                    SPUtils.getInstance().put(AMAPLOCATION_JSON_KEY, "");
                 }
                 aMapLocationListener.onLocationChanged(aMapLocation);
             }
diff --git a/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java
index e82121d..906207d 100644
--- a/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java
+++ b/app/src/main/java/com/uiui/aios/network/NetInterfaceManager.java
@@ -725,6 +725,12 @@ public class NetInterfaceManager {
                 .subscribe(getAlarmClockObserver(callback));
     }
 
+    public void getAlarmClockFragment(BehaviorSubject<FragmentEvent> lifecycle, AlarmClockCallback callback) {
+        getAlarmClockObservable()
+                .compose(RxLifecycle.bindUntilEvent(lifecycle, FragmentEvent.DESTROY))
+                .subscribe(getAlarmClockObserver(callback));
+    }
+
     public void getAlarmClock(AlarmClockCallback callback) {
         getAlarmClockObservable()
                 .subscribe(getAlarmClockObserver(callback));
diff --git a/app/src/main/res/drawable-hdpi/font_size.png b/app/src/main/res/drawable-hdpi/font_size.png
index eac86f376d773d45aebb68c64002c696bdd9d298..84e2d3f9f3cad902dfeb670a8dada964d8d17312 100644
GIT binary patch
delta 2660
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
SbN0~y0000<MNUMnLSTaH?H_;u

delta 1512
zcmV<E1sD2?6_*SliBL{Q4GJ0x0000DNk~Le0000`0000`2nGNE0FDvzt&t%^e+8XM
zL_t(|+U%TbY*a-Q$A4uhN`zno1S%AKlz>W!+J<Q2BUX(f1~HOY1;mKZq9IzfiHVO7
z`az?D28*^tVgdmzAytDhL~B$&fTjp42>3#+A=XFZqqR_5bNq0pNnP)p?%v+nuDkP3
zHtFt}JNMrIJu~Nj&dhCrh~N<&e<M5vo<L8aC(sk<;R*BvdICLx9-cr?peHar%mAJS
zJ_Wh~0eXOMfhT~O*-l`=FcuSP4SCu_>;+Z>jot(QjmLqtDV)C$XfSQP2O2B{UX5_v
z4Zv&pPT)A;8=xq{v3)=>@Jl`q;kzS}2QU(NIG;T*0elBcvDhC2T7heUe;P}hzk#z%
zKiL5h$<(Jx?06%oZIjY=O9rob&`%~ka4%49u~h&c4ftMS=E{Vn{T$#xKFxs@3V9zU
zkq7WS@SM`$ntTf)wTjI~)T6+0i|s1ll6)a>3Q%RS9Rs#mY`>ax&W5%5Lf}f}JdGw@
zv*AggLzxz?%XJx3Xe39me?=IV0PTbHu^L!su^j=<&Sek0$wD4x=(eZO$9fZy!!Qe2
zn#&%zA2`oqyTI5}K^5?_GLM!5CvwdL=PKmwPJ=vvSAdU|AXSr#L-=0Bwk|?{_bIj|
zxi*ALfHsS*4LH-}wdrD)MgJWz*-6fL;7Y~T5Rtt8YEBq7<We!Ae^5l)Eroy{5t%r|
z{+Ei#Zv*<=Fr3ANkq(~8Ex;rt82miM{x<_Hz_~_aewk}B<`ZQ;DgzEWzNZ8*O39;R
zMcf{EkwV@shvc0CR0CH4vw<<d7r<vgGw|mBWe(h~6hd!wG!Ly1kv7rMDk5br&L3xI
z)0G=IDk23AZlGRLe@C~7Tpjl{#3^H{72ER!yAI;SgTP&Bv>y%ZG#WMQg2+iGCmkPR
z`$>t)Q8CE~@=+0v-3iRgwji>^LLR_-zyx4oiV^g8f|9<5x`^ZfTmxKcf?C!DkwePd
z(<LIkY0Oo<BC<zB=0*_eA|jha<N-79+R&6uL1clrL8pj}e-Am|eC3$t0qrJ>NQd%}
zCS*$xxyO;h8e^%lXa&?q2K?P_@^0JIwKyA!31<M8I~4k-CVejg=3Ckx3=!%ZmA-4T
zfxuOcGo|LF@7Ej848zut-;M(BSlZ7rnbWWlcrviU5pjPRjhDRp;AZ8RCd==Q5zB7Q
zbzlwfg2mPXe{3-is31*Q)dlP^-ZK!>2o{&Z9{RgLr6P@vS+r=k`Mqm6WXxeD8kRUn
z+v=3_EgR(6HOjH8hC{|&rd&{qqoTonMQ0Wba%`z`y?cj4#?&dcXB^Cl=VM>t+d;4m
zM8j7~=25Qn?PLgRPxEs}-uILuh)++kkJ%#9XX&Rtf0HGBO}eaiwD7gaV(SBzr?^O!
zFzphSWr+KUusEM?6dn!y2#gJ}9XAoJGiCy>1m4a-b^cbf-r`gT-fkfe;3Ws-LFN|C
zBWc=nJ@5$j*RM)}uVcQcu>>n`MHwP-rddmI;(?V4d2cx&4`4wC$pg5}<q+1Si>uwD
zi^(jOe-rF!jC}~tP+a>kaE^nUnQGFxup8<z+AfNY?K5fNIE#HD@Os=O{W}#~y(4c}
zq<BNEl82{)3WAq<!cd(KfvI|6r=^VaCop+P$+#V@=0=mz1)LT`#NVxyv!-L;T^4B$
zwAJ8VbVOd6g}naMEe^TVpxBmWs-XI;Ls3f_e}&U1*arMzvE30jfjuF=Z6tU#KW-En
z`4Wa72-bDuzzJZJ#WpQ&0xt#*B@H82`;v>W?;hB0qG((g^1l*DCleV#u)Veew_DT_
zzz3E&upHPI^ZE7>l*|6ZjjM82CO-2*N=};{ovSkBTsyMyb=Pz;hoE#;47`t<LTx`T
zJ~aAoD#6>M54kEPc*HDYJb|79PoO8z6X*%_@C14SJ%OG;4^Lpm@y`H2gCU21Zf#Zo
O0000<MNUMnLSTZN{I%Ku

diff --git a/app/src/main/res/drawable/shape_thumb_icon.xml b/app/src/main/res/drawable/shape_thumb_icon.xml
index 925c488..1620744 100644
--- a/app/src/main/res/drawable/shape_thumb_icon.xml
+++ b/app/src/main/res/drawable/shape_thumb_icon.xml
@@ -5,6 +5,9 @@
     <size
         android:width="@dimen/dp_14"
         android:height="@dimen/dp_14" />
+    <stroke
+        android:width="@dimen/dp_2"
+        android:color="#e1e8f0" />
 
     <solid android:color="#535353" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_control.xml b/app/src/main/res/layout-land/fragment_control.xml
index 2f2d5b8..0329166 100644
--- a/app/src/main/res/layout-land/fragment_control.xml
+++ b/app/src/main/res/layout-land/fragment_control.xml
@@ -7,7 +7,6 @@
     android:background="@drawable/control_background"
     tools:context=".fragment.ControlFragment">
 
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
@@ -39,8 +38,8 @@
 
                     <ImageView
                         android:id="@+id/iv_flashlight"
-                        android:layout_width="@dimen/dp_48"
-                        android:layout_height="@dimen/dp_48"
+                        android:layout_width="@dimen/dp_40"
+                        android:layout_height="@dimen/dp_40"
                         android:layout_marginStart="@dimen/dp_8"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -53,14 +52,15 @@
                         android:id="@+id/tv_flashlight"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_32"
                         android:text="00:00"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_15"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.211"
+                        app:layout_constraintHorizontal_bias="0.234"
                         app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.32" />
 
                     <TextView
                         android:id="@+id/tv_flashlight_switch"
@@ -70,10 +70,9 @@
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="@+id/tv_flashlight"
                         app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
                         app:layout_constraintTop_toBottomOf="@+id/tv_flashlight"
-                        app:layout_constraintVertical_bias="0.285" />
+                        app:layout_constraintVertical_bias="0.2" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -86,8 +85,8 @@
 
                     <ImageView
                         android:id="@+id/iv_wifi"
-                        android:layout_width="@dimen/dp_48"
-                        android:layout_height="@dimen/dp_48"
+                        android:layout_width="@dimen/dp_40"
+                        android:layout_height="@dimen/dp_40"
                         android:layout_marginStart="@dimen/dp_8"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -100,14 +99,15 @@
                         android:id="@+id/tv_wifi"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_32"
                         android:text="WIFI"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_15"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.211"
+                        app:layout_constraintHorizontal_bias="0.234"
                         app:layout_constraintStart_toEndOf="@+id/iv_wifi"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.32" />
 
                     <TextView
                         android:id="@+id/tv_wifi_ssid"
@@ -117,10 +117,9 @@
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="@+id/tv_wifi"
                         app:layout_constraintStart_toStartOf="@+id/tv_wifi"
                         app:layout_constraintTop_toBottomOf="@+id/tv_wifi"
-                        app:layout_constraintVertical_bias="0.285" />
+                        app:layout_constraintVertical_bias="0.2" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
             </LinearLayout>
@@ -180,7 +179,6 @@
                 android:layout_weight="1"
                 android:background="@drawable/control_background_item">
 
-
                 <com.uiui.aios.view.RulerSeekBar
                     android:id="@+id/seekBar"
                     android:layout_width="0dp"
@@ -192,15 +190,16 @@
                     android:progressDrawable="@drawable/shape_progress_drawable"
                     android:thumb="@drawable/shape_thumb_icon"
                     android:thumbOffset="0dp"
-                    app:layout_constraintBottom_toTopOf="@+id/linearLayout"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="@+id/linearLayout"
                     app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="@+id/linearLayout"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <ImageView
-                    android:layout_width="@dimen/dp_24"
-                    android:layout_height="@dimen/dp_24"
+                    android:id="@+id/imageView"
+                    android:layout_width="@dimen/dp_36"
+                    android:layout_height="@dimen/dp_36"
                     android:layout_marginStart="@dimen/dp_8"
                     android:src="@drawable/font_size"
                     app:layout_constraintBottom_toBottomOf="parent"
@@ -209,19 +208,19 @@
 
                 <LinearLayout
                     android:id="@+id/linearLayout"
-                    android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
-                    android:layout_marginStart="@dimen/dp_32"
-                    android:layout_marginEnd="@dimen/dp_32"
-                    app:layout_constraintBottom_toBottomOf="parent">
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/imageView"
+                    app:layout_constraintTop_toBottomOf="@+id/seekBar">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-
-                        android:gravity="center"
+                        android:gravity="start"
+                        android:paddingStart="@dimen/dp_8"
                         android:text="标准"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_11"
@@ -247,7 +246,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:gravity="center"
+                        android:gravity="end"
+                        android:paddingEnd="@dimen/dp_8"
                         android:text="最大"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_11"
@@ -295,8 +295,8 @@
 
                     <ImageView
                         android:id="@+id/iv_bt"
-                        android:layout_width="@dimen/dp_48"
-                        android:layout_height="@dimen/dp_48"
+                        android:layout_width="@dimen/dp_40"
+                        android:layout_height="@dimen/dp_40"
                         android:layout_marginStart="@dimen/dp_8"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -309,14 +309,15 @@
                         android:id="@+id/tv_bt"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_32"
                         android:text="蓝牙"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_15"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.211"
+                        app:layout_constraintHorizontal_bias="0.234"
                         app:layout_constraintStart_toEndOf="@+id/iv_bt"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.32" />
 
                     <TextView
                         android:id="@+id/tv_bt_ssid"
@@ -326,10 +327,9 @@
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="@+id/tv_bt"
                         app:layout_constraintStart_toStartOf="@+id/tv_bt"
                         app:layout_constraintTop_toBottomOf="@+id/tv_bt"
-                        app:layout_constraintVertical_bias="0.285" />
+                        app:layout_constraintVertical_bias="0.2" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -342,8 +342,8 @@
 
                     <ImageView
                         android:id="@+id/iv_battery"
-                        android:layout_width="@dimen/dp_48"
-                        android:layout_height="@dimen/dp_48"
+                        android:layout_width="@dimen/dp_40"
+                        android:layout_height="@dimen/dp_40"
                         android:layout_marginStart="@dimen/dp_8"
                         android:adjustViewBounds="true"
                         android:scaleType="centerCrop"
@@ -356,14 +356,15 @@
                         android:id="@+id/tv_battery"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_32"
                         android:text="电量"
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_15"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.211"
+                        app:layout_constraintHorizontal_bias="0.234"
                         app:layout_constraintStart_toEndOf="@+id/iv_battery"
-                        app:layout_constraintTop_toTopOf="parent" />
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.32" />
 
                     <TextView
                         android:id="@+id/tv_electricity"
@@ -373,11 +374,10 @@
                         android:textColor="@color/white"
                         android:textSize="@dimen/sp_12"
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="@+id/tv_battery"
                         app:layout_constraintStart_toEndOf="@+id/tv_battery"
                         app:layout_constraintStart_toStartOf="@+id/tv_battery"
                         app:layout_constraintTop_toBottomOf="@+id/tv_battery"
-                        app:layout_constraintVertical_bias="0.285" />
+                        app:layout_constraintVertical_bias="0.2" />
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </LinearLayout>
 
diff --git a/app/src/main/res/layout-land/item_weather.xml b/app/src/main/res/layout-land/item_weather.xml
index ba1ad16..db8cef0 100644
--- a/app/src/main/res/layout-land/item_weather.xml
+++ b/app/src/main/res/layout-land/item_weather.xml
@@ -29,7 +29,7 @@
             android:maxLines="1"
             android:singleLine="true"
             android:text="17:48"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_20"
             app:layout_constraintBottom_toTopOf="@+id/iv_weather"
             app:layout_constraintEnd_toEndOf="parent"
@@ -52,7 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_8"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_20"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -64,7 +64,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_8"
             android:text="15-22"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="26sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout-port/fragment_control.xml b/app/src/main/res/layout-port/fragment_control.xml
index baf5b88..0962e1e 100644
--- a/app/src/main/res/layout-port/fragment_control.xml
+++ b/app/src/main/res/layout-port/fragment_control.xml
@@ -10,6 +10,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginBottom="@dimen/dp_12"
         android:orientation="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
@@ -46,24 +47,24 @@
                     android:id="@+id/tv_flashlight"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_28"
-                    android:text="手电筒"
+                    android:text="00:00"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_17"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.25"
+                    app:layout_constraintHorizontal_bias="0.2"
                     app:layout_constraintStart_toEndOf="@+id/iv_flashlight"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.3" />
 
                 <TextView
                     android:id="@+id/tv_flashlight_switch"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_12"
-                    android:text="关"
+                    android:layout_marginTop="@dimen/dp_6"
+                    android:text="11月15日"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_flashlight"
                     app:layout_constraintStart_toStartOf="@+id/tv_flashlight"
                     app:layout_constraintTop_toBottomOf="@+id/tv_flashlight" />
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -93,24 +94,24 @@
                     android:id="@+id/tv_wifi"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_28"
                     android:text="WIFI"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_17"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.25"
+                    app:layout_constraintHorizontal_bias="0.2"
                     app:layout_constraintStart_toEndOf="@+id/iv_wifi"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.3" />
 
                 <TextView
                     android:id="@+id/tv_wifi_ssid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginTop="@dimen/dp_6"
                     android:text="ssid"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_wifi"
                     app:layout_constraintStart_toStartOf="@+id/tv_wifi"
                     app:layout_constraintTop_toBottomOf="@+id/tv_wifi" />
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -147,24 +148,24 @@
                     android:id="@+id/tv_bt"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_28"
                     android:text="蓝牙"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_17"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.25"
+                    app:layout_constraintHorizontal_bias="0.2"
                     app:layout_constraintStart_toEndOf="@+id/iv_bt"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.3" />
 
                 <TextView
                     android:id="@+id/tv_bt_ssid"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginTop="@dimen/dp_6"
                     android:text="ssid"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_bt"
                     app:layout_constraintStart_toStartOf="@+id/tv_bt"
                     app:layout_constraintTop_toBottomOf="@+id/tv_bt" />
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -193,24 +194,24 @@
                     android:id="@+id/tv_battery"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_28"
                     android:text="电量"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_16"
+                    android:textSize="@dimen/sp_17"
+                    app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.25"
+                    app:layout_constraintHorizontal_bias="0.2"
                     app:layout_constraintStart_toEndOf="@+id/iv_battery"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_bias="0.3" />
 
                 <TextView
                     android:id="@+id/tv_electricity"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginTop="@dimen/dp_6"
                     android:text="100%"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
-                    app:layout_constraintEnd_toEndOf="@+id/tv_battery"
                     app:layout_constraintStart_toStartOf="@+id/tv_battery"
                     app:layout_constraintTop_toBottomOf="@+id/tv_battery" />
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -323,11 +324,8 @@
 
             <com.uiui.aios.view.RulerSeekBar
                 android:id="@+id/seekBar"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/dp_32"
-                android:layout_marginTop="@dimen/dp_8"
-                android:layout_marginEnd="@dimen/dp_32"
                 android:max="3"
                 android:maxHeight="@dimen/dp_14"
                 android:minHeight="@dimen/dp_14"
@@ -335,15 +333,15 @@
                 android:progressDrawable="@drawable/shape_progress_drawable"
                 android:thumb="@drawable/shape_thumb_icon"
                 android:thumbOffset="0dp"
-                app:layout_constraintBottom_toTopOf="@+id/linearLayout4"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="@+id/linearLayout4"
+                app:layout_constraintStart_toStartOf="@+id/linearLayout4"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <ImageView
-                android:layout_width="@dimen/dp_24"
-                android:layout_height="@dimen/dp_24"
+                android:id="@+id/imageView4"
+                android:layout_width="@dimen/dp_36"
+                android:layout_height="@dimen/dp_36"
                 android:layout_marginStart="@dimen/dp_8"
                 android:src="@drawable/font_size"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -352,16 +350,19 @@
 
             <LinearLayout
                 android:id="@+id/linearLayout4"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
-                app:layout_constraintBottom_toBottomOf="parent">
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@+id/imageView4"
+                app:layout_constraintTop_toBottomOf="@+id/seekBar">
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="center"
+                    android:gravity="start"
+                    android:paddingStart="@dimen/dp_8"
                     android:text="标准"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
@@ -387,7 +388,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="center"
+                    android:gravity="end"
+                    android:paddingEnd="@dimen/dp_8"
                     android:text="最大"
                     android:textColor="@color/white"
                     android:textSize="@dimen/sp_12"
diff --git a/app/src/main/res/layout-port/item_weather.xml b/app/src/main/res/layout-port/item_weather.xml
index e78cccf..63c8c08 100644
--- a/app/src/main/res/layout-port/item_weather.xml
+++ b/app/src/main/res/layout-port/item_weather.xml
@@ -32,7 +32,7 @@
             android:layout_marginStart="@dimen/dp_32"
             android:layout_marginTop="@dimen/dp_32"
             android:text="17:48"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_20"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -53,7 +53,7 @@
             android:id="@+id/tv_weather"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_20"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -66,7 +66,7 @@
             android:layout_height="wrap_content"
             android:text="15-22"
             android:layout_marginTop="@dimen/dp_8"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="26sp"
             app:layout_constraintEnd_toEndOf="@+id/iv_weather"
             app:layout_constraintStart_toStartOf="@+id/iv_weather"