更新V1.1.8

- 修复小窗模式下导航栏错位的问题
mingzhixian · Nov 21, 2023 · ce298cf · ce298cf
1 parent 4fcb97d
commit ce298cf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/easycontrol/app/build.gradle b/easycontrol/app/build.gradle
@@ -10,8 +10,8 @@ android {
     applicationId "top.saymzx.easycontrol.app"
     minSdk 21
     targetSdk 34
-    versionCode 10107
-    versionName "1.1.7"
+    versionCode 10108
+    versionName "1.1.8"
     resConfigs "zh"
     resConfigs "xhdpi"
     ndk {

diff --git a/easycontrol/app/src/main/java/top/saymzx/easycontrol/app/client/Client.java b/easycontrol/app/src/main/java/top/saymzx/easycontrol/app/client/Client.java
@@ -113,7 +113,7 @@ private void startServer(Device device) throws IOException, InterruptedException
 
   // 连接Server
   private void connectServer() throws Exception {
-    Thread.sleep(50);
+    Thread.sleep(100);
     // 尝试连接
     for (int i = 0; i < 60; i++) {
       try {

diff --git a/easycontrol/app/src/main/res/layout/module_small_view.xml b/easycontrol/app/src/main/res/layout/module_small_view.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
   android:background="@color/cardBackground"
   android:orientation="vertical">
 
@@ -60,7 +60,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
-      android:layout_marginTop="29dp"
+      android:layout_marginTop="24dp"
       android:background="@drawable/background_cron"
       android:backgroundTint="@color/cardBackgroundTranslucent"
       android:padding="5dp">
@@ -158,4 +158,4 @@
       android:layout_height="wrap_content"
       android:layout_weight="1" />
   </LinearLayout>
-</FrameLayout>
+</LinearLayout>
diff --git a/easycontrol/server/src/main/java/top/saymzx/easycontrol/server/entity/Device.java b/easycontrol/server/src/main/java/top/saymzx/easycontrol/server/entity/Device.java
@@ -78,7 +78,7 @@ public static void changeDeviceSize(float reSize) throws IOException, Interrupte
     newDeivceSize = new Pair<>(newDeivceSize.first + 4 & ~7, newDeivceSize.second + 4 & ~7);
     Device.execReadOutput("wm size " + newDeivceSize.first + "x" + newDeivceSize.second);
     // 更新
-    Thread.sleep(videoSize == null ? 300 : 500);
+    Thread.sleep(500);
     getDeivceSize();
     VideoEncode.isHasChangeConfig = true;
   }