fixed network chage state issues.

diff --git a/app/FotaBrand8541e/release/FotaBrand8541e_V1_202102031807_release.apk b/app/FotaBrand8541e/release/FotaBrand8541e_V1_202102031807_release.apk
deleted file mode 100644 (file)
index 9688da4..0000000
Binary files a/app/FotaBrand8541e/release/FotaBrand8541e_V1_202102031807_release.apk and /dev/null differ

diff --git a/app/FotaBrand8541e/release/output-metadata.json b/app/FotaBrand8541e/release/output-metadata.json
deleted file mode 100644 (file)
index 2b7bdab..0000000
--- a/app/FotaBrand8541e/release/output-metadata.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "version": 2,
-  "artifactType": {
-    "type": "APK",
-    "kind": "Directory"
-  },
-  "applicationId": "com.ic.icfotaclient",
-  "variantName": "processFotaBrand8541eReleaseResources",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "versionCode": 1,
-      "versionName": "1.0",
-      "outputFile": "FotaBrand8541e_V1_202102031807_release.apk"
-    }
-  ]
-}
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/icfotaclient/presenter/OtaViewModel.kt b/app/src/main/java/com/ic/icfotaclient/presenter/OtaViewModel.kt
index acc139d..e65e2c6 100644 (file)
--- a/app/src/main/java/com/ic/icfotaclient/presenter/OtaViewModel.kt
+++ b/app/src/main/java/com/ic/icfotaclient/presenter/OtaViewModel.kt
@@ -81,9 +81,12 @@ class OtaViewModel : ViewModel() {
             Log.d(TAG, "mobile net is connected == > $isNetConnected")
             isNetConnected
         }
+        Log.d(TAG, "result == > $result")
         if (!result) {
             //无网络
             currentActionState.postValue(UpdateActionState.NO_NETWORK)
+        } else {
+            currentActionState.postValue(UpdateActionState.NONE)
         }
         return result
     }

diff --git a/app/src/main/java/com/ic/icfotaclient/view/SystemUpdateActivity.kt b/app/src/main/java/com/ic/icfotaclient/view/SystemUpdateActivity.kt
index 1fd851f..c09364c 100644 (file)
--- a/app/src/main/java/com/ic/icfotaclient/view/SystemUpdateActivity.kt
+++ b/app/src/main/java/com/ic/icfotaclient/view/SystemUpdateActivity.kt
@@ -179,4 +179,9 @@ class SystemUpdateActivity : AppCompatActivity() {
         }
 
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Log.d("SystemUpdateActivity", "onDestroy...")
+    }
 }
\ No newline at end of file

diff --git a/app/src/main/res/layout/dialog_tips.xml b/app/src/main/res/layout/dialog_tips.xml
index 61eb176..4666ad9 100644 (file)
--- a/app/src/main/res/layout/dialog_tips.xml
+++ b/app/src/main/res/layout/dialog_tips.xml
@@ -9,7 +9,6 @@
     android:paddingLeft="20dp"
     android:paddingRight="20dp">
 
-
     <TextView
         android:id="@+id/notify"
         android:layout_width="wrap_content"
@@ -21,7 +20,6 @@
         android:textColor="@color/white"
         android:textIsSelectable="true" />
 
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"