修改手表和智慧屏联调bug

build.gradle

@@ -5,9 +5,9 @@ ohos {
     signingConfigs {
         release {
             storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
-            storePassword '0000001B503B0AACAAD0D4B58EB7F609102AC541D46F6D343EB7B1BD61F4474224D25E529303B19583CACA'
+            storePassword '0000001BF577350781C5A3FF1C2EA7520FA934CBE75360CABDAC4F14EA7E24CA7B658DD5BF127FB7249C4D'
             keyAlias 'huawei_watch_overseas Release'
-            keyPassword '0000001B3AA6A1440F7D123658F67A747678A82E78FD809944573D62553DD5E15578F56BB028A9BDD746E0'
+            keyPassword '0000001B103FE6E4291DD7853F6DA4BEE271F854F31D334D7155E9AD629A806864B25D686AD641F53F5D7D'
             profile file('D:/HuaweiWatchClient/com.company.fit.provisionRelease.p7b')
             certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_release.cer')
             signAlg 'SHA256withECDSA'

entry/build.gradle

@@ -6,16 +6,16 @@ ohos {
             certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_debug.cer')
             profile file('D:/HuaweiWatchClient/com.company.fit.proDebug.p7b')
             signAlg 'SHA256withECDSA'
-            keyPassword '0000001BFD54082371D6C3EF63CF52276861294BB314DFB8E24964D38490F4A9B8C5A64BC7CF99E59911AB'
+            keyPassword '0000001BDF01FE1733DF6337F2BAF0957DC9EB40E22D53AA92028D49A9F1779C2518B2E751F4E18DE680BD'
             keyAlias 'huawei_watch_overseas Release'
-            storePassword '0000001B8F12B362B740E5D2AD4F6EC6F7C47E4755999147E9481B1A98D997F59D08D4EE192272C503E00A'
+            storePassword '0000001BEEF4D8553DA89A64834D7D6197865EDBD8A25DD7F1381606AE61D548348D36A9BEDB0F3197D108'
             storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
         }
         release {
             storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
-            storePassword '0000001BF3A5754B236C5D87A87C5950DDFE24353138A2039341335A4ACF2D2BE09D52616185E74E9468F1'
+            storePassword '0000001BD753C064BC72F47B7913843122DBAA2D80C52FB460C35E4685D07A4A8EF27EDEC804AB1D2D0D72'
             keyAlias 'huawei_watch_overseas Release'
-            keyPassword '0000001BF283570D280AE2565F3E5B776F34169882FDCA51767D01D6BC66B8BB70B623F79B65EAF16AD514'
+            keyPassword '0000001B5F909F0FC65029F4130F07AAD04F1C9CEAC952EB1935D94BB32B46B0A039ACA00844CD13873C40'
             signAlg 'SHA256withECDSA'
             profile file('D:/HuaweiWatchClient/com.company.fit.provisionRelease.p7b')
             certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_release.cer')

entry/src/main/js/default/pages/index/index.hml

@@ -9,7 +9,7 @@
         </text>
     </div>
     <!--同步信息提示页面-->
-    <div class="sync" if="(page == '10' || page == '11') && !showPrivacy">
+    <div class="sync" if="(page == '10' || page == '11') && !showPrivacy && !dataPageShow">
         <image class="sync-img" src="../../common/hm_sync_img.png"></image>
         <text class="sync-text01">
             请在手机端Fit健身开始训练，训练数据将在手表端同步展示

entry/src/main/js/default/pages/index/index.js

@@ -64,6 +64,16 @@ export default {
         _this.sendMsg({
             "eventFlg": "8",
         });
+        //处于训练中可接收数据时，返回页面需要判断是否处于常亮
+        if (_this.canReceiveMessage) {
+            //保持屏幕常亮
+            if (timer == null) {
+                _this.keepScreenOn();
+                timer = setInterval(function () {
+                    _this.keepScreenOn();
+                },2 * 60 * 1000);
+            }
+        }
     },
     onHide() {
         this.stopFlg = true;
@@ -149,7 +159,7 @@ export default {
             if (!_this.dataPageShow) {
                 _this.dataPageShow = true;
             }
-            _this.tabIndex = 1;
+            _this.tabIndex = 0;
             _this.stopFlg = true;
             //训练数据页面显示的实际数据
             if (_this.lastPage != "") { //有可能是手机离开页面的15事件，手表端没有收到，所以导致lastpage没有值，这时候按训练中的页面算