易控V1.0.3-dev

仍为测试版本此版本修复了设置默认打开后崩溃的问题此版本开始支持arm64、arm32、x86、x86_64位系统
mingzhixian · Aug 28, 2023 · 3cf356d · 3cf356d
1 parent c16019b
commit 3cf356d
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 56 deletions.
diff --git a/easycontrol/.gradle/8.0/executionHistory/executionHistory.lock b/easycontrol/.gradle/8.0/executionHistory/executionHistory.lock
diff --git a/easycontrol/.gradle/8.0/fileHashes/fileHashes.bin b/easycontrol/.gradle/8.0/fileHashes/fileHashes.bin
diff --git a/easycontrol/.gradle/8.0/fileHashes/fileHashes.lock b/easycontrol/.gradle/8.0/fileHashes/fileHashes.lock
diff --git a/easycontrol/.gradle/8.0/fileHashes/resourceHashesCache.bin b/easycontrol/.gradle/8.0/fileHashes/resourceHashesCache.bin
diff --git a/easycontrol/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/easycontrol/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/easycontrol/.gradle/file-system.probe b/easycontrol/.gradle/file-system.probe
diff --git a/easycontrol/.idea/workspace.xml b/easycontrol/.idea/workspace.xml
diff --git a/easycontrol/app/build.gradle b/easycontrol/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "top.saymzx.easycontrol.app"
         minSdk 23
         targetSdk 33
-        versionCode 10002
-        versionName "1.0.2_dev"
+        versionCode 10003
+        versionName "1.0.3_dev"
         resConfigs "zh"
         resConfigs "xhdpi"
         javaCompileOptions {
@@ -33,7 +33,7 @@ android {
     buildTypes {
         release {
             ndk {
-                abiFilter "arm64-v8a"
+                abiFilters "arm64-v8a","armeabi-v7a","x86","x86_64"
             }
             debuggable false
             minifyEnabled true

diff --git a/easycontrol/app/src/main/java/top/saymzx/easycontrol/app/MasterActivity.kt b/easycontrol/app/src/main/java/top/saymzx/easycontrol/app/MasterActivity.kt
@@ -69,7 +69,9 @@ class MasterActivity : Activity() {
       appData.mainScope.launch {
         withContext(Dispatchers.IO) {
           val devices = appData.dbHelper.devices().getById(appData.setting.defaultDevice)
-          if (devices.isNotEmpty()) FloatWindow(devices[0])
+          withContext(Dispatchers.Main){
+            if (devices.isNotEmpty()) FloatWindow(devices[0])
+          }
         }
       }
     }

diff --git a/easycontrol/server/build.gradle b/easycontrol/server/build.gradle
@@ -10,14 +10,14 @@ android {
         minSdk 23
         targetSdk 33
         applicationId 'top.saymzx.easycontrol.server'
-        versionCode 10002
-        versionName '1.0.2'
+        versionCode 10003
+        versionName '1.0.3'
     }
 
     buildTypes {
         release {
             ndk {
-                abiFilter "arm64-v8a"
+                abiFilters "arm64-v8a", "armeabi-v7a", "x86", "x86_64"
             }
             debuggable false
             minifyEnabled true