~

build.gradle

@@ -12,6 +12,15 @@ ohos {
             certpath file('D:\\HuaweiWatchClient\\com.company.fit.overseas_release.cer')
             signAlg 'SHA256withECDSA'
         }
+        debug {
+            storeFile file('D:\\HuaweiWatchClient\\huawei_watch_overseas.p12')
+            storePassword '0000001B91E3CA8ECDCED1F9F4B73AA57A16373DE22AAF5EDF09728739FAC6D35ECF42C027072ABDAE748A'
+            keyAlias = 'huawei_watch_overseas Release'
+            keyPassword '0000001B7965C09870ED31481D6A50D68A7C1CECB887D0916C9201061F2904F2FE04F7B6FBE4A4C67C0B0E'
+            signAlg = 'SHA256withECDSA'
+            profile file('D:\\HuaweiWatchClient\\com.company.fit.newProDebug.p7b')
+            certpath file('D:\\HuaweiWatchClient\\com.company.fit.overseas_debug.cer')
+        }
     }
     compileSdkVersion 4
     defaultConfig {
@@ -30,7 +39,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.huawei.ohos:hap:2.4.2.5'
+        classpath 'com.huawei.ohos:hap:2.4.4.2'
         classpath 'com.huawei.ohos:decctest:1.0.0.6'
 
     }

entry/build.gradle

@@ -4,11 +4,11 @@ ohos {
     signingConfigs {
         debug {
             certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_debug.cer')
-            profile file('D:\\HuaweiWatchClient\\FitSmartWatch.p7b')
+            profile file('D:\\HuaweiWatchClient\\com.company.fit.newProDebug.p7b')
             signAlg 'SHA256withECDSA'
-            keyPassword '0000001B1FE8554C7D169E4724F444DEF49D7A753D21BEA551D7D813C5BC8ED6B2331D81DBC0BFCC8F958A'
+            keyPassword '0000001B0E25500D3E709280D2A30A5D1EE00161BEE3692ABC549E2C5216EC2918A64E9B96FD8BA95A5702'
             keyAlias 'huawei_watch_overseas Release'
-            storePassword '0000001BA333A2B3A9BC5132955D63CFA583DE930CC069A78CE1F1008A0C8C6FFD6C79F3AC4915BA1FF6BD'
+            storePassword '0000001BC795D764014559EBBB0A1B8D0906BE2C92256BDF12D655F337F612162A9CF7BA3CC663C6334494'
             storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
         }
         release {
@@ -34,6 +34,15 @@ sourceSets {
         }
     }
 }
+
+project.gradle.taskGraph.whenReady {
+    def compileNode = project.tasks.getByName("compileReleaseJsWithNode")
+    compileNode.doLast {
+        def successFile = project.file("D:\\HuaweiWatchClient\\entry\\build\\intermediates\\res\\release\\lite\\assets\\js\\default\\compile_success.txt")
+        successFile.delete()
+    }
+}
+
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'

entry/src/main/config.json

@@ -2,7 +2,7 @@
   "app": {
     "bundleName": "com.company.fit",
     "version": {
-      "code": 25,
+      "code": 30,
       "name": "1.0.3"
     },
     "apiVersion": {

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

 <div class="container" onswipe="touchMove">
-    <!--启动页面-->
+
+<!--启动页面-->
     <image class="logo" if="!page && !showPrivacy" src="../../common/default_img.png"></image>
-    <!--启动页面-->
-    <!--准备开始-->
+
+<!--启动页面-->
+<!--准备开始-->
     <div class="start" if="page == '0'&& !showPrivacy">
         <text class="start-text">
             准备开始
         </text>
     </div>
-    <!--同步信息提示页面-->
+
+<!--同步信息提示页面-->
     <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健身开始训练，训练数据将在手表端同步展示
         </text>
-        <text class="sync-text02">
-            *目前仅支持华为手机
-        </text>
     </div>
-    <!--隐私权限 -->
+
+<!--隐私权限 -->
     <div class="privacy" if="showPrivacy">
         <image class="privacy-img" src="../../common/hm_privacy_img.png"></image>
         <text class="privacy-content">
@@ -29,113 +30,126 @@
             取消
         </text>
     </div>
-    <!--准备开始end-->
-    <!-- 标题end  -->
-    <swiper index="{{tabIndex}}" class="todo-wraper" if="dataPageShow && !showPrivacy" @change="swiperChange">
-        <!-- 动作预览  -->
+
+<!--准备开始end-->
+<!-- 标题end  -->
+    <swiper index="{{ tabIndex }}" class="todo-wraper" if="dataPageShow && !showPrivacy" @change="swiperChange">
+
+    <!-- 动作预览  -->
         <div class="train-view">
             <text if="page == '2'||page == '3'" class="train-page-title">
-                <!--动作预览 -->
+
+            <!--动作预览 -->
                 动作预览
             </text>
             <div if="page == '1'||page == '4' " class="train-pape-num-box">
-                <text class="train-pape-num-o">{{countdownT}}
+                <text class="train-pape-num-o">{{ countdownT }}
                 </text>
             </div>
             <div if="page == '5'|| page == '6'" class="train-pape-num-box">
-                <text class="train-pape-num">{{countdownT}}
+                <text class="train-pape-num">{{ countdownT }}
                 </text>
             </div>
-            <text class="train-view-title"> {{acName}}
+            <text class="train-view-title"> {{ acName }}
             </text>
             <div class="train-view-progress-line">
-                <div class="train-view-progress-new" style="width: {{progress}}"></div>
+                <div class="train-view-progress-new" style="width : {{ progress }}"></div>
             </div>
             <div class="train-num">
                 <div class="train-heartbeat">
                     <image class="train-num-icon" src="../../common/oppo_icon_heart.png"></image>
-                    <text class="train-num-text">{{newHeartRate}}
+                    <text class="train-num-text">{{ newHeartRate }}
                     </text>
                 </div>
                 <div class="train-calorie">
                     <image class="train-num-icon" src="../../common/oppo_icon_calorie.png"></image>
-                    <text class="train-num-text">{{acCalorie}}
+                    <text class="train-num-text">{{ acCalorie }}
                     </text>
                 </div>
             </div>
-            <!-- 动作预览end  -->
+
+        <!-- 动作预览end  -->
         </div>
-        <!-- 已训练  -->
+
+    <!-- 已训练  -->
         <div class="train-view">
             <text class="train-new-title">
-                <!--已训练 -->
+
+            <!--已训练 -->
                 已训练
             </text>
-            <text class="train-time">{{fitDuration}}
+            <text class="train-time">{{ fitDuration }}
             </text>
-            <div class="train-tool" if="{{stopFlg}}">
+            <div class="train-tool" if="{{ stopFlg }}">
                 <image class="train-play-icon" @click="play" src="../../common/oppo_btn_play.png"></image>
                 <image class="train-play-icon" @click="close" src="../../common/oppo_btn_close.png"></image>
             </div>
             <div class="train-tool" else>
-                <image class="train-tool-icon" if="{{isFirst == '0'}}"
-                        src="../../common/oppo_btn_previous_disabled.png"></image>
+                <image class="train-tool-icon" if="{{ isFirst == '0' }}"
+                       src="../../common/oppo_btn_previous_disabled.png"></image>
                 <image class="train-tool-icon" @click="previous" src="../../common/oppo_btn_previous.png" else></image>
                 <image class="train-play-icon" @click="stop" src="../../common/oppo_bun_pause.png"></image>
-                <image class="train-tool-icon" if="{{isLast == '0'}}"
-                        src="../../common/oppo_btn_next_disabled.png"></image>
+                <image class="train-tool-icon" if="{{ isLast == '0' }}"
+                       src="../../common/oppo_btn_next_disabled.png"></image>
                 <image class="train-tool-icon" @click="next" src="../../common/oppo_btn_next.png" else></image>
             </div>
-            <!-- 已训练end  -->
+
+        <!-- 已训练end  -->
         </div>
     </swiper>
-    <!--切换圆点-->
+
+<!--切换圆点-->
     <div class="select" if="dataPageShow && !showPrivacy">
-        <div if="{{tabIndex == 0}}" class="select-item select-item-active"></div>
-        <div if="{{tabIndex == 0}}" class="select-item"></div>
-        <div if="{{tabIndex == 1}}" class="select-item"></div>
-        <div if="{{tabIndex == 1}}" class="select-item select-item-active"></div>
+        <div if="{{ tabIndex == 0 }}" class="select-item select-item-active"></div>
+        <div if="{{ tabIndex == 0 }}" class="select-item"></div>
+        <div if="{{ tabIndex == 1 }}" class="select-item"></div>
+        <div if="{{ tabIndex == 1 }}" class="select-item select-item-active"></div>
     </div>
-    <!--切换圆点end-->
-    <!--训练切出-->
+
+<!--切换圆点end-->
+<!--训练切出-->
     <div class="train-quit" if="page == '15' && !showPrivacy">
         <image class="train-quit-icon" src="../../common/oppo_img_fit.png"></image>
         <text class="train-quit-text">
             请在手机上返回训练视频，继续您的训练
         </text>
     </div>
-    <!--训练切出end-->
-    <!--暂停播放倒计时-->
+
+<!--训练切出end-->
+<!--暂停播放倒计时-->
     <div class="train-down" if="page == '8' && !showPrivacy">
         <text class="train-down-text">
-            {{countdownT}}
+            {{ countdownT }}
         </text>
     </div>
-    <!---暂停播放倒计时end-->
-    <!--介绍页start-->
+
+<!---暂停播放倒计时end-->
+<!--介绍页start-->
     <stack class="stack-intro" if="page =='99' && !showPrivacy ">
         <swiper class="swiper-intro" @change="swiperChange">
             <div class="content-intro-div">
                 <image class="swper-intro-img01" src="../../common/hm_guide_01.png"></image>
             </div>
-            <!-- 已训练  -->
+
+        <!-- 已训练  -->
             <div class="content-intro-div">
                 <image class="swper-intro-img02" src="../../common/hm_guide_02.png"></image>
             </div>
         </swiper>
         <div class="content-intro-start-div ">
             <div class="intro-select">
-                <div if="{{tabIndex == 0}}" class="intro-select-item intro-select-item-active"></div>
-                <div if="{{tabIndex == 0}}" class="intro-select-item"></div>
-                <div if="{{tabIndex == 1}}" class="intro-select-item"></div>
-                <div if="{{tabIndex == 1}}" class="intro-select-item intro-select-item-active"></div>
+                <div if="{{ tabIndex == 0 }}" class="intro-select-item intro-select-item-active"></div>
+                <div if="{{ tabIndex == 0 }}" class="intro-select-item"></div>
+                <div if="{{ tabIndex == 1 }}" class="intro-select-item"></div>
+                <div if="{{ tabIndex == 1 }}" class="intro-select-item intro-select-item-active"></div>
             </div>
             <div class="swper-intro-img03-div">
                 <image class="swper-intro-img03" @click="introStart" src="../../common/hm_btn_start.png"></image>
             </div>
         </div>
     </stack>
-    <!--介绍页end--
+
+<!--介绍页end--
 
     <!--未下载提示页start-->
     <div class="start" if="page == '98' && !showPrivacy">
@@ -143,5 +157,6 @@
             请在手机上下载Fit App
         </text>
     </div>
-    <!--未下载提示页end-->
+
+<!--未下载提示页end-->
 </div>
\ No newline at end of file