Merge branch 'master' of github.com:a2633063/SmartControl_Android_MQTT

lingduyi · Jul 20, 2023 · 2fe72fb · 2fe72fb
2 parents 79a74b3 + 3a6b2c0
commit 2fe72fb
Show file tree

Hide file tree

Showing 51 changed files with 3,239 additions and 2,007 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 53
-        versionName "v1.11.3"
+        versionName "v1.12.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -28,18 +28,18 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-
-//    implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
-    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:+'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+    //implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
+    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
-    implementation project(':esptouch')
+    //implementation project(':esptouch')
 
     //EasyLink  广播组播同时发的版本
-    implementation 'io.fogcloud.sdk:easylinkv3:+'
+    //implementation 'io.fogcloud.sdk:easylinkv3:'
 
 
     implementation project(':LineTable')//分享

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,7 +11,7 @@
       "type": "SINGLE",
       "filters": [],
       "versionCode": 53,
-      "versionName": "v1.11.3",
+      "versionName": "v1.12.0",
       "outputFile": "app-release.apk"
     }
   ]

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -154,8 +154,8 @@
             android:label="z485toMqtt配网"
             android:screenOrientation="portrait" />
         <activity
-            android:name="com.easylink.EasylinkActivity"
-            android:label="添加设备"
+            android:name=".deviceItem.z863key.z863keyTaskActivity"
+            android:label="z86_3key自动化任务"
             android:screenOrientation="portrait" />
         <activity
             android:name=".deviceItem.SettingActivity"