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

@@ -46,7 +46,7 @@ struct EditUserInfoPage {
 
         this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_region
         this.updateEditModel()
-        this.getAreaIndex()
+        // this.getAreaIndex()
       }
     }),
     alignment: DialogAlignment.Bottom,
@@ -231,7 +231,9 @@ struct EditUserInfoPage {
         }
         WDRouterRule.jumpWithPage(WDRouterPage.editUserIntroductionPage,params)
       }else if (i === 3){
-        this.dialogController.open()
+        if (this.dataSource.length > 0) {
+          this.dialogController.open()
+        }
       } else if (i === 4) {
         this.dateDialogController.open()
       }else if(i === 5){
@@ -287,14 +289,16 @@ struct EditUserInfoPage {
       this.getAreaList()
     }else {
       EditInfoViewModel.queryPeopleAccountOwnerInfo(getContext(this)).then((peopleItem) => {
-        EditInfoViewModel.queryAccountOwnerInfo(getContext(this)).then((editM) => {
-          this.listData = []
-          editM.userExtend.introduction = peopleItem.introduction
-          editM.userName = peopleItem.userName
-          this.headerImg = peopleItem.headPhotoUrl
-          this.currentUserInfo = editM as editModel;
-          this.listData.push(...EditInfoViewModel.getEditListInfo(editM))
-        });
+        this.currentUserInfo = new editModel()
+        this.currentUserInfo.userExtend.introduction = peopleItem.introduction
+        this.currentUserInfo.userExtend.creatorId  = peopleItem.creatorId
+        this.currentUserInfo.userName = peopleItem.userName
+        this.headerImg = peopleItem.headPhotoUrl
+        this.currentUserInfo.userType = Number(this.userType)
+        this.currentUserInfo.userExtend.districtCode = peopleItem.district
+        this.currentUserInfo.userExtend.cityCode = peopleItem.city
+        this.currentUserInfo.userExtend.provinceCode = peopleItem.province
+        // this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
         this.getAreaList()
       });
     }
@@ -308,25 +312,54 @@ struct EditUserInfoPage {
   }
 
   getAreaIndex(){
-    ///地区选择器当前位置
-    if (this.currentUserInfo.userExtend.province.length > 0) {
-      this.dataSource.forEach((element,index) => {
-        if (element.label === this.currentUserInfo.userExtend.province) {
-          this.firstSelect = index
-          let currentFirst = EditInfoViewModel.getAreaListManageModel(element)
-          currentFirst.children.forEach((element,index) => {
-            if (element.label === this.currentUserInfo.userExtend.city) {
-              this.secondSelect = index
-              let currentSecondBean = EditInfoViewModel.getAreaListManageModel(element)
-              currentSecondBean.children.forEach((element,index) => {
-                if (element.label === this.currentUserInfo.userExtend.county) {
-                  this.thirdSelect = index
-                }
-              });
-            }
-          });
-        }
-      });
+    if (this.userType === '1'){
+      ///地区选择器当前位置
+      if (this.currentUserInfo.userExtend.province.length > 0) {
+        this.dataSource.forEach((element,index) => {
+          if (element.label === this.currentUserInfo.userExtend.province) {
+            this.firstSelect = index
+            let currentFirst = EditInfoViewModel.getAreaListManageModel(element)
+            currentFirst.children.forEach((element,index) => {
+              if (element.label === this.currentUserInfo.userExtend.city) {
+                this.secondSelect = index
+                let currentSecondBean = EditInfoViewModel.getAreaListManageModel(element)
+                currentSecondBean.children.forEach((element,index) => {
+                  if (element.label === this.currentUserInfo.userExtend.county) {
+                    this.thirdSelect = index
+                  }
+                });
+              }
+            });
+          }
+        });
+      }
+    }else {
+      ///地区选择器当前位置
+      if (this.currentUserInfo.userExtend.provinceCode.length > 0) {
+        this.dataSource.forEach((element,index) => {
+          if (element.code === this.currentUserInfo.userExtend.provinceCode) {
+            this.firstSelect = index
+            this.currentUserInfo.userExtend.province = element.label
+            let currentFirst = EditInfoViewModel.getAreaListManageModel(element)
+            currentFirst.children.forEach((element,index) => {
+              if (element.code === this.currentUserInfo.userExtend.cityCode) {
+                this.secondSelect = index
+                this.currentUserInfo.userExtend.city = element.label
+                let currentSecondBean = EditInfoViewModel.getAreaListManageModel(element)
+                currentSecondBean.children.forEach((element,index) => {
+                  if (element.code === this.currentUserInfo.userExtend.districtCode) {
+                    this.currentUserInfo.userExtend.county = element.label
+                    this.thirdSelect = index
+                  }
+                });
+              }
+            });
+          }
+        });
+        this.listData = []
+        this.currentUserInfo.userExtend.address = this.currentUserInfo.userExtend.province + this.currentUserInfo.userExtend.city + this.currentUserInfo.userExtend.county
+        this.listData.push(...EditInfoViewModel.getEditListInfo(this.currentUserInfo))
+      }
     }
   }
 }

@@ -137,4 +137,10 @@ export class peopleItemModel{
   headPhotoUrl:string = ''
 
   userType:number = 1
+
+  creatorId:string = ''
+
+  district:string = ''
+  province:string = ''
+  city:string = ''
 }
\ No newline at end of file

@@ -67,7 +67,7 @@ struct LaunchAdvertisingPage {
                 controller: this.controller
               }).controls(false)
                 .autoPlay(true)
-                .objectFit(ImageFit.Contain) //设置视频适配模式
+                // .objectFit(ImageFit.Fill) //设置视频适配模式
                 .width('100%')
                 .height('100%')
             }else {

@@ -19,9 +19,9 @@
         "name": "EntryAbility",
         // 这里不能改动，和后台推送有绑定
         "srcEntry": "./ets/entryability/EntryAbility.ets",
-        "description": "$string:EntryAbility_desc",
+        "description": "$string:app_desc",
         "icon": "$media:app_icon_layer",
-        "label": "$string:EntryAbility_label",
+        "label": "$string:app_name",
         "startWindowIcon": "$media:app_icon",
         "startWindowBackground": "$color:start_window_background",
         "exported": true,

@@ -5,14 +5,6 @@
       "value": "main entry"
     },
     {
-      "name": "EntryAbility_desc",
-      "value": "$string:app_desc"
-    },
-    {
-      "name": "EntryAbility_label",
-      "value": "$string:app_name"
-    },
-    {
       "name": "permission_photo_tip",
       "value": "开启之后即可用于保存新闻图片到相册、发视频、设置封面、设置头像、缓存图片和视频来展示内容等功能"
     },

@@ -5,14 +5,6 @@
       "value": "main entry"
     },
     {
-      "name": "EntryAbility_desc",
-      "value": "$string:app_desc"
-    },
-    {
-      "name": "EntryAbility_label",
-      "value": "$string:app_name"
-    },
-    {
       "name": "dialog_text_title",
       "value": "个人隐私保护指引"
     },

@@ -5,14 +5,6 @@
       "value": "主入口"
     },
     {
-      "name": "EntryAbility_desc",
-      "value": "$string:app_desc"
-    },
-    {
-      "name": "EntryAbility_label",
-      "value": "$string:app_name"
-    },
-    {
       "name": "dialog_text_title",
       "value": "个人隐私保护指引"
     },