签名证书和海外版统一

9f2e686d · Sky · b9ad6fe2 · 9f2e686d · 9f2e686d · 9f2e686d
Commit 9f2e686d authored Oct 15, 2020 by Sky
22 changed files
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,12 @@ apply plugin: 'com.huawei.ohos.app'
 ohos {
    signingConfigs {
        release {
+            storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
+            storePassword '0000001BA8DBFB85AF4C3C13D4E1154681D55F3BFAFF102F4A821F3435CA996DD0995FE410CA7C66E1C42F'
+            keyAlias 'huawei_watch_overseas Release'
+            keyPassword '0000001BE693BFFA074478CD0303FCA6F29E5C0DBFC29C097D218979DD9C1AF740EFAFC7EFFA3E9D74173A'
+            profile file('D:/HuaweiWatchClient/com.company.fit.provisionRelease.p7b')
+            certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_release.cer')
            signAlg 'SHA256withECDSA'
        }
    }

--- a/fitjs_certificate.cer
+++ b/fitjs_certificate.cer
@@ -32,20 +32,20 @@ ZPqdAjBLkf8NPZy7KVog98+iCTLq35DJ2ZVxkCxknA9YhiHVyXf4HPm4JlT7rW7o
 Q+FzM3c=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIC5jCCAmygAwIBAgIOCfW2YZ9oK72I9bBIhLgwCgYIKoZIzj0EAwMwYjELMAkG
+MIIC5TCCAmygAwIBAgIOY5lDtH5btRxQiQef3eowCgYIKoZIzj0EAwMwYjELMAkG
 A1UEBgwCQ04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UECwwKSHVhd2VpIENCRzEt
 MCsGA1UEAwwkSHVhd2VpIENCRyBEZXZlbG9wZXIgUmVsYXRpb25zIENBIEcyMB4X
-DTIwMDkwMzA1MzkyMloXDTIxMDkwMzA1MzkyMVowgawxCzAJBgNVBAYTAkNOMS0w
+DTIwMTAxNDEzMzI1MloXDTIxMTAxNDEzMzI1MVowgawxCzAJBgNVBAYTAkNOMS0w
 KwYDVQQKDCTkuIrmtbfljrvliqjnvZHnu5znp5HmioDmnInpmZDlhazlj7gxHTAb
 BgNVBAsMFDE0MDA1Nzg3NzE0NTc4ODA5MzMyMU8wTQYDVQQDDEbkuIrmtbfljrvl
 iqjnvZHnu5znp5HmioDmnInpmZDlhazlj7goMTQwMDU3ODc3MTQ1Nzg4MDkzMzIp
-LERldmVsb3BtZW50MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE3lqWvN9ND6Eg
+LERldmVsb3BtZW50MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEolt19EluYq4E
-8puC54BnoS87dZHNgu4tTEYJGmoep2SwAJ+9Ei51fL1QVXRXtf2M0bdmnT73kkPw
+SwK1ZoBFss25UzfoS0Oi/5FqM/LSqZHLhwBdzj6DuzxWzg//WqR8fUyVKOHveWsq
-Lj99S3RlRaOBujCBtzAMBgNVHRMBAf8EAjAAMEIGA1UdHwQ7MDkwN6A1oDOGMWh0
+74eqPZsrRKOBujCBtzAMBgNVHRMBAf8EAjAAMEIGA1UdHwQ7MDkwN6A1oDOGMWh0
 dHA6Ly9jcmwuY2xvdWQuaHVhd2VpLmNvbS9IdWF3ZWlDQkdIRFJHMmNybC5jcmww
-HwYDVR0jBBgwFoAU216TsiPo0OT+cXpm6aRzR1t/814wHQYDVR0OBBYEFCcWToDa
+HwYDVR0jBBgwFoAU216TsiPo0OT+cXpm6aRzR1t/814wHQYDVR0OBBYEFPTJ+4U7
-pEKNAvuQF2JJFDl85x/bMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEF
+Sw0c58w1Q3q8p+1NBEsfMA4GA1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEF
-BQcDAzAKBggqhkjOPQQDAwNoADBlAjEAgLfjR3j8boPyJfKONwgp28ySgoqKgQ+g
+BQcDAzAKBggqhkjOPQQDAwNnADBkAjAQUgyUQUJ2FIjNaQ40n2HP4X8Tet/hix60
-RtFF56ObjcT8x2irNRCePD0laGeA28IXAjASZp+cqL4oMQluhns2td51jQQ71XBs
+x6ScLEyj504//OCodoq+8UnFkVTkoj0CMB2xuZnj2mVXri8Ssa6EnbM/oMCITqYC
-E0UGTDid1YgFsK5C/dluYCUJ40u5GoQY3bY=
+Unv7vq5UziLH1SMfcoNXejx7aGuwtgmaGg==
 -----END CERTIFICATE-----
--- a/com.company.fit.overseas_release.cer
+++ b/com.company.fit.overseas_release.cer
+-----BEGIN CERTIFICATE-----
+MIICGjCCAaGgAwIBAgIIShhpn519jNAwCgYIKoZIzj0EAwMwUzELMAkGA1UEBhMC
+Q04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UECwwKSHVhd2VpIENCRzEeMBwGA1UE
+AwwVSHVhd2VpIENCRyBSb290IENBIEcyMB4XDTIwMDMxNjAzMDQzOVoXDTQ5MDMx
+NjAzMDQzOVowUzELMAkGA1UEBhMCQ04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UE
+CwwKSHVhd2VpIENCRzEeMBwGA1UEAwwVSHVhd2VpIENCRyBSb290IENBIEcyMHYw
+EAYHKoZIzj0CAQYFK4EEACIDYgAEWidkGnDSOw3/HE2y2GHl+fpWBIa5S+IlnNrs
+GUvwC1I2QWvtqCHWmwFlFK95zKXiM8s9yV3VVXh7ivN8ZJO3SC5N1TCrvB2lpHMB
+wcz4DA0kgHCMm/wDec6kOHx1xvCRo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUo45a9Vq8cYwqaiVyfkiS4pLcIAAwCgYIKoZI
+zj0EAwMDZwAwZAIwMypeB7P0IbY7c6gpWcClhRznOJFj8uavrNu2PIoz9KIqr3jn
+BlBHJs0myI7ntYpEAjBbm8eDMZY5zq5iMZUC6H7UzYSix4Uy1YlsLVV738PtKP9h
+FTjgDHctXJlC5L7+ZDY=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDATCCAoigAwIBAgIIXmuDXbWpOB8wCgYIKoZIzj0EAwMwUzELMAkGA1UEBhMC
+Q04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UECwwKSHVhd2VpIENCRzEeMBwGA1UE
+AwwVSHVhd2VpIENCRyBSb290IENBIEcyMB4XDTIwMDcwOTAyMDQyNFoXDTMwMDcw
+NzAyMDQyNFowYjELMAkGA1UEBgwCQ04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UE
+CwwKSHVhd2VpIENCRzEtMCsGA1UEAwwkSHVhd2VpIENCRyBEZXZlbG9wZXIgUmVs
+YXRpb25zIENBIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE65LdoIZh1hlpZ2gP
+bJ6gPhHsvYSRe22KETgdqeVeYnrbRHI9wsPT6RGYS+pU4mPl6wxzgDMqN6SY/BoZ
+luhkE1PzaHoPoNIWIq0O33hpyKyyYwAacIUEjYurkw1E9r9no4IBGDCCARQwHwYD
+VR0jBBgwFoAUo45a9Vq8cYwqaiVyfkiS4pLcIAAwHQYDVR0OBBYEFNtek7Ij6NDk
+/nF6Zumkc0dbf/NeMEYGA1UdIAQ/MD0wOwYEVR0gADAzMDEGCCsGAQUFBwIBFiVo
+dHRwOi8vY3BraS1jYXdlYi5odWF3ZWkuY29tL2Nwa2kvY3BzMBIGA1UdEwEB/wQI
+MAYBAf8CAQAwDgYDVR0PAQH/BAQDAgEGMGYGA1UdHwRfMF0wW6BZoFeGVWh0dHA6
+Ly9jcGtpLWNhd2ViLmh1YXdlaS5jb20vY3BraS9zZXJ2bGV0L2NybEZpbGVEb3du
+LmNybD9jZXJ0eXBlPTEwJi9yb290X2cyX2NybC5jcmwwCgYIKoZIzj0EAwMDZwAw
+ZAIwWO1X5q2MdfpR1Q237GpUHGbL1C13rGyFg2p3AYo44FpZ2/A9ss0wOHKM4KDl
+ZPqdAjBLkf8NPZy7KVog98+iCTLq35DJ2ZVxkCxknA9YhiHVyXf4HPm4JlT7rW7o
+Q+FzM3c=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIC4jCCAmigAwIBAgIOY5knkV4PxYkScGf/9ywwCgYIKoZIzj0EAwMwYjELMAkG
+A1UEBgwCQ04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UECwwKSHVhd2VpIENCRzEt
+MCsGA1UEAwwkSHVhd2VpIENCRyBEZXZlbG9wZXIgUmVsYXRpb25zIENBIEcyMB4X
+DTIwMDkyNzA1MjgwMFoXDTIzMDkyNzA1Mjc1OVowgagxCzAJBgNVBAYTAkNOMS0w
+KwYDVQQKDCTkuIrmtbfljrvliqjnvZHnu5znp5HmioDmnInpmZDlhazlj7gxHTAb
+BgNVBAsMFDE0MDA1Nzg3NzE0NTc4ODA5MzMyMUswSQYDVQQDDELkuIrmtbfljrvl
+iqjnvZHnu5znp5HmioDmnInpmZDlhazlj7goMTQwMDU3ODc3MTQ1Nzg4MDkzMzIp
+LFJlbGVhc2UwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASiW3X0SW5irgRLArVm
+gEWyzblTN+hLQ6L/kWoz8tKpkcuHAF3OPoO7PFbOD/9apHx9TJUo4e95ayrvh6o9
+mytEo4G6MIG3MAwGA1UdEwEB/wQCMAAwQgYDVR0fBDswOTA3oDWgM4YxaHR0cDov
+L2NybC5jbG91ZC5odWF3ZWkuY29tL0h1YXdlaUNCR0hEUkcyY3JsLmNybDAfBgNV
+HSMEGDAWgBTbXpOyI+jQ5P5xembppHNHW3/zXjAdBgNVHQ4EFgQU9Mn7hTtLDRzn
+zDVDeryn7U0ESx8wDgYDVR0PAQH/BAQDAgeAMBMGA1UdJQQMMAoGCCsGAQUFBwMD
+MAoGCCqGSM49BAMDA2gAMGUCMH5TGftYxwzWVxXJRYaWQ/lMVDCZMfUundCNjkwz
+axvkY493pfh/6t8kdx5UQDqpnAIxAOv7hZQ6iAAgqGW3TcGLUm7ptDz4RJm9aC73
+ZeeXm2myS/mE+gU8LWBpEPWG/w0CQg==
+-----END CERTIFICATE-----
--- a/fitjs_provisionDebug.p7b
+++ b/fitjs_provisionDebug.p7b
--- a/com.company.fit.provisionRelease.p7b
+++ b/com.company.fit.provisionRelease.p7b
--- a/entry/build.gradle
+++ b/entry/build.gradle
@@ -3,13 +3,22 @@ apply plugin: 'com.huawei.ohos.hap'
 ohos {
    signingConfigs {
        debug {
-            certpath file('D:/HuaweiWatchClient/fitjs_certificate.cer')
+            certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_debug.cer')
-            profile file('D:/HuaweiWatchClient/fitjs_provisionDebug.p7b')
+            profile file('D:/HuaweiWatchClient/com.company.fit.proDebug.p7b')
            signAlg 'SHA256withECDSA'
-            keyPassword '0000001BC4E4A99A1313A6D5ACBC0859CA370605139A0EEB174EB20A948AAB1365AE5A87A93F916BD52C16'
+            keyPassword '0000001B91CB7A87C60FC999DDD2BCDBA8D578B5C8DBB818CE2CDC02F5190E08191F69238AAEDB019E9CB5'
-            keyAlias 'huawei_watch Release'
+            keyAlias 'huawei_watch_overseas Release'
-            storePassword '0000001B6FBBA74F0356FAFA4A45C1573FF4F04809DED359D259DBDF563E31A75F2F8D4F5ABB2EDC2AC672'
+            storePassword '0000001B274F149CB95174CB5174B918C3945F5514CB95A7CB8A0A65B239297CAE2F3697FD27046A3E4B74'
-            storeFile file('D:/HuaweiWatchClient/huawei_watch.jks')
+            storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
+        }
+        release {
+            storeFile file('D:/HuaweiWatchClient/huawei_watch_overseas.p12')
+            storePassword '0000001BF3E0F7119A4D4AA09CA834CEE57597D549140F82F1D8A44B2C4048F81E7E353510DBC7AB282BB4'
+            keyAlias 'huawei_watch_overseas Release'
+            keyPassword '0000001B2E7E1F6C1396C80A08713B5388FEB76CBD2F743AE67E39F510073793C9104EB4E0159E4FA12807'
+            signAlg 'SHA256withECDSA'
+            profile file('D:/HuaweiWatchClient/com.company.fit.provisionRelease.p7b')
+            certpath file('D:/HuaweiWatchClient/com.company.fit.overseas_release.cer')
        }
    }
    compileSdkVersion 3

--- a/entry/src/main/config.json
+++ b/entry/src/main/config.json
@@ -41,7 +41,8 @@
    "js": [
      {
        "pages": [
-          "pages/index/index"
+          "pages/index/index",
+          "pages/end/end"
        ],
        "name": "default"
      }

--- a/entry/src/main/js/default/common/hm_btn_start.png
+++ b/entry/src/main/js/default/common/hm_btn_start.png
--- a/entry/src/main/js/default/common/hm_guide_01.png
+++ b/entry/src/main/js/default/common/hm_guide_01.png
--- a/entry/src/main/js/default/common/hm_guide_02.png
+++ b/entry/src/main/js/default/common/hm_guide_02.png
--- a/entry/src/main/js/default/pages/end/end.css
+++ b/entry/src/main/js/default/pages/end/end.css
+.container {
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 454px;
+    height: 454px;
+    color: #FFFFFF;
+    flex-direction: column;
+}
+/*完成训练*/
+.train-end {
+    width: 454px;
+    height: 454px;
+    flex-direction: column;
+}
+.train-end-tt {
+    height: 103px;
+    width: 454px;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+    margin-top: 40px;
+}
+.train-end-tt-text {
+    font-size: 38px;
+    margin-bottom: 10px;
+}
+.train-end-time {
+    font-size: 30px;
+    color: #A8A8A8;
+}
+.train-end-list {
+    align-items: flex-end;
+    width: 454px;
+    height: 200px;
+    flex-direction: column;
+    margin-top: 20px;
+}
+.train-end-list-item {
+    width: 450px;
+    height: 40px;
+    justify-content: center;
+    margin-bottom: 30px;
+}
+.train-end-label {
+    height: 38px;
+    width: 147px;
+    color: #A8A8A8;
+    font-size: 30px;
+    margin-top: 6px;
+}
+.train-end-num {
+    width: 104px;
+    margin-right: 16px;
+    font-size: 38px;
+    text-align: right;
+}
+.train-end-unit {
+    width: 83px;
+    color: #A8A8A8;
+    font-size: 30px;
+    margin-top: 6px;
+}
+.train-end-btn-box {
+    width: 454px;
+    height: 91px;
+    justify-content: center;
+}
+.train-end-btn {
+    width: 327px;
+    height: 91px;
+}
\ No newline at end of file
--- a/entry/src/main/js/default/pages/end/end.hml
+++ b/entry/src/main/js/default/pages/end/end.hml
+<div class="container" onswipe="touchMove">
+    <!--完成训练-->
+    <div class="train-end">
+        <div class="train-end-tt">
+            <text class="train-end-tt-text">
+                运动数据
+            </text>
+            <text class="train-end-time">
+                {{fitTotalDuration}}分钟
+            </text>
+        </div>
+        <div class="train-end-list">
+            <div class="train-end-list-item">
+                <text class="train-end-label">
+                    平均心率
+                </text>
+                <text class="train-end-num">
+                    {{averHeartRate}}
+                </text>
+                <text class="train-end-unit">
+                    Bpm
+                </text>
+            </div>
+            <div class="train-end-list-item">
+                <text class="train-end-label">
+                    最高心率
+                </text>
+                <text class="train-end-num">
+                    {{maxHeartRate}}
+                </text>
+                <text class="train-end-unit">
+                    Bpm
+                </text>
+            </div>
+            <div class="train-end-list-item">
+                <text class="train-end-label">
+                    我的消耗
+                </text>
+                <text class="train-end-num">
+                    {{acCalorie}}
+                </text>
+                <text class="train-end-unit">
+                    千卡
+                </text>
+            </div>
+        </div>
+        <div class="train-end-btn-box" @click="end">
+            <image class="train-end-btn" src="../../common/hm_btn_finish.png"></image>
+        </div>
+    </div>
+    <!--完成训练end-->
+</div>
\ No newline at end of file
--- a/entry/src/main/js/default/pages/end/end.js
+++ b/entry/src/main/js/default/pages/end/end.js
+import brightness from '@system.brightness' //保持屏幕常亮
+import app from '@system.app' //右滑退出
+import router from '@system.router' //页面跳转
+var timer;
+export default {
+    data: {
+        acCalorie: "0", //卡路里
+        fitTotalDuration: "", //训练时长-用于训练完成界面
+        averHeartRate: "", //平均心率
+        maxHeartRate: "", //最高心率
+    },
+    onReady() {
+        let _this = this;
+        //获取客户端信息
+        _this.getMsg();
+        //更新页面数据
+        _this.acCalorie = _this.endCalorie;
+        _this.fitTotalDuration = _this.endTotalTime;
+        _this.averHeartRate = _this.endAverHeartRate;
+        _this.maxHeartRate = _this.endMaxHeartRate;
+    },
+    onShow() {
+        let _this = this;
+        //保持屏幕常亮
+        _this.keepScreenOn();
+        timer = setInterval(function () {
+            _this.keepScreenOn();
+        },2 * 60 * 1000);
+    },
+    onDestroy() {
+        if (timer != null) {
+            clearInterval(timer);
+        }
+        //取消接收手机侧第三方应用发过来的消息
+        FeatureAbility.unsubscribeMsg();
+    },
+    start(msg) {
+        let _this = this;
+        let model = msg.acModel;
+        //训练完成页面，只接收重新开始训练事件
+        if (msg.eventFlg == "17") {
+            router.replace({
+                uri: "pages/index/index",
+                params: {
+                    initPage: "0"
+                }
+            });
+        }
+    },
+/**
+  *保持屏幕常亮
+  */
+    keepScreenOn() {
+        brightness.setKeepScreenOn({
+            keepScreenOn: true,
+            success: function () {
+            },
+            fail: function (data, code) {
+            }
+        })
+    },
+/**
+  *获取客户端短消息
+    */
+    getMsg() {
+        let _this = this;
+        FeatureAbility.subscribeMsg({
+            success: function (data) {
+                _this.start(JSON.parse(data.message));
+            },
+            fail: function (data, code) {
+            }
+        });
+    },
+/**
+  *完成
+   */
+    end() {
+        router.replace({
+            uri: "pages/index/index",
+            params: {
+                initPage: "11"
+            }
+        });
+    },
+/**
+    *右滑退出
+    */
+    touchMove: function (e) {
+        if (e.direction == "right") {
+            app.terminate();
+        }
+    }
+}
--- a/entry/src/main/js/default/pages/index/index.css
+++ b/entry/src/main/js/default/pages/index/index.css
@@ -10,8 +10,8 @@
 }
 /*准备开始*/
 .logo {
-    width: 230px;
+    width: 224px;
-    height: 129px;
+    height: 127px;
 }
 .start {
    width: 454px;
@@ -23,51 +23,23 @@
    font-size: 38px;
    text-align: center;
 }
-/* 标题 */
+/* 动作预览 */
-.title {
+.train-view {
    width: 454px;
    height: 454px;
+    flex-direction: column;
    align-items: center;
-    justify-content: center;
-}
-.text {
-    color: #ffffff;
-    font-size: 38px;
-    width: 262px;
-}
-/* 标题 */
-.install {
-    width: 280px;
-    height: 120px;
-    align-items: center;
-    justify-content: center;
 }
-/*对端应用未安装*/
+.train-page-title {
-.installText {
-    color: #ffffff;
    font-size: 38px;
-    width: 280px;
+    height: 130px;
+    margin-top: 60px;
+    width: 350px;
+    color: #FFFFFF;
    text-align: center;
    justify-content: center;
 }
-/*倒计时*/
+.train-pape-num-box {
-.count-down {
-    font-size: 38px;
-    color: #FFD208;
-}
-.count-down-num {
-    width: 60px;
-    height: 170px;
-}
-/* 动作预览 */
-.train-view {
-    width: 454px;
-    height: 454px;
-    flex-direction: column;
-    align-items: center;
-}
-.train-page-title,.train-pape-num-box {
    font-size: 38px;
    height: 130px;
    margin-top: 60px;
@@ -79,10 +51,6 @@
 .train-pape-num {
    font-size: 38px;
 }
-.train-pape-num-f {
-    font-size: 30px;
-    margin-top: 8px;
-}
 .train-pape-num-o {
    color: #FFD208;
    font-size: 38px;
@@ -111,7 +79,13 @@
    height: 54px;
    margin-top: 26px;
 }
-.train-heartbeat,.train-calorie {
+.train-heartbeat {
+    width: 175px;
+    height: 54px;
+    justify-content: center;
+    align-items: center;
+}
+.train-calorie {
    width: 175px;
    height: 54px;
    justify-content: center;
@@ -129,9 +103,6 @@
    align-items: center;
    font-size: 38px;
 }
-.train-num-text-no {
-    color: #C8C8C8;
-}
 .select {
    width: 454px;
@@ -165,14 +136,6 @@
    margin-top: 26px;
    font-size: 38px;
 }
-.train-time-icon {
-    width: 46px;
-    height: 130px;
-}
-.train-time-icon-d {
-    width: 26px;
-    height: 130px;
-}
 .train-tool {
    width: 454px;
    height: 120px;
@@ -202,17 +165,16 @@
    width: 90px;
    height: 160px;
 }
-.train-quit-logo-icon {
+.train-quit-text {
-    width: 120px;
-    height: 68px;
-}
-.train-quit-text-box {
-    width: 350px;
-    height: 84px;
    margin-top: 32px;
+    width: 300px;
+    text-align: center;
 }
 .train-quit-text {
-    width: 350px;
+    margin-top: 32px;
+    width: 370px;
+    font-size: 30px;
    text-align: center;
 }
@@ -237,94 +199,93 @@
    height: 418px;
    flex-direction: row;
 }
-.todo-item {
+/**退出**/
+.train-out {
    width: 454px;
-    height: 418px;
+    height: 454px;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+}
+.train-out-icon {
+    width: 120px;
+    height: 68px;
+}
+.train-out-text {
+    margin-top: 32px;
+    width: 230px;
+    text-align: center;
 }
-/*完成训练*/
+.stack-intro {
-.train-end {
    width: 454px;
    height: 454px;
-    flex-direction: column;
 }
-.train-end-tt {
-    height: 103px;
+.content-intro-div {
    width: 454px;
-    justify-content: center;
+    height: 454px;
-    align-items: center;
-    flex-direction: column;
-    margin-top: 40px;
-}
-.train-end-tt-text {
-    font-size: 38px;
-    margin-bottom: 10px;
-}
-.train-end-time {
-    font-size: 30px;
-    color: #A8A8A8;
 }
-.train-end-list {
+.content-intro-start-div {
-    align-items: flex-end;
    width: 454px;
-    height: 200px;
    flex-direction: column;
-    margin-top: 20px;
+    background-color: transparent;
+    height: 454px;
 }
-.train-end-list-item {
+.swiper-intro {
-    width: 450px;
+    flex-direction: row;
-    height: 38px;
+    width: 454px;
-    justify-content: center;
+    height: 454px;
-    margin-bottom: 30px;
 }
-.train-end-label {
+.swper-intro-img {
-    height: 38px;
+    width: 454px;
-    width: 147px;
+    height: 454px;
-    color: #A8A8A8;
-    font-size: 30px;
-    margin-top: 6px;
 }
-.train-end-num {
-    width: 104px;
+.swper-intro-img01 {
-    margin-right: 16px;
+    width: 454px;
-    font-size: 38px;
+    margin-top: 38px;
-    text-align: right;
+    height: 266px;
 }
-.train-end-unit {
+.swper-intro-img02 {
-    width: 83px;
+    margin-top: 38px;
-    color: #A8A8A8;
+    width: 454px;
-    font-size: 30px;
+    height: 266px;
-    margin-top: 6px;
 }
-.train-end-btn-box {
+.swper-intro-img03-div {
    width: 454px;
    height: 91px;
    justify-content: center;
 }
-.train-end-btn {
+.swper-intro-img03 {
    width: 327px;
    height: 91px;
 }
-/**退出**/
-.train-out {
+.intro-select {
    width: 454px;
-    height: 454px;
+    height: 36px;
-    flex-direction: column;
+    margin-top: 335px;
-    align-items: center;
    justify-content: center;
 }
-.train-out-icon {
-    width: 120px;
+.intro-select-item {
-    height: 68px;
+    width: 12px;
+    height: 12px;
+    border-radius: 12px;
+    margin-left: 6px;
+    margin-right: 6px;
+    background-color: rgba(255, 255, 255, 0.44);
 }
-.train-out-text-box {
+.intro-select-item-active {
-    width: 350px;
+    background-color: #FFFFFF;
-    height: 84px;
-    margin-top: 32px;
-    flex-direction: column;
 }
-.train-out-text {
-    width: 350px;
+.download-text {
+    width: 230px;
+    font-size: 30px;
    text-align: center;
-    height: 42px;
 }
--- a/entry/src/main/js/default/pages/index/index.hml
+++ b/entry/src/main/js/default/pages/index/index.hml
@@ -2,48 +2,22 @@
    <!--启动页面-->
    <image class="logo" if="!page" src="../../common/default_img.png"></image>
    <!--启动页面-->
-    <!--训练切出-->
-    <div class="train-quit" if="page == '12'">
-        <image class="train-quit-icon" src="../../common/oppo_img_fit.png"></image>
-        <div class="train-quit-text-box">
-            <text class="train-quit-text ">
-                请在手机上打开Fit，并登录账户
-            </text>
-        </div>
-    </div>
-    <!--训练切出end-->
    <!--准备开始-->
    <div class="start" if="page == '0'">
-        <text class="start-text">准备开始
+        <text class="start-text">
+            准备开始
        </text>
    </div>
    <!--准备开始end-->
-    <!--训练准备倒计时-->
-    <div class="start" if="page == '1'">
-        <text class="start-text count-down">{{countdownT}}
-        </text>
-    </div>
-    <!--训练准备倒计时end-->
-    <!-- 标题  -->
-    <div class="start" if="page == '2' && !dataPageShow">
-        <text class="start-text text">{{acName}}
-        </text>
-    </div>
-    <!-- 对端应用未安装  -->
-    <div class="install" if="page == '999'">
-        <text class="installText">
-            {{installText}}
-        </text>
-    </div>
    <!-- 标题end  -->
    <swiper index="{{tabIndex}}" class="todo-wraper" if="dataPageShow" @change="swiperChange">
-        <div class="todo-item">
        <!-- 动作预览  -->
        <div class="train-view">
            <text if="page == '2'||page == '3'" class="train-page-title">
+                <!--动作预览 -->
                动作预览
            </text>
-                <div if="page == '4' " class="train-pape-num-box">
+            <div if="page == '1'||page == '4' " class="train-pape-num-box">
                <text class="train-pape-num-o">{{countdownT}}
                </text>
            </div>
@@ -68,13 +42,12 @@
                    </text>
                </div>
            </div>
-            </div>
            <!-- 动作预览end  -->
        </div>
-        <div class="todo-item">
        <!-- 已训练  -->
        <div class="train-view">
            <text class="train-new-title">
+                <!--已训练 -->
                已训练
            </text>
            <text class="train-time">{{fitDuration}}
@@ -86,14 +59,12 @@
            <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" @click="previous"src="../../common/oppo_btn_previous.png"
+                <image class="train-tool-icon" @click="previous" src="../../common/oppo_btn_previous.png" else></image>
-                            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" @click="next" src="../../common/oppo_btn_next.png" else></image>
            </div>
-            </div>
            <!-- 已训练end  -->
        </div>
    </swiper>
@@ -108,12 +79,10 @@
    <!--训练切出-->
    <div class="train-quit" if="page == '15'">
        <image class="train-quit-icon" src="../../common/oppo_img_fit.png"></image>
-        <div class="train-quit-text-box">
        <text class="train-quit-text">
            请在手机上返回训练视频，继续您的训练
        </text>
    </div>
-    </div>
    <!--训练切出end-->
    <!--暂停播放倒计时-->
    <div class="train-down" if="page == '8'">
@@ -122,61 +91,44 @@
        </text>
    </div>
    <!---暂停播放倒计时end-->
-    <!--完成训练-->
+    <!--退出训练-->
-    <div class="train-end" if="page == '9'">
+    <div class="train-out" if="page == '10' || page == '11'">
-        <div class="train-end-tt">
+        <image class="train-out-icon" src="../../common/hm_img_logo.png"></image>
-            <text class="train-end-tt-text">
+        <text class="train-out-text">
-                运动数据
+            在手机上开启你今天的训练
-            </text>
-            <text class="train-end-time">{{fitTotalDuration}}分钟
-            </text>
-        </div>
-        <div class="train-end-list">
-            <div class="train-end-list-item">
-                <text class="train-end-label">
-                    平均心率
-                </text>
-                <text class="train-end-num">{{averHeartRate}}
-                </text>
-                <text class="train-end-unit">
-                    Bpm
        </text>
    </div>
-            <div class="train-end-list-item">
+    <!--退出训练-->
-                <text class="train-end-label">
+    <!--介绍页start-->
-                    最高心率
+    <stack class="stack-intro" if="page == '99'">
-                </text>
+        <swiper class="swiper-intro" @change="swiperChange">
-                <text class="train-end-num">{{maxHeartRate}}
+            <div class="content-intro-div">
-                </text>
+                <image class="swper-intro-img01" src="../../common/hm_guide_01.png"></image>
-                <text class="train-end-unit">
-                    Bpm
-                </text>
            </div>
-            <div class="train-end-list-item">
+            <!-- 已训练  -->
-                <text class="train-end-label">
+            <div class="content-intro-div">
-                    我的消耗
+                <image class="swper-intro-img02" src="../../common/hm_guide_02.png"></image>
-                </text>
-                <text class="train-end-num">{{acCalorie}}
-                </text>
-                <text class="train-end-unit">
-                    千卡
-                </text>
            </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>
-        <div  class="train-end-btn-box" @click="end">
+            <div class="swper-intro-img03-div">
-            <image class="train-end-btn" src="../../common/hm_btn_finish.png"></image>
+                <image class="swper-intro-img03" @click="introStart" src="../../common/hm_btn_start.png"></image>
            </div>
        </div>
-    <!--完成训练end-->
+    </stack>
-    <!--退出训练-->
+    <!--介绍页end--
-    <div class="train-out" if="page == '10' || page == '11'">
-        <image class="train-out-icon" src="../../common/hm_img_logo.png"></image>
+    <!--未下载提示页start-->
-        <div class="train-out-text-box">
+    <div class="start" if="page == '98'">
-            <text class="train-out-text">
+        <text class="download-text">
-                在手机上开启你
+            请在手机上下载Fit App
-                  今天的训练
        </text>
    </div>
-    </div>
+    <!--未下载提示页end-->
-    <!--退出训练end-->
 </div>
\ No newline at end of file
--- a/entry/src/main/js/default/pages/index/index.js
+++ b/entry/src/main/js/default/pages/index/index.js
--- a/huawei_watch.csr
+++ b/huawei_watch.csr
-----BEGIN NEW CERTIFICATE REQUEST-----
-MIIBTTCB8gIBADBgMR0wGwYDVQQDDBRodWF3ZWlfd2F0Y2ggUmVsZWFzZTEhMB8G
-A1UECxMYSE9TIERldmVsb3BtZW50IElERSBUZWFtMQ8wDQYDVQQKEwZIdWF3ZWkx
-CzAJBgNVBAYTAkNOMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE3lqWvN9ND6Eg
-8puC54BnoS87dZHNgu4tTEYJGmoep2SwAJ+9Ei51fL1QVXRXtf2M0bdmnT73kkPw
-Lj99S3RlRaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFCcWToDapEKNAvuQ
-F2JJFDl85x/bMAwGCCqGSM49BAMCBQADSAAwRQIhAJ3kDnTtmDLJxO0vltECjQPU
-6CK6j0j+fz4oYCW8WEs2AiB4Dzt/cJB7KVeDKtON3k/cVCWCCW2kV1wzao1mbPp+
-4w==
-----END NEW CERTIFICATE REQUEST-----
--- a/huawei_watch.jks
+++ b/huawei_watch.jks
--- a/huawei_watch_overseas.csr
+++ b/huawei_watch_overseas.csr
+-----BEGIN NEW CERTIFICATE REQUEST-----
+MIIBVzCB+wIBADBpMSYwJAYDVQQDDB1odWF3ZWlfd2F0Y2hfb3ZlcnNlYXMgUmVs
+ZWFzZTEhMB8GA1UECxMYSE9TIERldmVsb3BtZW50IElERSBUZWFtMQ8wDQYDVQQK
+EwZIdWF3ZWkxCzAJBgNVBAYTAkNOMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE
+olt19EluYq4ESwK1ZoBFss25UzfoS0Oi/5FqM/LSqZHLhwBdzj6DuzxWzg//WqR8
+fUyVKOHveWsq74eqPZsrRKAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0OBBYEFPTJ
+4U7Sw0c58w1Q3q8p+1NBEsfMAwGCCqGSM49BAMCBQADSQAwRgIhALzrycPCGQ3q
+cruxhj6xO9PDH1LnxP0834f+WQu9z5BfAiEA2E/N28Q8OEwyHzLQSm0wTv43I2gi
+x9QZsupj1wVGU0c=
+-----END NEW CERTIFICATE REQUEST-----
--- a/huawei_watch_overseas.jks
+++ b/huawei_watch_overseas.jks
--- a/huawei_watch_overseas.p12
+++ b/huawei_watch_overseas.p12
--- a/local.properties
+++ b/local.properties
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Fri Sep 25 14:02:18 CST 2020
+hwsdk.dir=C\:\\Users\\Administrator\\AppData\\Local\\Huawei\\Sdk
+nodejs.dir=C\:\\Program Files\\nodejs