release ICSer_V939_2109031043_release s123 do not send heart dance in screen on.

diff --git a/app/release/ICSer_V938_2109012227_release.apk b/app/release/ICSer_V939_2109031043_release.apk
similarity index 77%
rename from app/release/ICSer_V938_2109012227_release.apk
rename to app/release/ICSer_V939_2109031043_release.apk
index 0c59cd5..4182861 100644 (file)
Binary files a/app/release/ICSer_V938_2109012227_release.apk and b/app/release/ICSer_V939_2109031043_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index d7d2ac0..38dce9e 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":938,"versionName":"2109012227","enabled":true,"outputFile":"ICSer_V938_2109012227_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V938_2109012227_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":939,"versionName":"2109031043","enabled":true,"outputFile":"ICSer_V939_2109031043_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V939_2109031043_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index f5a4d81..744a096 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -491,7 +491,6 @@ public class CoreService extends Service {
                 //检测电池电量 并上报低电报警
                 batteryUtil.getBatteryLevel(context);
                 if (CoreService.is_in_sleep_mode) {
-
                     /*屏幕亮起时，如果在sleep模式(夜晚的那个睡眠模式，非系统休眠，暂时没实现，还不会跑到这里)，则唤醒各个进程*/
                     CoreService.is_in_sleep_mode = false;
                     CoreService.is_allowed_in_sleep_mode = 0;
@@ -501,14 +500,13 @@ public class CoreService extends Service {
 
                     CoreService.this.wakeUpFromSleep();
                 }
-
-
                 //为了保证唤醒时各个状态及时更新到服务器，发送一个同步心跳包，这样用户体验更好
                 CoreService.this.locationClient.updateStepCount();
-
-                mHandler.postDelayed(mRetryConnectSrvThread, 500);
-
-
+                //如果S123的亮屏的时候不会去发送心跳内容
+                ICLogger.d("Config.protocol_no ==> " + Config.protocol_no);
+                if (Config.protocol_no != Config.PROTOCOL_S123) {
+                    mHandler.postDelayed(mRetryConnectSrvThread, 500);
+                }
                 if (CoreService.is_wifi_network_ok) {
                     CoreService.is_wifi_network_ok = false;
                     /*屏幕亮起时，如果wifi用户设置是开启的，则开启wifi*/

diff --git a/app/version_code.properties b/app/version_code.properties
index 2821efb..540df4e 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Sep 01 22:27:49 CST 2021\r
-VERSION_CODE=938\r
+#Fri Sep 03 10:43:43 CST 2021\r
+VERSION_CODE=939\r