fix: 修改了部分BUG， 更换了主体

AppScope/app.json5

@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "com.ytpm.jmzj",
+    "bundleName": "com.qmpm.jmzj",
     "vendor": "example",
     "versionCode": 1000000,
     "versionName": "1.0.0",

build-profile.json5

@@ -5,12 +5,12 @@
         "name": "default",
         "material": {
           "storeFile": "sign/basic.p12",
-          "storePassword": "000000186C8C6C768E09966170A33478A0A3F425A24D6C89127FB6A923A941CEA74AA8F0E352F99C",
+          "storePassword": "00000018D5270367A24BBD3C42A9095A11840620DD89B07C16F38C47E9856C37FA98D2C845205F44",
           "keyAlias": "yt112233",
-          "keyPassword": "00000018157D987A630DF9B0587F65242F42EE17C3CD29E75EE7DD5E0C2798F49CAE78188FFFE415",
+          "keyPassword": "000000181360C23C9CDEAA57A971AFEBA1C90085818A58C1208D7EC0541C1683ADE9A3D4D87424D1",
           "signAlg": "SHA256withECDSA",
-          "profile": "sign/军迷之家调试Debug.p7b",
-          "certpath": "sign/调试证书.cer"
+          "profile": "sign/军迷之家调试证书Debug.p7b",
+          "certpath": "sign/柒沐调试证书.cer"
         }
       }
     ],

commons/basic/oh-package.json5

@@ -9,7 +9,7 @@
   "dependencies": {
     "@ohos/axios": "^2.2.4",
     "@abner/log": "^1.0.5",
-    "@ibestservices/ibest-ui": "2.0.6",
+    "@ibestservices/ibest-ui": "2.1.2",
     "@tencent/wechat_open_sdk": "^1.0.0",
     "lunar": "^1.0.0",
     "@mumu/crop": "^1.0.3",

features/feature/src/main/ets/components/YtComp/YTDiaLogBuild.ets

@@ -308,6 +308,7 @@ struct HistoryToday{
         Image($r('app.media.icon_close'))
           .width(24)
           .aspectRatio(1)
+          .onClick(() => { this.onBack('false') })
       }
       .width("100%")
       .justifyContent(FlexAlign.SpaceBetween)

features/feature/src/main/ets/pages/MsgDetailPage.ets

@@ -10,6 +10,34 @@ struct MsgDetailPage {
 
   @Param @Require item: MilitaryNewsItem
 
+  controller: Scroller = new Scroller()
+  timer1: number = -1
+  timer2: number = -1
+
+  scroll(){
+    this.timer1 = setInterval(() => {
+      const curOffset: OffsetResult = this.controller.currentOffset()
+      this.controller.scrollTo({
+        xOffset: curOffset.xOffset + 50, yOffset: curOffset.yOffset, animation: {
+          duration: 1000,
+          curve: Curve.Linear
+        }
+      })
+      if (this.controller.isAtEnd()) {
+        clearInterval(this.timer1);
+        this.timer2 = setTimeout(() => {
+          this.controller.scrollTo({ xOffset: 0, yOffset: 0, animation: { duration: 200 } })
+          this.scroll()
+        }, 100)
+      }
+    }, 500)
+  }
+
+  aboutToDisappear(): void {
+    clearInterval(this.timer1)
+    clearTimeout(this.timer2)
+  }
+
   build() {
     NavDestination() {
       Column({space: 18}) {
@@ -47,13 +75,19 @@ struct MsgDetailPage {
 
   @Builder
   titleComp(){
-    Text(this.item.title)
-      .width(270)
-      .maxLines(1)
-      .fontSize(18)
-      .fontWeight(500)
-      .fontColor(Color.Black)
-      .textOverflow({overflow: TextOverflow.Ellipsis})
+    Scroll(this.controller){
+      Text(this.item.title + '456666')
+        .fontSize(18)
+        .fontWeight(500)
+        .fontColor(Color.Black)
+    }
+    .width(270)
+    .height(54)
+    .scrollBar(BarState.Off)
+    .scrollable(ScrollDirection.Horizontal)
+    .onAppear(() => {
+      this.scroll()
+    })
   }
 }
 

features/user/src/main/ets/pages/Privacy.ets

@@ -21,7 +21,7 @@ export struct Privacy {
     Column() {
       YTHeader({ defaultStyle: { title: '隐私政策' } })
       Web({
-        src: "https://hm-static.ytpm.net/military/jmzj%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html",
+        src: "https://hm-static.ytpm.net/military/%E5%86%9B%E8%BF%B7%E4%B9%8B%E5%AE%B6%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html",
         controller: this.webviewController,
         renderMode: RenderMode.ASYNC_RENDER // 设置渲染模式
       }).padding(20)

features/user/src/main/ets/views/Mine_.ets

@@ -138,9 +138,9 @@ export struct Mine_ {
       const data = new systemShare.SharedData({
         // utd: uniformTypeDescriptor.UniformDataType.HYPERLINK,
         utd: uniformTypeDescriptor.UniformDataType.TEXT,
-        title: '快理货',
-        content: 'http://appgallery.huawei.com/app/detail?id=6917586913198936201',
-        description: "http://appgallery.huawei.com/app/detail?id=6917586913198936201"
+        title: '军迷之家',
+        content: 'http://appgallery.huawei.com/app/detail?id=6917587452564006094',
+        description: "http://appgallery.huawei.com/app/detail?id=6917587452564006094"
       })
       const controller = new systemShare.ShareController(data)
       const context = this.getUIContext().getHostContext()! as common.UIAbilityContext;

products/entry/src/main/ets/pages/PrivacyPage.ets

@@ -14,7 +14,7 @@ struct PrivacyPage {
   private forEach: Array<BasicType> = [
     {
       text: '隐私政策',
-      message: 'https://hm-static.ytpm.net/military/jmzj%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html'
+      message: 'https://hm-static.ytpm.net/military/%E5%86%9B%E8%BF%B7%E4%B9%8B%E5%AE%B6%E9%9A%90%E7%A7%81%E6%94%BF%E7%AD%96.html'
     }, {
       text: '用户协议',
       message: 'https://hm-static.ytpm.net/military/%E5%86%9B%E8%BF%B7%E4%B9%8B%E5%AE%B6%E7%94%A8%E6%88%B7%E5%8D%8F%E8%AE%AE.html'

sign/柒沐发布证书.cer

@@ -0,0 +1,51 @@
+-----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-----
+MIIC+DCCAn6gAwIBAgIOY9hidiM3j0iVWIWNwb4wCgYIKoZIzj0EAwMwYjELMAkG
+A1UEBgwCQ04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UECwwKSHVhd2VpIENCRzEt
+MCsGA1UEAwwkSHVhd2VpIENCRyBEZXZlbG9wZXIgUmVsYXRpb25zIENBIEcyMB4X
+DTI1MTAyMzA2MjE1MVoXDTI4MTAyMzA2MjE1MVowgacxCzAJBgNVBAYTAkNOMS0w
+KwYDVQQKDCTljqbpl6jmn5LmspDnvZHnu5znp5HmioDmnInpmZDlhazlj7gxHDAa
+BgNVBAsMEzE4MDI5NTA5MTgxOTU0MDEyMTcxSzBJBgNVBAMMQuWOpumXqOafkuay
+kOe9kee7nOenkeaKgOaciemZkOWFrOWPuCgxODAyOTUwOTE4MTk1NDAxMjE3KVws
+UmVsZWFzZTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIf2hGk6HXriP5hX4dNP
+byRoruiLLVoGk+VAQVpECaTJxM+a06oEp4cIF9szL+KdLP398wiDByzBlbDuKdU3
+xiCjgdEwgc4wHQYDVR0OBBYEFN4Fmm6PaSq3B1G4xBGPrVWjcs7KMAwGA1UdEwEB
+/wQCMAAwHwYDVR0jBBgwFoAU216TsiPo0OT+cXpm6aRzR1t/814wWQYDVR0fBFIw
+UDBOoEygSoZIaHR0cDovL2g1aG9zdGluZy1kcmNuLmRiYW5rY2RuLmNuL2NjaDUv
+Y3JsL2hkcmNhZzIvSHVhd2VpQ0JHSERSRzJjcmwuY3JsMA4GA1UdDwEB/wQEAwIH
+gDATBgNVHSUEDDAKBggrBgEFBQcDAzAKBggqhkjOPQQDAwNoADBlAjBdy9kpYjxx
+6E1/iFmmnqiK2ue3aWZExG3X+OpShmzke5yB6eUefskOnZ+Jt3F20TYCMQDw1bPJ
+i6AWDMqouwBljbwbzVj3mP6eZd1Dow/DlGSEyrlnb/QtBky8bJ7IkTPaBOs=
+-----END CERTIFICATE-----

sign/柒沐调试证书.cer

@@ -0,0 +1,51 @@
+-----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-----
+MIIC/DCCAoKgAwIBAgIOCfwJ2J0YNF0MiiGUUlEwCgYIKoZIzj0EAwMwYjELMAkG
+A1UEBgwCQ04xDzANBgNVBAoMBkh1YXdlaTETMBEGA1UECwwKSHVhd2VpIENCRzEt
+MCsGA1UEAwwkSHVhd2VpIENCRyBEZXZlbG9wZXIgUmVsYXRpb25zIENBIEcyMB4X
+DTI1MTAyMzA2MjEzOFoXDTI2MDQyMTA2MjEzOFowgasxCzAJBgNVBAYTAkNOMS0w
+KwYDVQQKDCTljqbpl6jmn5LmspDnvZHnu5znp5HmioDmnInpmZDlhazlj7gxHDAa
+BgNVBAsMEzE4MDI5NTA5MTgxOTU0MDEyMTcxTzBNBgNVBAMMRuWOpumXqOafkuay
+kOe9kee7nOenkeaKgOaciemZkOWFrOWPuCgxODAyOTUwOTE4MTk1NDAxMjE3KVws
+RGV2ZWxvcG1lbnQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASH9oRpOh164j+Y
+V+HTT28kaK7oiy1aBpPlQEFaRAmkycTPmtOqBKeHCBfbMy/inSz9/fMIgwcswZWw
+7inVN8Ygo4HRMIHOMB0GA1UdDgQWBBTeBZpuj2kqtwdRuMQRj61Vo3LOyjAMBgNV
+HRMBAf8EAjAAMB8GA1UdIwQYMBaAFNtek7Ij6NDk/nF6Zumkc0dbf/NeMFkGA1Ud
+HwRSMFAwTqBMoEqGSGh0dHA6Ly9oNWhvc3RpbmctZHJjbi5kYmFua2Nkbi5jbi9j
+Y2g1L2NybC9oZHJjYWcyL0h1YXdlaUNCR0hEUkcyY3JsLmNybDAOBgNVHQ8BAf8E
+BAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwMwCgYIKoZIzj0EAwMDaAAwZQIxAKwn
+g+ua8fy89kEo7JEGZD4GPsXrbKQBFTNoDUP+Egv9lW2NA2Qi4SftfFjkggGusQIw
+SUhfi8koYHBaB6RZIamvsqv3uROtM00jFQNqtx0fOkBQfYDJTGOcoW8qmXFZZDwp
+-----END CERTIFICATE-----