Merge branch 'main' of http://192.168.1.42/developOne/harmonyPool

@@ -44,10 +44,14 @@ export struct ZhSingleRow04 {
         .onClick(() => {
           if (this.compDTO?.objectType === '11') {
             ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
-          } else if (this.compDTO?.objectType === '5') {
-            ProcessUtils._gotoSpecialTopic(this.compDTO.linkUrl)
-          } else if (this.compDTO?.objectType === '6') {
-            ProcessUtils._gotoDefaultWeb(this.compDTO.linkUrl)
+          } else {
+            const contentDTO: ContentDTO = {
+              objectId: this.compDTO.objectId,
+              objectType: this.compDTO.objectType,
+              linkUrl: this.compDTO.linkUrl,
+              pageId: this.compDTO.pageId
+            } as ContentDTO
+            ProcessUtils.processPage(contentDTO)
           }
         })
       }
@@ -84,6 +88,7 @@ export struct ZhSingleRow04 {
       .scrollBar(BarState.Off)
       .width(CommonConstants.FULL_PARENT)
       .height(166)
+      .edgeEffect(EdgeEffect.None)
     }
     .width(CommonConstants.FULL_WIDTH)
     .backgroundColor($r("app.color.white"))

@@ -86,6 +86,7 @@ export struct TopNavigationComponentNew {
                   navIndex: index,
                   pageId: navItem?.pageId + '',
                   channelId: navItem?.channelId + '',
+                  autoRefresh: this.autoRefresh2Page
                 })
               } else
                 if (!this.isBroadcast(navItem) && !this.isLayout(navItem)) {

@@ -14,7 +14,6 @@ import {
 import { ViewType } from 'wdConstant/src/main/ets/enum/ViewType';
 import { channelSkeleton } from '../skeleton/channelSkeleton'
 import { EmptyComponent } from '../view/EmptyComponent';
-import { ErrorComponent } from '../view/ErrorComponent';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import MinePageDatasModel from '../../model/MinePageDatasModel';
 import { FollowListDetailRequestItem } from '../../viewmodel/FollowListDetailRequestItem';
@@ -26,13 +25,14 @@ import PageHelper from '../../viewmodel/PageHelper';
 import { PeopleShipAttentionContentListTopComponent } from './PeopleShipAttentionContentListTopComponent'
 import { CardParser } from '../CardParser'
 import { PeopleShipNoMoreData } from '../reusable/PeopleShipNoMoreData';
-
+const TAG = 'PeopleShipMainComponent';
 @Preview
 @Component
 export struct PeopleShipMainComponent {
   @State private pageModel: PageModel = new PageModel();
   @State private pageAdvModel: PageAdModel = new PageAdModel();
-
+  // 自动刷新通知
+  @Prop @Watch('onAutoRefresh') autoRefresh: number = 0
   navIndex: number = 0;
   pageId: string = "";
   channelId: string = "";
@@ -416,4 +416,13 @@ export struct PeopleShipMainComponent {
     }
   }
 
+  onAutoRefresh(changedPropertyName: string) {
+    if (this.navIndex != this.currentTopNavSelectedIndex) {
+      return
+    }
+    // 当前页面，自动刷新数据
+    Logger.debug(TAG, 'page onAutoRefresh ' + this.autoRefresh)
+    this.currentPage = 1
+    this.getData()
+  }
 }
\ No newline at end of file

@@ -138,15 +138,16 @@ struct ChangeBindPhonePage {
       Row() {
         Text("确认")
           .layoutWeight(1)
-          .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF")
+          .fontColor("#FFFFFF")
           .borderRadius(4)
           .fontSize(18)
           .textAlign(TextAlign.Center)
           .fontWeight(FontWeight.Medium)
           .margin({ top: 26 })
           .height(44)
-          .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800")
+          .backgroundColor("#ED2800")
           .enabled(this.isSubmit ? true : false)
+          .opacity(this.isSubmit ? 1: 0.6)
           .onClick(() => {
             TrackingButton.click("changePhoneNumberPageConfirm",TrackConstants.PageName.Change_PhoneNum,TrackConstants.PageName.Change_PhoneNum)
             this.changeBindPhone()

@@ -60,15 +60,16 @@ struct ForgetPasswordPage {
       Row() {
         Text("确认")
           .layoutWeight(1)
-          .fontColor(this.isSubmit ?"#FFFFFFFF":"#66FFFFFF")
+          .fontColor("#FFFFFF")
           .borderRadius(4)
           .fontSize(18)
           .textAlign(TextAlign.Center)
           .fontWeight(FontWeight.Medium)
           .margin({ top: 26 })
           .height(44)
-          .backgroundColor(this.isSubmit ?"#ED2800":"#99ED2800")
+          .backgroundColor("#ED2800")
           .enabled(this.isSubmit ? true : false)
+          .opacity(this.isSubmit ? 1: 0.6)
           .onClick(() => {
             this.checkVerifyCode()
           })

@@ -161,7 +161,7 @@ struct LoginPage {
           Row() {
             Text("登录")
               .borderRadius(4)
-              .fontColor(this.isSubmit ? "#FFFFFFFF" : "#66FFFFFF")
+              .fontColor("#FFFFFF")
               .fontSize(`${this.calcHeight(31)}lpx`)
               .fontWeight(400)
               .margin({ top: `${this.calcHeight(20)}` })
@@ -169,7 +169,8 @@ struct LoginPage {
 				      .height(44)
               .textAlign(TextAlign.Center)
               .width("100%")
-              .backgroundColor(this.isSubmit ? "#FFED2800" : "#99ED2800")
+              .backgroundColor("#ED2800")
+              .opacity(this.isSubmit ? 1: 0.6)
               .onClick(() => {
                 if (!this.isSubmit) {
                   return

@@ -189,30 +189,30 @@ struct ModifyPasswordPage {
         .height(`${this.calcHeight(85)}lpx`)
         .alignItems(HorizontalAlign.Start)
 
+
         Row() {
-          Button( { type: ButtonType.Normal, stateEffect: true }){
           Text("确认")
-              .fontColor("#fff")
-              .fontSize(`${this.calcHeight(35)}lpx`)
-              .lineHeight(`${this.calcHeight(50)}lpx`)
-              .opacity(this.btnStatus ?1:0.5)
-          }
-            .width('100%')
-            .height(`${this.calcHeight(80)}lpx`)
-            .backgroundColor(this.btnStatus ? '#ED2800' : '#99ED2800')
-            .enabled(this.btnStatus ?true:false)
-            .borderRadius('4vp')
+            .layoutWeight(1)
+            .fontColor("#FFFFFF")
+            .borderRadius(4)
+            .fontSize(18)
+            .textAlign(TextAlign.Center)
+            .fontWeight(FontWeight.Medium)
+            .margin({ top: 26 })
+            .height(44)
+            .backgroundColor("#ED2800")
+            .enabled(this.btnStatus ? true : false)
+            .opacity(this.btnStatus ? 1: 0.6)
             .onClick(() => {
               if(this.btnStatus){
                 TrackingButton.click("changePasswordPageConfirm",TrackConstants.PageName.Change_Passwd,TrackConstants.PageName.Change_Passwd)
                 this.submit()
               }
             })
-        }
+        }.width('100%')
         .padding({top:`${this.calcHeight(25)}lpx`})
         .alignItems(VerticalAlign.Center)
         .width('100%')
-        .height(`${this.calcHeight(120)}lpx`)
 
         Column() {
           Text("忘记密码").fontSize(12).maxLines(3).fontColor(0x999999).padding({top:`${this.calcHeight(10)}lpx`})

@@ -290,21 +290,23 @@ export struct SettingPasswordPage {
   // 按钮
   @Builder getButtonCell(item: AccoutPageDataModel) {
     Row() {
-      Button(item.compButtonTitle, { type: ButtonType.Normal, stateEffect: true })
-        .width('100%')
-        .height('80lpx')
-        .backgroundColor(this.btnStatus ? '#da3e22' : '#e5856d')
-        .enabled(this.btnStatus ?true:false)
-        .fontColor('#fff')
-        .borderRadius('4vp')
+      Text(item.compButtonTitle)
+        .layoutWeight(1)
+        .fontColor("#FFFFFF")
+        .borderRadius(4)
+        .fontSize(18)
+        .textAlign(TextAlign.Center)
+        .fontWeight(FontWeight.Medium)
+        .margin({ top: 26 })
+        .height(44)
+        .backgroundColor("#ED2800")
+        .enabled(this.btnStatus ? true : false)
+        .opacity(this.btnStatus ? 1: 0.6)
         .onClick(() => {
           this.buttonClick()
         })
-    }
-    .padding({top:'25lpx'})
-    .alignItems(VerticalAlign.Center)
+    }.padding({top:'25lpx'})
     .width('100%')
-    .height('120lpx')
   }
 
   // 标题

@@ -48,7 +48,6 @@ struct MultiPictureDetailPage {
   }
 
   aboutToAppear() {
-    this.openFullScreen()
 
     Logger.info(TAG, 'aboutToDisappear');
 
@@ -68,13 +67,11 @@ struct MultiPictureDetailPage {
 
   aboutToDisappear(): void {
     console.log(TAG, 'aboutToDisappear')
-    this.closeFullScreen()
   }
 
   onPageShow(): void {
     console.log(TAG, 'onPageShow')
     this.pageShowTime = DateTimeUtils.getTimeStamp()
-    this.openFullScreen()
 
   }
 
@@ -84,25 +81,7 @@ struct MultiPictureDetailPage {
     let duration = 0
     duration = Math.floor((this.pageHideTime - this.pageShowTime)/1000)
     TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Atlas_Detail,TrackConstants.PageName.Atlas_Detail,duration)
-    this.closeFullScreen()
   }
 
-  /**
-   * 开启沉浸式
-   * TODO:颜色待根据业务接口修改
-   */
-  openFullScreen() {
-    WindowModel.shared.setWindowLayoutFullScreen(true)
-    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', })
-  }
-
-  /**
-   * 关闭沉浸式
-   * TODO:颜色待根据业务接口修改
-   */
-  closeFullScreen() {
-    WindowModel.shared.setWindowLayoutFullScreen(false)
-    WindowModel.shared.setWindowSystemBarProperties({ statusBarContentColor: '#000000', })
-  }
 
 }
\ No newline at end of file

 import { insightIntent, InsightIntentExecutor } from '@kit.AbilityKit';
 import { window } from '@kit.ArkUI';
 import { BusinessError } from '@kit.BasicServicesKit';
+import { NetworkUtil, SPHelper, ToastUtils } from 'wdKit';
 import { ProcessUtils } from 'wdRouter';
+import DailyPaperTopicModel from 'wdComponent/src/main/ets/model/DailyPaperTopicModel'
+
 /**
  * 意图调用
  */
@@ -19,7 +22,7 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
    */
   onExecuteInUIAbilityForegroundMode(name: string, param: Record<string, Object>, pageLoader: window.WindowStage):
     Promise<insightIntent.ExecuteResult> {
-    console.log('yzl onExecuteInUIAbilityForegroundMode',name,JSON.stringify(param))
+    console.log('yzl onExecuteInUIAbilityForegroundMode', name, JSON.stringify(param))
     // 根据意图名称分发处理逻辑
     switch (name) {
       case InsightIntentExecutorImpl.ViewBlog:
@@ -36,19 +39,19 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
       }
     } as insightIntent.ExecuteResult)
   }
+
   /**
    * 实现习惯推荐功能
    * @param param 意图参数
    * @param pageLoader 窗口
    */
-  private jumpToViewBlog(param: Record<string, Object>, pageLoader: window.WindowStage): Promise<insightIntent.ExecuteResult> {
-    console.log('yzl jumpToView',JSON.stringify(param))
+  private jumpToViewBlog(param: Record<string, Object>,
+    pageLoader: window.WindowStage): Promise<insightIntent.ExecuteResult> {
+    console.log('yzl jumpToView', JSON.stringify(param))
     return new Promise((resolve, reject) => {
-      // TODO 实现意图调用，loadContent的入参为歌曲落地页路径，例如：pages/SongPage
       // TODO 热启动是否切到主页
       pageLoader.loadContent('pages/MainPage')
         .then(() => {
-
           resolve({
             code: 0,
             result: {
@@ -72,12 +75,26 @@ export default class InsightIntentExecutorImpl extends InsightIntentExecutor {
    * @param param 意图参数
    * @param pageLoader 窗口
    */
-  private jumpToViewColumnUpdate(param: Record<string, Object>, pageLoader: window.WindowStage): Promise<insightIntent.ExecuteResult> {
-    console.log('yzl jumpToViewColum',JSON.stringify(param))
+  private jumpToViewColumnUpdate(param: Record<string, Object>,
+    pageLoader: window.WindowStage): Promise<insightIntent.ExecuteResult> {
     return new Promise((resolve, reject) => {
       pageLoader.loadContent('pages/MainPage')
         .then(() => {
-          ProcessUtils.gotoMorningEveningPaper()
+          if (NetworkUtil.isNetConnected()) {
+            DailyPaperTopicModel.getDailyPaperTopic().then(dailyPaperTopicBean => {
+              if (dailyPaperTopicBean && dailyPaperTopicBean.id > 0) {
+                SPHelper.default.saveSync('dailyPaperTopicPageId', dailyPaperTopicBean.id);
+                ProcessUtils.gotoMorningEveningPaper() //跳转至早晚报页面
+              } else {
+                ToastUtils.showToast('暂无早晚报信息', 1000)
+              }
+            }).catch((err: string) => {
+              console.log('yzlerr',JSON.stringify(err))
+              ToastUtils.showToast('暂无早晚报信息', 1000)
+            })
+          } else {
+            ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
+          }
           resolve({
             code: 0,
             result: {