add iclogger

diff --git a/app/build.gradle b/app/build.gradle
index fe2fdb5..57bfae9 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -133,5 +133,8 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.github.silvestrpredko:dot-progress-bar:1.1'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0-RC1'
+    implementation ('com.squareup.okhttp3:logging-interceptor:4.10.0-RC1') {
+        exclude group: 'com.squareup.okio', module: 'okio'
+    }
+    implementation files('libs/ICLoger-release.aar')
 }
\ No newline at end of file

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index e314ca4..4c3a668 100644 (file)
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -24,4 +24,42 @@
 -keep class com.android.** { *; }
 -keep class android.** { *; }
 
--dontwarn android.**
\ No newline at end of file
+-dontwarn android.**
+
+
+-keep class com.ic.iclooger.CrashHandler
+-keep class com.ic.iclooger.ICLogger
+
+-keepclassmembers class com.ic.iclooger.StorageUtils {
+    public static <fields>;
+    public static <methods>;
+    public <methods>;
+}
+
+-keepclassmembers class com.ic.iclooger.SystemUtils {
+    public static <fields>;
+    public static <methods>;
+    public <methods>;
+}
+
+-keep class com.facebook.** { *; }
+-keep class com.mediatek.** { *; }
+-keep class org.apache.** { *; }
+-keep class okio.Okio.** { *; }
+-keep class java.nio.** { *; }
+-keep class com.android.** { *; }
+-keep class android.** { *; }
+-keep class android.ddm.** { *; }
+-keep class com.alibaba.fastjson.** { *; }
+-keep class com.eqc.watch.launcher.WatchApplication { *; }
+#-keep class com.enqualcomm.support.EqcAlgorithmNative { *; }
+
+-dontwarn com.facebook.**
+-dontwarn com.mediatek.**
+-dontwarn java.nio.**
+-dontwarn com.alibaba.fastjson.**
+-dontwarn android.**
+-dontwarn com.android.**
+-dontwarn rx.internal.**
+
+-keep class com.ic.** { *; }
\ No newline at end of file

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 7312fde..74585c9 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 21,
-      "versionName": "202105311617",
-      "outputFile": "ICL02Temperature_V21_202105311617_release.apk"
+      "versionCode": 23,
+      "versionName": "202107072033",
+      "outputFile": "ICL02Temperature_V23_202107072033_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/temperature/App.kt b/app/src/main/java/com/ic/temperature/App.kt
index 3c1f144..017a23c 100644 (file)
--- a/app/src/main/java/com/ic/temperature/App.kt
+++ b/app/src/main/java/com/ic/temperature/App.kt
@@ -2,6 +2,9 @@ package com.ic.temperature
 
 import android.app.Application
 import android.content.Context
+import com.ic.iclooger.CrashHandler
+import com.ic.iclooger.ICLogger
+
 
 class App : Application() {
 
@@ -9,6 +12,13 @@ class App : Application() {
         instance = this
     }
 
+    override fun onCreate() {
+        super.onCreate()
+        val crashHandler = CrashHandler.getInstance()
+        crashHandler.init(applicationContext, getString(R.string.program_abnormal))
+        ICLogger.init(applicationContext, "IcTemperature")
+    }
+
     companion object {
         private var instance: App? = null
 

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index c679936..43c6a2f 100644 (file)
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -10,4 +10,5 @@
     <string name="no_wearing_device_tips_text">Not wearing a device</string>
     <string name="activity_temp_tips_wear_too_short">Wear to short\nMay be not right</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">Application Error</string>
 </resources>

diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3582ac4..46f9623 100644 (file)
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -10,4 +10,5 @@
     <string name="activity_temp_unit">℃</string>
     <string name="activity_temp_tips_wear_too_short">時間が短すぎる\n結果に影響を与える可能性があります</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">Error</string>
 </resources>

diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 50d8971..9fdd962 100644 (file)
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -10,4 +10,5 @@
     <string name="activity_temp_outside">สภาพแวดล้อม</string>
     <string name="activity_temp_tips_wear_too_short">เวลาสวมใส่สั้นเกินไป\nอาจส่งผลต่อผลลัพธ์</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">Error</string>
 </resources>

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9a0e737..bd074a1 100644 (file)
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -10,4 +10,5 @@
     <string name="activity_temp_tips_end">测量完成</string>
     <string name="activity_temp_tips_wear_too_short">佩戴时间过短\n可能影响结果</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">App发生异常</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 8fb4c98..3df54f8 100644 (file)
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -10,4 +10,5 @@
     <string name="activity_temp_tips_wear_too_short">佩戴時間過短\n可能影響結果</string>
     <string name="temperature_default_text">"--.- "</string>
     <string name="no_wearing_device_tips_text">未配戴設備</string>
+    <string name="program_abnormal">App发生异常</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8fb4c98..3df54f8 100644 (file)
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -10,4 +10,5 @@
     <string name="activity_temp_tips_wear_too_short">佩戴時間過短\n可能影響結果</string>
     <string name="temperature_default_text">"--.- "</string>
     <string name="no_wearing_device_tips_text">未配戴設備</string>
+    <string name="program_abnormal">App发生异常</string>
 </resources>
\ No newline at end of file

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b69119a..a8440e5 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,4 +10,5 @@
     <string name="activity_temp_tips_end">测量完成</string>
     <string name="activity_temp_tips_wear_too_short">佩戴时间过短\n可能影响结果</string>
     <string name="temperature_default_text">"--.- "</string>
+    <string name="program_abnormal">App发生异常</string>
 </resources>
\ No newline at end of file

diff --git a/app/version_code.properties b/app/version_code.properties
index 610f5a5..cd73a8b 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon May 31 16:17:09 CST 2021
-VERSION_CODE=21
+#Wed Jul 07 20:33:58 CST 2021
+VERSION_CODE=23