bug修改

AppScope/app.json5

@@ -1,6 +1,6 @@
 {
   "app": {
-    "bundleName": "cn.shangyu.gdxzExprt",
+    "bundleName": "cn.shangyu.gdxzExprts",
     "vendor": "example",
     "versionCode": 1000000,
     "versionName": "1.0.0",

commons/basic/src/main/ets/constants/BasicConstant.ets

@@ -6,20 +6,20 @@ export class BasicConstant {
   static readonly getzcxy = "http://app.igandan.com/expert_zcxy.jsp";// 注册协议正式地址
 
   //测试环境
-  static readonly urlExpertAPI  = "https://dev-app.igandan.com/app/expertAPI/";
+  // static readonly urlExpertAPI  = "https://dev-app.igandan.com/app/expertAPI/";
-  static readonly urlExpertApp = "https://dev-app.igandan.com/app/expertApp/"
+  // static readonly urlExpertApp = "https://dev-app.igandan.com/app/expertApp/"
-  static readonly urlHtml = "http://dev-doc.igandan.com/app/"
+  // static readonly urlHtml = "http://dev-doc.igandan.com/app/"
-  static readonly urlImage = "https://dev-doc.igandan.com/app/"
+  // static readonly urlImage = "https://dev-doc.igandan.com/app/"
-  static readonly urlExpert = "https://dev-app.igandan.com/app/expert/"
+  // static readonly urlExpert = "https://dev-app.igandan.com/app/expert/"
-  static readonly wxUrl = "https://dev-wx.igandan.com/";
+  // static readonly wxUrl = "https://dev-wx.igandan.com/";
 
   //正式环境
-  // static readonly urlExpertAPI  = "https://app.igandan.com/app/expertAPI/";
+  static readonly urlExpertAPI  = "https://app.igandan.com/app/expertAPI/";
-  // static readonly urlExpertApp = "http://app.igandan.com/app/expertApp/"
+  static readonly urlExpertApp = "http://app.igandan.com/app/expertApp/"
-  // static readonly urlHtml = "http://doc.igandan.com/app/"
+  static readonly urlHtml = "http://doc.igandan.com/app/"
-  // static readonly urlImage = "http://app.igandan.com/app/"
+  static readonly urlImage = "http://app.igandan.com/app/"
-  // static readonly urlExpert = "http://app.igandan.com/app/expert/"
+  static readonly urlExpert = "http://app.igandan.com/app/expert/"
-  // static readonly wxUrl = "https://wx.igandan.com/";// 微信服务器地址
+  static readonly wxUrl = "https://wx.igandan.com/";// 微信服务器地址
 
 
   static readonly getStartpage=BasicConstant.urlExpertApp + "startpage";
@@ -42,6 +42,7 @@ export class BasicConstant {
   static readonly myData = BasicConstant.urlExpertAPI+'my';
   static readonly gethonorDetail = BasicConstant.urlExpertAPI+'gethonorDetail';
   static readonly updatePwd = BasicConstant.urlExpertAPI+'updatePwd'
+  static readonly read = BasicConstant.urlExpert+'read'//视频阅读数
 
   static readonly province=['全国','北京市','天津市','河北省','山西省'
     ,'内蒙古自治区','辽宁省','吉林省','黑龙江省','上海市','江苏省','浙江省'

features/Home/src/main/ets/components/ListCompGandan.ets

@@ -5,7 +5,7 @@ import { promptAction, router } from '@kit.ArkUI'
 import { BusinessError } from '@kit.BasicServicesKit';
 import { HdLoadingDialog,EmptyViewComp } from '@itcast/basic'
 import HashMap from '@ohos.util.HashMap';
-
+import { uiObserver, UIObserver } from '@kit.ArkUI';
 
 @Component
 export struct ListCompGandan {
@@ -34,7 +34,25 @@ export struct ListCompGandan {
   onUpdate() {
     this.onRefresh()
   }
+  listener: (info: uiObserver.RouterPageInfo) => void = (info: uiObserver.RouterPageInfo) => {
+    let routerInfo: uiObserver.RouterPageInfo | undefined = this.queryRouterPageInfo();
+    if (info.pageId == routerInfo?.pageId) {
+      if (info.state == uiObserver.RouterPageState.ON_PAGE_SHOW) {
+        this.onRefresh()
+      } else if (info.state == uiObserver.RouterPageState.ON_PAGE_HIDE) {
 
+      }
+    }
+  }
+  aboutToAppear(): void {
+    let uiObserver: UIObserver = this.getUIContext().getUIObserver();
+    uiObserver.on('routerPageUpdate', this.listener);
+  }
+
+  aboutToDisappear(): void {
+    let uiObserver: UIObserver = this.getUIContext().getUIObserver();
+    uiObserver.off('routerPageUpdate', this.listener);
+  }
 
   onRefresh() {
     this.page = 1

features/Home/src/main/ets/polyv/VideoUtil.ets

@@ -21,8 +21,31 @@ class VideoTools {
       let json:VideoDetailModel = JSON.parse(res+'') as VideoDetailModel;
       if(json.video.polyv_uuid==null||json.video.polyv_uuid==undefined)
       {
-        promptAction.showToast({ message: '视频信息错误' })
+        if(json.video.content!=null)
-        this.goPLVMediaPlayerSingleVideoPage('',video_uuid)
+        {
+          let content=json.video.content
+          let split = content.split("\"vid\" : ");
+          if (split.length<2){
+            split = content.split("'vid' : ");
+            if (split.length>1){
+              let split1 = split[1].split("'");
+              this.goPLVMediaPlayerSingleVideoPage(split1[1],video_uuid)
+
+            }else {
+              promptAction.showToast({ message: '视频信息错误' })
+              this.goPLVMediaPlayerSingleVideoPage('',video_uuid)
+            }
+          }else if(split.length>1){
+            let split1 = split[1].split("\"");
+            this.goPLVMediaPlayerSingleVideoPage(split1[1],video_uuid)
+          }
+        }
+       else
+       {
+         promptAction.showToast({ message: '视频信息错误' })
+         this.goPLVMediaPlayerSingleVideoPage('',video_uuid)
+       }
+
       }
       else
       {
@@ -33,6 +56,7 @@ class VideoTools {
     }).catch((err: BusinessError) => {
       this.goPLVMediaPlayerSingleVideoPage('',video_uuid)
     })
+
   }
 
   async goPLVMediaPlayerSingleVideoPage(vid:string,video_uuid:string)

features/register/src/main/ets/view/LoginComp.ets

@@ -401,11 +401,13 @@ struct PrivacyDialog {
           Span('登录即代表同意').fontColor($r('app.color.common_gray_03'))
           Span('《肝胆相照隐私政策》').fontColor($r('app.color.top_title')).onClick(() => {
             ToWeb(BasicConstant.getyyzc,'《肝胆相照隐私政策》')
+            this.controller.close()
           })
           Span('和').fontColor($r('app.color.common_gray_03'))
           Span('《肝胆相照用户服务协议》').fontColor($r('app.color.top_title'))
             .onClick(() => {
               ToWeb(BasicConstant.getzcxy,'《肝胆相照用户服务协议》')
+              this.controller.close()
             })
 
         }
@@ -419,11 +421,14 @@ struct PrivacyDialog {
           Span('未注册的手机号验证登录后将自动创建肝胆相照账号，登录即代表同意').fontColor($r('app.color.common_gray_03'))
           Span('《肝胆相照隐私政策》').fontColor($r('app.color.top_title')).onClick(() => {
             ToWeb(BasicConstant.getyyzc,'《肝胆相照隐私政策》')
+            this.controller.close()
           })
           Span('和').fontColor($r('app.color.common_gray_03'))
           Span('《肝胆相照用户服务协议》').fontColor($r('app.color.top_title'))
             .onClick(() => {
+
               ToWeb(BasicConstant.getzcxy,'《肝胆相照用户服务协议》')
+              this.controller.close()
             })
 
         }

features/register/src/main/ets/view/SelectedHospitalComp.ets

@@ -245,6 +245,7 @@ export struct SelectedHospitalComp {
               })
               ListItem() {
                 Text('其他医院')
+                  .width('100%')
                   .fontSize(17)
                   .height(40)
                   .margin({left:20})
@@ -295,6 +296,7 @@ export struct SelectedHospitalComp {
               })
               ListItem() {
                 Text('其他医院')
+                  .width('100%')
                   .fontSize(17)
                   .height(40)
                   .margin({left:20})

products/expert/src/main/ets/pages/VideoPage/PLVMediaPlayerSingleVideoPage.ets

@@ -14,7 +14,7 @@ import { createDependScope } from '@polyvharmony/media-player-sdk'
 import {
   commonPageModule,getDisplayWindowWidth
 } from 'media-player-common'
-import { HdNav,BasicConstant } from '@itcast/basic'
+import { HdNav,BasicConstant ,authStore} from '@itcast/basic'
 import HashMap from '@ohos.util.HashMap';
 import { hdHttp, HdResponse ,logger} from '@itcast/basic/Index'
 import { emitter,BusinessError } from '@kit.BasicServicesKit';
@@ -191,15 +191,34 @@ export struct PLVMediaPlayerSingleVideoPage {
     const hashMap: HashMap<string, string> = new HashMap();
     hashMap.clear();
     hashMap.set('video_uuid', video_uuid)
+
     hdHttp.httpReq<string>(BasicConstant.videoDetail,hashMap).then(async (res: HdResponse<string>) => {
       logger.info('Response videoDetails'+video_uuid);
       logger.info('Response videoDetail'+res);
       let json:VideoDetailModel = JSON.parse(res+'') as VideoDetailModel;
       this.note=json.video.note
+      this.readSeriesVideo(video_uuid)
     }).catch((err: BusinessError) => {
     })
   }
 
+  readSeriesVideo(video_uuid:string) {
+    // const hashMap: HashMap<string, string> = new HashMap();
+    // hashMap.clear();
+    // hashMap.set('uuid', uuid)
+
+    hdHttp.post<string>(BasicConstant.read, {
+      user_uuid: authStore.getUser().uuid,
+      news_article_uuid:video_uuid,
+      type: '4',
+    } as readExtraData).then(async (res: HdResponse<string>) => {
+
+
+    }).catch((err: BusinessError) => {
+    })
+  }
+
+
   getCommentdata(video_uuid:string) {
     const hashMap: HashMap<string, string> = new HashMap();
     hashMap.clear();
@@ -263,4 +282,9 @@ export interface CommentV2Model{
   data:Object[];
   message:string;
   msg:string
+}
+interface readExtraData{
+user_uuid:string,
+news_article_uuid:string,
+type:string,
 }