release new verstion which set wrist wear state into false as default value.

diff --git a/app/release/ICL02Launcher_V184_202011301928_release.apk b/app/release/ICL02Launcher_V185_202012022056_release.apk
similarity index 58%
rename from app/release/ICL02Launcher_V184_202011301928_release.apk
rename to app/release/ICL02Launcher_V185_202012022056_release.apk
index 79a2bfd..deed5e5 100644 (file)
Binary files a/app/release/ICL02Launcher_V184_202011301928_release.apk and b/app/release/ICL02Launcher_V185_202012022056_release.apk differ

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 6bb982b..4a70a14 100644 (file)
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,10 +11,10 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 184,
-      "versionName": "202011301928",
+      "versionCode": 185,
+      "versionName": "202012022056",
       "enabled": true,
-      "outputFile": "ICL02Launcher_V184_202011301928_release.apk"
+      "outputFile": "ICL02Launcher_V185_202012022056_release.apk"
     }
   ]
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java b/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java
index 26e4d49..645234e 100644 (file)
--- a/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java
+++ b/app/src/main/java/com/ic/launcher/AnimalHeatActivity.java
@@ -1,12 +1,5 @@
 package com.ic.launcher;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.view.GestureDetectorCompat;
-import androidx.databinding.DataBindingUtil;
-
-import android.animation.AnimatorSet;
-import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -17,17 +10,16 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
-import android.os.PowerManager;
 import android.os.RemoteException;
-import android.system.Os;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-import android.view.View;
 import android.view.WindowManager;
-import android.widget.TextView;
-import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.databinding.DataBindingUtil;
 
 import com.ic.aidl.temp.ITempAidlInterface;
 import com.ic.aidl.temp.ITempRemoteService;
@@ -39,7 +31,6 @@ import com.ic.launcher.util.ServiceUtil;
 import com.ic.launcher.util.SystemUtils;
 
 import java.lang.ref.WeakReference;
-import java.text.DecimalFormat;
 
 import butterknife.BindString;
 import butterknife.ButterKnife;
@@ -67,7 +58,6 @@ public class AnimalHeatActivity extends AppCompatActivity implements
     public static final String ACTION_REMOTE_WORK_SERVICE = "com.ic.action.WORK_SERVICE";
     public static final String PACKAGE_REMOTE_WORK_SERVICE = "com.ic.temp";
 
-
     @BindString(R.string.activity_temp_tips_check)
     String tipsCheck;
 
@@ -96,7 +86,7 @@ public class AnimalHeatActivity extends AppCompatActivity implements
         //读取佩戴值，如果没有佩戴显提示佩戴
         //接收到了佩戴的广播去获取数据
         //true表示没佩戴了，false表示有佩戴
-        boolean isAntiOff = SystemUtils.getSystemPropertiesBoolean("persist.sys.ic_antioff", true);
+        boolean isAntiOff = SystemUtils.getSystemPropertiesBoolean("persist.sys.ic_antioff", false);
         this.mHasWear = !isAntiOff;
         IcLog.i(TAG, "isAntiOff == > " + isAntiOff);
         //如果已经佩戴了，就去获取数据
@@ -252,6 +242,7 @@ public class AnimalHeatActivity extends AppCompatActivity implements
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
+
         }
     };
 
@@ -287,7 +278,6 @@ public class AnimalHeatActivity extends AppCompatActivity implements
     }
 
     private void registerBroadcast() {
-        //
         IntentFilter filter = new IntentFilter();
         filter.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
         registerReceiver(mIntentReceiver, filter);

diff --git a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
index 64ca8df..68658d7 100644 (file)
--- a/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
+++ b/app/src/main/java/com/ic/launcher/configure/l02/L02AppInfo.java
@@ -3,8 +3,6 @@ package com.ic.launcher.configure.l02;
 import android.content.Context;
 import android.graphics.Color;
 
-import com.ic.jni.ICJniUtils;
-import com.ic.launcher.BuildConfig;
 import com.ic.launcher.R;
 import com.ic.launcher.entity.AppInfoEntity;
 import com.ic.launcher.fragment.LowPowerModeFragment;
@@ -18,30 +16,30 @@ public class L02AppInfo {
 
     private static final int BACK_COLOUR = Color.parseColor("#000000");
 
-    public static boolean ppg_ecg_sensor_available=false;
-    public static boolean temperature_sensor_available=false;
+    public static boolean ppg_ecg_sensor_available = false;
+    public static boolean temperature_sensor_available = false;
 
-    static{
+    static {
         //动态监测有没有心率
-        ppg_ecg_sensor_available= SystemUtils.getSystemPropertiesBoolean("persist.sys.havePPGSensor",false);//(ICJniUtils.isPPGavailable()>0);
+        ppg_ecg_sensor_available = SystemUtils.getSystemPropertiesBoolean("persist.sys.havePPGSensor", false);//(ICJniUtils.isPPGavailable()>0);
         //动态监测有没有体温
-        temperature_sensor_available=SystemUtils.getSystemPropertiesBoolean("persist.sys.haveTempSensor",false);//(ICJniUtils.isTemperatureDevAvailable()>0);
+        temperature_sensor_available = SystemUtils.getSystemPropertiesBoolean("persist.sys.haveTempSensor", false);//(ICJniUtils.isTemperatureDevAvailable()>0);
     }
 
-    public static List<AppInfoEntity> getAppList(Context context){
+    public static List<AppInfoEntity> getAppList(Context context) {
         Locale locale = context.getResources().getConfiguration().locale;
         String language = locale.getLanguage();
         if (SystemUtils.isH88()) {
             return mH88AppList;
-        }else if (SystemUtils.h88tinyMode()) {
+        } else if (SystemUtils.h88tinyMode()) {
             return mH88TinyAppList;
-        }else if (SystemUtils.isS123()) {
+        } else if (SystemUtils.isS123()) {
             return mS123DefaultAppList;
-        }else if (SystemUtils.isYT()){
+        } else if (SystemUtils.isYT()) {
             return mq3fytDefaultAppList;
-        }else if (SystemUtils.isDC001()){
+        } else if (SystemUtils.isDC001()) {
             return mDC001AppList;
-        }else{
+        } else {
             if (language.contains("zh")) {
                 return mL02DefaultAppList;
             } else {
@@ -50,15 +48,16 @@ public class L02AppInfo {
         }
     }
 
-    public static AppInfoEntity getDialer(Context context){
+    public static AppInfoEntity getDialer(Context context) {
 
-        for (AppInfoEntity aie : getAppList(context) ) {
-                if (aie.getAppTitleResId() ==R.string.app_dialer){
-                    return aie;
-                }
+        for (AppInfoEntity aie : getAppList(context)) {
+            if (aie.getAppTitleResId() == R.string.app_dialer) {
+                return aie;
+            }
         }
         return null;
     }
+
     /**
      * 拨号的顺序不能变 在低电量模式下会查找这个列表，然后查找索引为1的拨号，
      * 如果要修改 请到 {@link  LowPowerModeFragment} 中一并修改
@@ -82,7 +81,7 @@ public class L02AppInfo {
                     "com.zmapp.sms", "com.zmapp.sms.MainActivity"));
 
             //心率
-            if(ppg_ecg_sensor_available) {
+            if (ppg_ecg_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
                         "com.ic.blood", "com.ic.blood.BloodActivity"));
 //                        "com.ic.ak.hardware", "com.ic.ak.hardware.ui.BloodActivity"));
@@ -98,7 +97,7 @@ public class L02AppInfo {
                     "com.ic.ak.hardware", "com.ic.ak.hardware.ui.PedometerActivity"));
             //            //天气
 //            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_weather_l02, R.string.app_Weather,
-  //                  "com.ic.weather", "com.ic.weather.WeatherActivity"));
+            //                  "com.ic.weather", "com.ic.weather.WeatherActivity"));
 
 
             //微聊
@@ -106,7 +105,6 @@ public class L02AppInfo {
                     "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.MicroChatActivity"));
 
 
-
 //            //支付包
 //            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_alipay_l02, R.string.app_AliPay,
 //                    "com.eg.android.AlipayGphone", "com.alipay.watch.ui.MainActivity"));
@@ -132,12 +130,12 @@ public class L02AppInfo {
         {
 
             //体温
-            if(temperature_sensor_available) {
+            if (temperature_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_temperature_h88, R.string.app_h88_temperature,
                         "com.ic.launcher", "com.ic.launcher.AnimalHeatActivity"));
             }
             //心率
-            if(ppg_ecg_sensor_available) {
+            if (ppg_ecg_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
                         "com.ic.blood", "com.ic.blood.BloodActivity"));
             }
@@ -164,7 +162,6 @@ public class L02AppInfo {
 //                    "com.enqualcomm.imessage", "com.enqualcomm.imessage.ui.MicroChatActivity"));
 
 
-
 //            //支付包
 //            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_alipay_l02, R.string.app_AliPay,
 //                    "com.eg.android.AlipayGphone", "com.alipay.watch.ui.MainActivity"));
@@ -213,11 +210,11 @@ public class L02AppInfo {
 //                    "com.ic.weather", "com.ic.weather.WeatherActivity"));
             //心率
 
-            if(ppg_ecg_sensor_available) {
+            if (ppg_ecg_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heart,
                         "com.ic.blood", "com.ic.blood.BloodActivity"));
             }
-            if(temperature_sensor_available) {
+            if (temperature_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_temperature_h88, R.string.app_h88_temperature,
                         "com.ic.launcher", "com.ic.launcher.AnimalHeatActivity"));
             }
@@ -255,12 +252,12 @@ public class L02AppInfo {
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
                     "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
             //心率
-            if(ppg_ecg_sensor_available) {
+            if (ppg_ecg_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_heartrate_l02, R.string.app_name_heartRate,
                         "com.ic.blood", "com.ic.blood.BloodActivity"));
             }
 
-            if(temperature_sensor_available) {
+            if (temperature_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_temperature_h88, R.string.app_h88_temperature,
                         "com.ic.launcher", "com.ic.launcher.AnimalHeatActivity"));
             }
@@ -295,7 +292,7 @@ public class L02AppInfo {
             //运动
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
                     "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
-             //相机
+            //相机
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_camera_l02, R.string.app_Camera,
                     "com.eqc.camera", "com.eqc.camera.TakePictureActivity"));
             //相册
@@ -320,7 +317,7 @@ public class L02AppInfo {
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_qr_code_h88, R.string.app_h88_qrcode,
                     "com.ic.launcher", "com.ic.launcher.QrCodeActivity"));
 
-            if(temperature_sensor_available) {
+            if (temperature_sensor_available) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_temperature_h88, R.string.app_h88_temperature,
                         "com.ic.launcher", "com.ic.launcher.AnimalHeatActivity"));
             }
@@ -339,7 +336,7 @@ public class L02AppInfo {
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_pedometer_l02, R.string.app_Sport,
                     "com.ic.hardware", "com.ic.hardware.PedometerActivity"));
             //自由锻炼
-            if(SystemUtils.getSystemPropertiesString("persist.sys.enablePractice","false").equals("true")) {
+            if (SystemUtils.getSystemPropertiesString("persist.sys.enablePractice", "false").equals("true")) {
                 add(new AppInfoEntity(BACK_COLOUR, R.mipmap.practice_logo, R.string.app_practise,
                         "com.ic.launcher", "com.ic.launcher.PractiseActivity"));
 
@@ -348,10 +345,10 @@ public class L02AppInfo {
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_sms_l02, R.string.app_Sms,
                     "com.zmapp.sms", "com.zmapp.sms.MainActivity"));
 
-            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_camera_l02,R.string.app_Camera_h88,
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_camera_l02, R.string.app_Camera_h88,
                     "com.ic.camera", "com.ic.camera.MainActivity"));
 
-            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_albumn_l02,R.string.app_Album,
+            add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_albumn_l02, R.string.app_Album,
                     "com.ic.album", "com.ic.album.MainActivity"));
 
             add(new AppInfoEntity(BACK_COLOUR, R.mipmap.icon_language_h88, R.string.app_h88_language,

diff --git a/app/version_code.properties b/app/version_code.properties
index 6b11e72..4897633 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Mon Nov 30 19:28:39 CST 2020
-VERSION_CODE=184
+#Wed Dec 02 20:56:31 CST 2020
+VERSION_CODE=185

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6a181cf..97fec90 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Fri Mar 06 09:41:21 CST 2020
+git #Fri Mar 06 09:41:21 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME