~

build.gradle

@@ -5,11 +5,11 @@ ohos {
     signingConfigs {
         release {
             storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
-            storePassword '0000001B37FBF75B69C866355CBEFC208DDF92764DE954F1C754CBD53E1B481433E2DBB6E2C3132D049A89'
+            storePassword '0000001BFDB36C87CF75CE5C9C35B4EB247F0B973A3CEBFCE636F022CE70CBF7EA5D483CB9896BA93C3146'
             keyAlias 'huawei_watch_overseas Release'
-            keyPassword '0000001BE894FABE766383262AD346CB8151121BA00764539557B67C6917C8C4B031ADCF67E1384F5FE120'
-            profile file('D:/HuaweiWatchClient/com.company.fit.provisionRelease.p7b')
-            certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_release.cer')
+            keyPassword '0000001B32D22EDA409673EBC987E06A1784506F044E7486B4A2590B645408BBD960C712D03072C22FE304'
+            profile file('D:\\HuaweiWatchClient\\com.company.fit.provisionRelease.p7b')
+            certpath file('D:\\HuaweiWatchClient\\com.company.fit.overseas_release.cer')
             signAlg 'SHA256withECDSA'
         }
     }
@@ -30,7 +30,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.huawei.ohos:hap:2.4.1.4'
+        classpath 'com.huawei.ohos:hap:2.4.2.5'
 
     }
 }

entry/build.gradle

@@ -4,20 +4,20 @@ ohos {
     signingConfigs {
         debug {
             certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_debug.cer')
-            profile file('D:/HuaweiWatchClient/com.company.fit.proDebug.p7b')
+            profile file('D:/HuaweiWatchClient/FitSmartWatch.p7b')
             signAlg 'SHA256withECDSA'
-            keyPassword '0000001B17F8F53E0CF14D52675968C4FD60AA48E6580B4EEEE4AE8348FA556850E01CC92EEA6DE834CA36'
+            keyPassword '0000001B329C15F1A79D6DE1A35FC33EAC9D748ED2C9769503449638BCD341685E783C445341B6EF7252A0'
             keyAlias 'huawei_watch_overseas Release'
-            storePassword '0000001B16A4C8B18003852BF6E890B38F6D624C8314D7E55CE2FD87CBC3F2C9E2DA9403C977F0C988ABAE'
+            storePassword '0000001BED3DA1157AED6BA705ACB0E5A74DF33AB09917EF841F6048AA1D583907E32B547CE23E3D6415F8'
             storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
         }
         release {
             storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
-            storePassword '0000001B76038D1DF78CD8E9F7D8F4E133ECE3FABA895EE4FEE9DDC4225267E3D2176904B14F7BF71AF47D'
+            storePassword '0000001BE711A291624105B6065E58CF3582A64BD480021F7FA44D831AF7F47D3BAA28EE72E1ED5200671F'
             keyAlias 'huawei_watch_overseas Release'
-            keyPassword '0000001B4BECAFAB52D2A2F0F1D06B36F5343980B0FD548D1BB1A84211DB54738785744DD4DF2640AAD1B5'
+            keyPassword '0000001B9650C5F04495DB8963B0EA3435C222F7566D397075C0BCA00938DC2AC4A57E46138E9C0F70324C'
             signAlg 'SHA256withECDSA'
-            profile file('D:/HuaweiWatchClient/com.company.fit.provisionRelease.p7b')
+            profile file('D:\\HuaweiWatchClient\\com.company.fit.provisionRelease.p7b')
             certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_release.cer')
         }
     }
@@ -27,14 +27,14 @@ ohos {
         compatibleSdkVersion 3
     }
 }
-sourceSets{
-    main{
-        java{
+sourceSets {
+    main {
+        java {
             srcDir 'build\\generated\\source\\r\\debug'
         }
     }
 }
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile'junit:junit:4.12'
+    testCompile 'junit:junit:4.12'
 }

entry/src/main/config.json

@@ -2,8 +2,8 @@
   "app": {
     "bundleName": "com.company.fit",
     "version": {
-      "code": 20,
-      "name": "1.0.2"
+      "code": 25,
+      "name": "1.0.3"
     },
     "apiVersion": {
       "compatible": 3,
@@ -20,7 +20,7 @@
       {
         "name": "default",
         "icon": "$media:icon",
-        "label": "Fit健身",
+        "label": "$string:app_name",
         "type": "page"
       }
     ],
@@ -35,6 +35,11 @@
           "extra": "",
           "name": "supportLists",
           "value": "com.sportq.fit:B1B788A1BBD5F459BC641DA8CE690EA065C96957F58E883764982B5C46E53E06"
+        },
+        {
+          "extra": "",
+          "name": "hwc-theme",
+          "value": "androidhwext:style/Theme.Emui.Dark.NoActionBar"
         }
       ]
     },
@@ -57,7 +62,7 @@
           ],
           "when": "always"
         },
-        "name": "harmonyos.permission.READ_HEALTH_DATA"
+        "name": "ohos.permission.READ_HEALTH_DATA"
       }
     ]
   }

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

@@ -17,13 +17,14 @@ export default {
         let _this = this;
         //获取客户端信息
         _this.getMsg();
+    },
+    onShow() {
+        let _this = this;
         //更新页面数据
         _this.acCalorie = _this.endCalorie;
         _this.fitTotalDuration = _this.endTotalTime;
         _this.averHeartRate = _this.endAverHeartRate;
         _this.maxHeartRate = _this.endMaxHeartRate;
-    },
-    onShow() {
         //取消常亮
         brightness.setKeepScreenOn({
             keepScreenOn: false,
@@ -35,6 +36,7 @@ export default {
     },
     onDestroy() {
         //取消接收手机侧第三方应用发过来的消息
+        console.error("end--onDestroy:unregisterReceiver")
         p2pClient.unregisterReceiver({
             onSuccess: function () {
             },

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

@@ -193,11 +193,12 @@
 /**已训练**/
 .train-new-title {
     font-size: 38px;
-    height: 38px;
+    height: 40px;
     margin-top: 60px;
     width: 350px;
     color: #FFFFFF;
     text-align: center;
+    line-hight: 40px;
 }
 .train-time {
     justify-content: center;

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

@@ -38,6 +38,7 @@ export default {
     },
     onInit() {
         p2pClient.setPeerPkgName("com.sportq.fit");
+        p2pClient.setPeerFingerPrint("B1B788A1BBD5F459BC641DA8CE690EA065C96957F58E883764982B5C46E53E06");
     },
     onReady() {
         let _this = this;
@@ -129,7 +130,7 @@ export default {
                 },2 * 60 * 1000);
             }
             //数据重置
-            _this.init();
+            _this.initData();
             _this.canReceiveMessage = true;
             if (_this.isFirstInit) {
                 _this.isFirstInit = false;
@@ -368,7 +369,7 @@ export default {
             },
             onSendResult: function (resultCode) {
                 // send任务执行结束后返回的错误码和信息进行处理
-                console.log(resultCode.data + resultCode.code);
+                console.log("sendMsg:" + resultCode.data + resultCode.code);
             },
         }
         if (sendMessage != null && sendCallback != null) {
@@ -424,9 +425,11 @@ export default {
         var receiver = {
             onSuccess: function () {
                 // 处理注册接收手机侧简短消息或文件成功的回调函数
+                console.error("index--getMsg:registerReceiver:onSuccess")
             },
             onFailure: function () {
                 // 处理注册接收手机侧简短消息或文件失败的回调函数
+                console.error("index--getMsg:registerReceiver:onFailure")
             },
             onReceiveMessage: function (data) {
                 _this.start(JSON.parse(data));
@@ -554,11 +557,6 @@ export default {
         this.fitDuration = "00:00";
         this.progress = "", //进度条
         this.countdownT = "", // 倒计时
-        //取消接收手机侧第三方应用发过来的消息
-        p2pClient.unregisterReceiver({
-            onSuccess: function () {
-            },
-        });
         sensor.unsubscribeHeartRate() //取消监听心率
     },
 
@@ -566,7 +564,7 @@ export default {
 /**
     *数据重置
     */
-    init() {
+    initData() {
         this.isStop = false;
         this.sendFlg = false;
         this.stopFlg = false;

entry/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "Fit健身"
+    }
+  ]
+}
\ No newline at end of file