developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
d548d76b 2 parents 249a4070 ced4ceb7

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

Inline Side-by-side
Showing 24 changed files with 179 additions and 104 deletions
@@ -49,17 +49,23 @@ export struct WdWebLocalComponent { @@ -49,17 +49,23 @@ export struct WdWebLocalComponent {
49 49
50 Row() { 50 Row() {
51 RelativeContainer() { 51 RelativeContainer() {
52 - // Web({ src: this.webResource, controller: this.webviewControl, renderMode: RenderMode.SYNC_RENDER })  
53 - Web({ src: this.webResource, controller: this.webviewControl }) 52 + Web({
  53 + src: this.webResource,
  54 + controller: this.webviewControl,
  55 + renderMode: RenderMode.SYNC_RENDER
  56 + })// Web({ src: this.webResource, controller: this.webviewControl })
54 .domStorageAccess(true) 57 .domStorageAccess(true)
55 .databaseAccess(true) 58 .databaseAccess(true)
56 .javaScriptAccess(true) 59 .javaScriptAccess(true)
57 .imageAccess(true) 60 .imageAccess(true)
58 .mixedMode(MixedMode.All) 61 .mixedMode(MixedMode.All)
59 .onlineImageAccess(true) 62 .onlineImageAccess(true)
60 - .enableNativeEmbedMode(true)// .layoutMode(WebLayoutMode.FIT_CONTENT)  
61 - // .nestedScroll({ scrollForward: NestedScrollMode.SELF_FIRST, scrollBackward: NestedScrollMode.PARENT_FIRST })  
62 - .height(this.webHeight) 63 + .enableNativeEmbedMode(true)
  64 + .layoutMode(WebLayoutMode.FIT_CONTENT)
  65 + .nestedScroll({
  66 + scrollForward: NestedScrollMode.SELF_FIRST,
  67 + scrollBackward: NestedScrollMode.PARENT_FIRST
  68 + })// .height(this.webHeight)
63 .onPageBegin((event) => { 69 .onPageBegin((event) => {
64 this.onPageBegin(event?.url); 70 this.onPageBegin(event?.url);
65 }) 71 })
@@ -241,6 +247,7 @@ export struct WdWebLocalComponent { @@ -241,6 +247,7 @@ export struct WdWebLocalComponent {
241 Logger.debug(TAG, 'onLoadIntercept return false'); 247 Logger.debug(TAG, 'onLoadIntercept return false');
242 return false 248 return false
243 } 249 }
  250 +
244 onReloadStateChanged() { 251 onReloadStateChanged() {
245 Logger.info(TAG, `onReloadStateChanged:::refresh, this.reload: ${this.reload}`); 252 Logger.info(TAG, `onReloadStateChanged:::refresh, this.reload: ${this.reload}`);
246 if (this.reload > 0) { 253 if (this.reload > 0) {
@@ -151,7 +151,7 @@ export struct CardSourceInfo { @@ -151,7 +151,7 @@ export struct CardSourceInfo {
151 .flexShrink(0) 151 .flexShrink(0)
152 .margin({right: 4}) 152 .margin({right: 4})
153 } 153 }
154 - if (this.getContentDtoBean()?.interactData?.commentNum && this.showCommentNum()) { 154 + if (Number(this.getContentDtoBean()?.interactData?.commentNum) > 0 && this.showCommentNum()) {
155 Text(`${this.handlerNum(this.getContentDtoBean()?.interactData?.commentNum.toString())}评`) 155 Text(`${this.handlerNum(this.getContentDtoBean()?.interactData?.commentNum.toString())}评`)
156 .fontSize($r("app.float.font_size_11")) 156 .fontSize($r("app.float.font_size_11"))
157 .fontColor($r("app.color.color_B0B0B0")) 157 .fontColor($r("app.color.color_B0B0B0"))
@@ -27,11 +27,19 @@ export struct Card9Component { @@ -27,11 +27,19 @@ export struct Card9Component {
27 @State textArr: textItem[] = [] 27 @State textArr: textItem[] = []
28 pageShowTime:number = 0; 28 pageShowTime:number = 0;
29 pageHideTime:number = 0; 29 pageHideTime:number = 0;
  30 + @State hideDetail: boolean = false;
30 31
31 onPageShow() { 32 onPageShow() {
32 this.pageShowTime = DateTimeUtils.getTimeStamp() 33 this.pageShowTime = DateTimeUtils.getTimeStamp()
33 } 34 }
34 35
  36 + initHideDetail() {
  37 + const curRouter = router.getState().name;
  38 + if (curRouter === 'MyCollectionListPage') {
  39 + this.hideDetail = true;
  40 + }
  41 + }
  42 +
35 //内容浏览Tracking 43 //内容浏览Tracking
36 onPageHide(): void { 44 onPageHide(): void {
37 this.pageHideTime = DateTimeUtils.getTimeStamp() 45 this.pageHideTime = DateTimeUtils.getTimeStamp()
@@ -46,6 +54,7 @@ export struct Card9Component { @@ -46,6 +54,7 @@ export struct Card9Component {
46 // this.loadImg = await onlyWifiLoadImg(); 54 // this.loadImg = await onlyWifiLoadImg();
47 const curRouter = router.getState().name; 55 const curRouter = router.getState().name;
48 this.clicked = hasClicked(this.contentDTO.objectId, curRouter) 56 this.clicked = hasClicked(this.contentDTO.objectId, curRouter)
  57 + this.initHideDetail();
49 } 58 }
50 59
51 titleInit() { 60 titleInit() {
@@ -108,14 +117,16 @@ export struct Card9Component { @@ -108,14 +117,16 @@ export struct Card9Component {
108 }.alignContent(Alignment.BottomStart) 117 }.alignContent(Alignment.BottomStart)
109 118
110 // 时间线--后端返回三个， 119 // 时间线--后端返回三个，
111 - Column() {  
112 - ForEach(this.contentDTO.slideShows, (item: slideShows, index: number) => {  
113 - this.timelineItem(item, index, index === this.contentDTO.slideShows.length - 1)  
114 - }) 120 + if (!this.hideDetail) {
  121 + Column() {
  122 + ForEach(this.contentDTO.slideShows, (item: slideShows, index: number) => {
  123 + this.timelineItem(item, index, index === this.contentDTO.slideShows.length - 1)
  124 + })
  125 + }
115 } 126 }
116 127
117 // 底部-查看更多。根据接口返回的isMore判断是否显示查看更多 128 // 底部-查看更多。根据接口返回的isMore判断是否显示查看更多
118 - if (this.contentDTO.hasMore == 1) { 129 + if (this.contentDTO.hasMore == 1 && !this.hideDetail) {
119 Row() { 130 Row() {
120 Text("查看更多") 131 Text("查看更多")
121 .fontSize($r("app.float.font_size_14")) 132 .fontSize($r("app.float.font_size_14"))
@@ -292,6 +292,10 @@ struct indicatorAnimations { @@ -292,6 +292,10 @@ struct indicatorAnimations {
292 // Image($r('app.media.swiper_indicator_gray')) 292 // Image($r('app.media.swiper_indicator_gray'))
293 // .width('100%') 293 // .width('100%')
294 // .height(2) 294 // .height(2)
  295 +
  296 + Image($r('app.media.swiper_indicator_gray'))
  297 + .width('100%')
  298 + .height(2)
295 Image($r('app.media.swiper_indicator_white')) 299 Image($r('app.media.swiper_indicator_white'))
296 .width(this.leftW) 300 .width(this.leftW)
297 .height(2) 301 .height(2)
@@ -323,6 +327,9 @@ struct indicatorAnimations { @@ -323,6 +327,9 @@ struct indicatorAnimations {
323 // Image($r('app.media.swiper_indicator_gray')) 327 // Image($r('app.media.swiper_indicator_gray'))
324 // .width('100%') 328 // .width('100%')
325 // .height(2) 329 // .height(2)
  330 + Image($r('app.media.swiper_indicator_gray'))
  331 + .width('100%')
  332 + .height(2)
326 Image($r('app.media.swiper_indicator_white')) 333 Image($r('app.media.swiper_indicator_white'))
327 .width(this.rightW) 334 .width(this.rightW)
328 .height(2) 335 .height(2)
@@ -110,6 +110,7 @@ struct localCard { @@ -110,6 +110,7 @@ struct localCard {
110 .margin({ bottom: 6 }) 110 .margin({ bottom: 6 })
111 .flexShrink(0) 111 .flexShrink(0)
112 .maxLines(1) 112 .maxLines(1)
  113 + .textOverflow({ overflow: TextOverflow.Ellipsis })
113 114
114 Text(this.operDataListItem.newsTitle) 115 Text(this.operDataListItem.newsTitle)
115 .width(CommonConstants.FULL_PARENT) 116 .width(CommonConstants.FULL_PARENT)
1 -import { StringUtils, UserDataLocal } from 'wdKit' 1 +import { SpConstants } from 'wdConstant/Index'
  2 +import { SPHelper, StringUtils, UserDataLocal } from 'wdKit'
2 import { WDRouterPage, WDRouterRule } from 'wdRouter' 3 import { WDRouterPage, WDRouterRule } from 'wdRouter'
3 import { TrackingButton, TrackConstants } from 'wdTracking/Index' 4 import { TrackingButton, TrackConstants } from 'wdTracking/Index'
4 import MinePageDatasModel from '../../model/MinePageDatasModel' 5 import MinePageDatasModel from '../../model/MinePageDatasModel'
@@ -8,7 +9,7 @@ const TAG = "MinePageUserSimpleInfoUI" @@ -8,7 +9,7 @@ const TAG = "MinePageUserSimpleInfoUI"
8 @Component 9 @Component
9 export default struct MinePageUserSimpleInfoUI { 10 export default struct MinePageUserSimpleInfoUI {
10 @Watch('loginStateChange') @Prop isLogin :boolean 11 @Watch('loginStateChange') @Prop isLogin :boolean
11 - @State userName:string = "登陆注册" 12 + @State userName:string = "登录注册"
12 @State headPhotoUrl:string = "" 13 @State headPhotoUrl:string = ""
13 userType:string = "1" 14 userType:string = "1"
14 @State levelHead:string = "" 15 @State levelHead:string = ""
@@ -17,6 +18,10 @@ export default struct MinePageUserSimpleInfoUI { @@ -17,6 +18,10 @@ export default struct MinePageUserSimpleInfoUI {
17 18
18 loginStateChange(){ 19 loginStateChange(){
19 if(this.isLogin){ 20 if(this.isLogin){
  21 + ///已登录状态，先获取本地数据
  22 + this.userName = SPHelper.default.getSync(SpConstants.USER_NAME,"") as string
  23 + this.headPhotoUrl = SPHelper.default.getSync(SpConstants.USER_HEAD_PHOTO_URL,"") as string
  24 +
20 this.getUserInfo() 25 this.getUserInfo()
21 }else{ 26 }else{
22 this.headPhotoUrl = "" 27 this.headPhotoUrl = ""
@@ -57,7 +62,7 @@ export default struct MinePageUserSimpleInfoUI { @@ -57,7 +62,7 @@ export default struct MinePageUserSimpleInfoUI {
57 Text(this.userName) 62 Text(this.userName)
58 .fontColor($r('app.color.color_222222')) 63 .fontColor($r('app.color.color_222222'))
59 .maxLines(1) 64 .maxLines(1)
60 - .fontWeight(FontWeight.Bold) 65 + .fontWeight(FontWeight.Medium)
61 .textOverflow({ overflow: TextOverflow.Ellipsis }) 66 .textOverflow({ overflow: TextOverflow.Ellipsis })
62 .fontSize(`${this.calcHeight(33)}lpx`) 67 .fontSize(`${this.calcHeight(33)}lpx`)
63 .lineHeight(`${this.calcHeight(46)}lpx`) 68 .lineHeight(`${this.calcHeight(46)}lpx`)
@@ -74,18 +79,20 @@ export default struct MinePageUserSimpleInfoUI { @@ -74,18 +79,20 @@ export default struct MinePageUserSimpleInfoUI {
74 trackButtonClick("myPageUserName") 79 trackButtonClick("myPageUserName")
75 }) 80 })
76 81
77 - Stack(){  
78 - Image($r('app.media.mine_grade_bg'))  
79 - .width(`${this.calcHeight(84)}lpx`)  
80 - .height(`${this.calcHeight(29)}lpx`)  
81 - .objectFit(ImageFit.Auto)  
82 - Text(`等级${this.levelId}`)  
83 - .textAlign(TextAlign.Center)  
84 - .fontColor($r('app.color.white'))  
85 - .fontSize(`${this.calcHeight(19)}lpx`)  
86 - .width(this.levelId>9?`${this.calcHeight(69)}lpx`:`${this.calcHeight(50)}lpx`)  
87 - .height(`${this.calcHeight(29)}lpx`)  
88 - }.margin({top:'`${this.calcHeight(15)}lpx`'}) 82 + if (this.levelId !== 0){
  83 + Stack(){
  84 + Image($r('app.media.mine_grade_bg'))
  85 + .width(`${this.calcHeight(84)}lpx`)
  86 + .height(`${this.calcHeight(29)}lpx`)
  87 + .objectFit(ImageFit.Auto)
  88 + Text(`等级${this.levelId}`)
  89 + .textAlign(TextAlign.Center)
  90 + .fontColor($r('app.color.white'))
  91 + .fontSize(`${this.calcHeight(19)}lpx`)
  92 + .width(this.levelId>9?`${this.calcHeight(69)}lpx`:`${this.calcHeight(50)}lpx`)
  93 + .height(`${this.calcHeight(29)}lpx`)
  94 + }.margin({top:'`${this.calcHeight(15)}lpx`'})
  95 + }
89 }.alignItems(HorizontalAlign.Start) 96 }.alignItems(HorizontalAlign.Start)
90 .margin({top:`${this.calcHeight(12)}lpx`,left:`${this.calcHeight(23)}lpx`}) 97 .margin({top:`${this.calcHeight(12)}lpx`,left:`${this.calcHeight(23)}lpx`})
91 .width(`${this.calcHeight(352)}lpx`) 98 .width(`${this.calcHeight(352)}lpx`)
@@ -6,7 +6,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter'; @@ -6,7 +6,7 @@ import { WDRouterPage, WDRouterRule } from 'wdRouter';
6 import {AreaPickerDialog} from '../view/areaPickerDialog/AreaPickerDialog' 6 import {AreaPickerDialog} from '../view/areaPickerDialog/AreaPickerDialog'
7 import {EditUserInfoCustomDialog} from '../view/areaPickerDialog/EditUserInfoCustomDialog' 7 import {EditUserInfoCustomDialog} from '../view/areaPickerDialog/EditUserInfoCustomDialog'
8 import {EditUserSexCustomDialog} from '../view/areaPickerDialog/EditUserSexCustomDialog' 8 import {EditUserSexCustomDialog} from '../view/areaPickerDialog/EditUserSexCustomDialog'
9 -import { AreaListModel } from '../../model/AreaListModel'; 9 +import { AreaListManageModel, AreaListModel } from '../../model/AreaListModel';
10 import router from '@ohos.router'; 10 import router from '@ohos.router';
11 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils' 11 import TrackingPageBrowseUtils from '../../utils/TrackingPageBrowseUtils'
12 import { TrackConstants } from 'wdTracking/Index'; 12 import { TrackConstants } from 'wdTracking/Index';
@@ -22,8 +22,12 @@ struct EditUserInfoPage { @@ -22,8 +22,12 @@ struct EditUserInfoPage {
22 @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0 22 @State topSafeHeight: number = AppStorage.get<number>('topSafeHeight') || 0
23 @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0 23 @State bottomSafeHeight: number = AppStorage.get<number>('bottomSafeHeight') || 0
24 24
  25 + @State firstSelect:number = 0
  26 + @State secondSelect:number = 0
  27 + @State thirdSelect:number = 0
  28 +
25 dialogController: CustomDialogController = new CustomDialogController({ 29 dialogController: CustomDialogController = new CustomDialogController({
26 - builder: AreaPickerDialog({dataSource:this.dataSource, 30 + builder: AreaPickerDialog({dataSource:this.dataSource,firstSelect:this.firstSelect,secondSelect:this.secondSelect,thirdSelect:this.thirdSelect,
27 confirmCallback:(province:string,city:string,county:string,address:string)=>{ 31 confirmCallback:(province:string,city:string,county:string,address:string)=>{
28 this.currentUserInfo.userExtend.province = province; 32 this.currentUserInfo.userExtend.province = province;
29 this.currentUserInfo.userExtend.city = city; 33 this.currentUserInfo.userExtend.city = city;
@@ -31,6 +35,7 @@ struct EditUserInfoPage { @@ -31,6 +35,7 @@ struct EditUserInfoPage {
31 this.currentUserInfo.userExtend.address = address; 35 this.currentUserInfo.userExtend.address = address;
32 this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_region 36 this.currentUserInfo.editDataType = WDEditDataModelType.WDEditDataModelType_region
33 this.updateEditModel() 37 this.updateEditModel()
  38 + this.getAreaIndex()
34 } 39 }
35 }), 40 }),
36 alignment: DialogAlignment.Bottom, 41 alignment: DialogAlignment.Bottom,
@@ -232,6 +237,30 @@ struct EditUserInfoPage { @@ -232,6 +237,30 @@ struct EditUserInfoPage {
232 getAreaList(){ 237 getAreaList(){
233 EditInfoViewModel.getAreaList(getContext(this)).then((value) =>{ 238 EditInfoViewModel.getAreaList(getContext(this)).then((value) =>{
234 this.dataSource.push(...value) 239 this.dataSource.push(...value)
  240 + this.getAreaIndex()
235 }) 241 })
236 } 242 }
  243 +
  244 + getAreaIndex(){
  245 + ///地区选择器当前位置
  246 + if (this.currentUserInfo.userExtend.province.length > 0) {
  247 + this.dataSource.forEach((element,index) => {
  248 + if (element.label === this.currentUserInfo.userExtend.province) {
  249 + this.firstSelect = index
  250 + let currentFirst = EditInfoViewModel.getAreaListManageModel(element)
  251 + currentFirst.children.forEach((element,index) => {
  252 + if (element.label === this.currentUserInfo.userExtend.city) {
  253 + this.secondSelect = index
  254 + let currentSecondBean = EditInfoViewModel.getAreaListManageModel(element)
  255 + currentSecondBean.children.forEach((element,index) => {
  256 + if (element.label === this.currentUserInfo.userExtend.county) {
  257 + this.thirdSelect = index
  258 + }
  259 + });
  260 + }
  261 + });
  262 + }
  263 + });
  264 + }
  265 + }
237 } 266 }
@@ -202,10 +202,6 @@ export struct TopNavigationComponentNew { @@ -202,10 +202,6 @@ export struct TopNavigationComponentNew {
202 //防止多次点击 202 //防止多次点击
203 if (!this.isClickMorningEveningPaper) { 203 if (!this.isClickMorningEveningPaper) {
204 this.isClickMorningEveningPaper = true; 204 this.isClickMorningEveningPaper = true;
205 - let c = setInterval(() => {  
206 - this.isClickMorningEveningPaper = false  
207 - }, 1000);  
208 -  
209 this.clickMorningEveningPaper() 205 this.clickMorningEveningPaper()
210 } 206 }
211 }) 207 })
@@ -705,11 +701,15 @@ export struct TopNavigationComponentNew { @@ -705,11 +701,15 @@ export struct TopNavigationComponentNew {
705 } else { 701 } else {
706 ToastUtils.showToast('暂无早晚报信息', 1000) 702 ToastUtils.showToast('暂无早晚报信息', 1000)
707 } 703 }
  704 +
  705 + this.isClickMorningEveningPaper = false
708 }).catch((err: string) => { 706 }).catch((err: string) => {
709 ToastUtils.showToast('暂无早晚报信息', 1000) 707 ToastUtils.showToast('暂无早晚报信息', 1000)
  708 + this.isClickMorningEveningPaper = false
710 }) 709 })
711 } else { 710 } else {
712 ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000) 711 ToastUtils.showToast('网络出小差了，请检查网络后重试', 1000)
  712 + this.isClickMorningEveningPaper = false
713 } 713 }
714 } 714 }
715 715
@@ -291,7 +291,7 @@ export struct SearchResultContentComponent { @@ -291,7 +291,7 @@ export struct SearchResultContentComponent {
291 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 291 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
292 } 292 }
293 } else { 293 } else {
294 - if(this.data.get(index + 1).sameContentListSize > 0) { 294 + if(this.data?.get(index + 1)?.sameContentListSize > 0) {
295 Divider() 295 Divider()
296 .width('100%') 296 .width('100%')
297 .color($r('app.color.color_F5F5F5')) 297 .color($r('app.color.color_F5F5F5'))
@@ -87,7 +87,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -87,7 +87,7 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
87 } 87 }
88 88
89 showMore() { 89 showMore() {
90 - return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') 90 + return (!!this.compDTO.dataSourceType && this.compDTO.dataSourceType !== 'OBJECT_POS') || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
91 } 91 }
92 92
93 build() { 93 build() {
@@ -100,7 +100,7 @@ export struct LiveHorizontalCardComponent { @@ -100,7 +100,7 @@ export struct LiveHorizontalCardComponent {
100 } 100 }
101 101
102 showMore() { 102 showMore() {
103 - return !!this.compDTO.dataSourceType || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '') 103 + return (!!this.compDTO.dataSourceType && this.compDTO.dataSourceType !== 'OBJECT_POS') || !(this.compDTO?.objectType === '0' || this.compDTO?.objectType === '')
104 } 104 }
105 105
106 106
@@ -12,6 +12,11 @@ export struct AreaPickerDialog { @@ -12,6 +12,11 @@ export struct AreaPickerDialog {
12 title: string = '修改地区' 12 title: string = '修改地区'
13 @Provide dataSource: AreaListModel[] = [] 13 @Provide dataSource: AreaListModel[] = []
14 result: JSON[] = []; 14 result: JSON[] = [];
  15 +
  16 + firstSelect:number = 0
  17 + secondSelect:number = 0
  18 + thirdSelect:number = 0
  19 +
15 confirmCallback: (province:string,city:string,county:string,address:string) => void = () => { 20 confirmCallback: (province:string,city:string,county:string,address:string) => void = () => {
16 21
17 } 22 }
@@ -52,9 +57,9 @@ export struct AreaPickerDialog { @@ -52,9 +57,9 @@ export struct AreaPickerDialog {
52 .strokeWidth(1) 57 .strokeWidth(1)
53 58
54 Row(){ 59 Row(){
55 - FirstLevelComponent().width('33%')  
56 - SecondLevelComponent().width('33%')  
57 - ThirdLevelComponent().width('33%') 60 + FirstLevelComponent({select:this.firstSelect}).width('33%')
  61 + SecondLevelComponent({currentSelect:this.secondSelect}).width('33%')
  62 + ThirdLevelComponent({currentSelect:this.thirdSelect}).width('33%')
58 } 63 }
59 } 64 }
60 .backgroundColor(0xffffff) 65 .backgroundColor(0xffffff)
@@ -7,7 +7,7 @@ export struct SecondLevelComponent { @@ -7,7 +7,7 @@ export struct SecondLevelComponent {
7 @State select: number = 0; 7 @State select: number = 0;
8 @Consume @Watch('onFirstChange') currentFirst: AreaListManageModel; 8 @Consume @Watch('onFirstChange') currentFirst: AreaListManageModel;
9 @Consume currentSecondBean: AreaListManageModel 9 @Consume currentSecondBean: AreaListManageModel
10 - 10 + currentSelect:number = 0
11 build() { 11 build() {
12 Column(){ 12 Column(){
13 Column(){ 13 Column(){
@@ -35,7 +35,13 @@ export struct SecondLevelComponent { @@ -35,7 +35,13 @@ export struct SecondLevelComponent {
35 } 35 }
36 36
37 onFirstChange(){ 37 onFirstChange(){
38 - this.select = 0 38 + if (this.currentSelect > 0){
  39 + this.select = this.currentSelect
  40 + this.currentSelect = 0
  41 + }else {
  42 + this.select = 0
  43 + }
  44 +
39 if (!this.currentFirst) { 45 if (!this.currentFirst) {
40 this.mTip = '暂无数据'; 46 this.mTip = '暂无数据';
41 } else { 47 } else {
@@ -8,7 +8,7 @@ export struct ThirdLevelComponent { @@ -8,7 +8,7 @@ export struct ThirdLevelComponent {
8 @Consume @Watch('onFirstChange') currentFirst: AreaListManageModel; 8 @Consume @Watch('onFirstChange') currentFirst: AreaListManageModel;
9 @Consume @Watch('onSecondChange') currentSecondBean: AreaListManageModel; 9 @Consume @Watch('onSecondChange') currentSecondBean: AreaListManageModel;
10 @Consume currentThirdBean: AreaListManageModel 10 @Consume currentThirdBean: AreaListManageModel
11 - 11 + currentSelect:number = 0
12 build() { 12 build() {
13 Column(){ 13 Column(){
14 Column(){ 14 Column(){
@@ -36,11 +36,21 @@ export struct ThirdLevelComponent { @@ -36,11 +36,21 @@ export struct ThirdLevelComponent {
36 } 36 }
37 37
38 onFirstChange(){ 38 onFirstChange(){
39 - this.select = 0 39 + // if (this.currentSelect > 0){
  40 + // this.select = this.currentSelect
  41 + // this.currentSelect = 0
  42 + // }else {
  43 + // this.select = 0
  44 + // }
40 } 45 }
41 46
42 onSecondChange(){ 47 onSecondChange(){
43 - this.select = 0 48 + if (this.currentSelect > 0){
  49 + this.select = this.currentSelect
  50 + this.currentSelect = 0
  51 + }else {
  52 + this.select = 0
  53 + }
44 if (!this.currentSecondBean) { 54 if (!this.currentSecondBean) {
45 this.mTip = '暂无数据'; 55 this.mTip = '暂无数据';
46 } else { 56 } else {
1 1
  2 +export interface AreaListData{
  3 + success: boolean;
  4 + code: number;
  5 + message: string;
  6 + data: AreaListModel[];
  7 + timestamp?: number;
  8 +}
2 9
3 10
4 export interface AreaListModel{ 11 export interface AreaListModel{
@@ -27,8 +27,9 @@ export function viewBlogInsightIntentShare(context: common.UIAbilityContext, ent @@ -27,8 +27,9 @@ export function viewBlogInsightIntentShare(context: common.UIAbilityContext, ent
27 let insightIntentArray: insightIntent.InsightIntent [] = [] 27 let insightIntentArray: insightIntent.InsightIntent [] = []
28 let identifier = generateUUID() 28 let identifier = generateUUID()
29 if (compList?.length > 0) { 29 if (compList?.length > 0) {
30 - compList?.forEach((item: CompDTO | CompList) => {  
31 - item.operDataList.forEach((_item: ContentDTO) => { 30 + compList?.forEach((comp: CompDTO | CompList) => {
  31 + comp.operDataList.forEach((item: ContentDTO) => {
  32 + console.log('zzzz',JSON.stringify(item))
32 let viewBlogInsightIntentItem: insightIntent.InsightIntent = { 33 let viewBlogInsightIntentItem: insightIntent.InsightIntent = {
33 intentName: 'ViewBlog', 34 intentName: 'ViewBlog',
34 intentVersion: '1.0.1', 35 intentVersion: '1.0.1',
@@ -43,25 +44,26 @@ export function viewBlogInsightIntentShare(context: common.UIAbilityContext, ent @@ -43,25 +44,26 @@ export function viewBlogInsightIntentShare(context: common.UIAbilityContext, ent
43 }, 44 },
44 intentEntityInfo: { 45 intentEntityInfo: {
45 entityName: 'Blog', 46 entityName: 'Blog',
46 - entityId: _item?.objectId,  
47 - displayName: _item?.newsTitle, 47 + entityId: item?.objectId || '',//必传
  48 + displayName: item?.newsTitle || '', //必传
48 entityGroupId, //channelId 49 entityGroupId, //channelId
49 - logoURL: _item?.coverUrl,  
50 - metadataModificationTime: _item?.publishTimestamp,  
51 - blogTitle: _item?.newsTitle, 50 + logoURL: item?.coverUrl,
  51 + metadataModificationTime: Number(item?.publishTime) || 0,//int
  52 + blogTitle: item?.newsTitle,
52 blogType: 'Normal', 53 blogType: 'Normal',
53 - blogCategory: item.name,  
54 - categoryDisplayName: item.name,  
55 - blogSubTitle: _item?.newsSummary.length > 20 ?  
56 - _item?.newsSummary.substring(0, 20) : _item?.newsSummary,  
57 - blogAuthor: _item?.source,  
58 - blogPublishTime: _item?.publishTimestamp,  
59 - tag: _item?.newTags.split(','),  
60 - likeCount: _item?.interactData?.likeNum || 0,  
61 - forwardCount: _item?.interactData?.shareNum || 0,  
62 - commentCount: _item?.interactData?.commentNum || 0,  
63 - favorites: _item?.interactData?.collectNum || 0,  
64 - viewCount: _item?.interactData?.readNum || 0, 54 + blogCategory: entityGroupId === '2001' ? '推荐' : '热点',
  55 + categoryDisplayName: item.newsTitle,//卡片上的主标题
  56 + description: item?.newsSummary || '',//必传
  57 + blogSubTitle: item?.newsSummary.length > 20 ?
  58 + item?.newsSummary.substring(0, 20) : item?.newsSummary,
  59 + blogAuthor: item?.source,
  60 + blogPublishTime: item?.publishTime,//string
  61 + tag: item?.newTags.split(','),
  62 + likeCount: item?.interactData?.likeNum || 0,
  63 + forwardCount: item?.interactData?.shareNum || 0,
  64 + commentCount: item?.interactData?.commentNum || 0,
  65 + favorites: item?.interactData?.collectNum || 0,
  66 + viewCount: item?.interactData?.readNum || 0,
65 rankingHint: 99 67 rankingHint: 99
66 } 68 }
67 } 69 }
@@ -84,6 +86,7 @@ export function viewBlogInsightIntentShare(context: common.UIAbilityContext, ent @@ -84,6 +86,7 @@ export function viewBlogInsightIntentShare(context: common.UIAbilityContext, ent
84 export function viewBlogItemInsightIntentShare(context: common.UIAbilityContext, item: ContentDetailDTO, 86 export function viewBlogItemInsightIntentShare(context: common.UIAbilityContext, item: ContentDetailDTO,
85 interactData?: InteractDataDTO) { 87 interactData?: InteractDataDTO) {
86 let identifier = generateUUID() 88 let identifier = generateUUID()
  89 + console.log('zzzz',JSON.stringify(item))
87 let viewBlogInsightIntentItem: insightIntent.InsightIntent = { 90 let viewBlogInsightIntentItem: insightIntent.InsightIntent = {
88 intentName: 'ViewBlog', 91 intentName: 'ViewBlog',
89 intentVersion: '1.0.1', 92 intentVersion: '1.0.1',
@@ -93,19 +96,20 @@ export function viewBlogItemInsightIntentShare(context: common.UIAbilityContext, @@ -93,19 +96,20 @@ export function viewBlogItemInsightIntentShare(context: common.UIAbilityContext,
93 }, 96 },
94 intentEntityInfo: { 97 intentEntityInfo: {
95 entityName: 'Blog', 98 entityName: 'Blog',
96 - entityId: String(item?.newsId),  
97 - displayName: item?.newsTitle, 99 + entityId: String(item?.newsId) || '',
  100 + displayName: item?.newsTitle || '',
98 entityGroupId: String(item?.reLInfo?.channelId), //channelId 101 entityGroupId: String(item?.reLInfo?.channelId), //channelId
99 logoURL: item.fullColumnImgUrls.length > 0 ? item.fullColumnImgUrls[0]?.url : item.firstFrameImageUri, 102 logoURL: item.fullColumnImgUrls.length > 0 ? item.fullColumnImgUrls[0]?.url : item.firstFrameImageUri,
100 - metadataModificationTime: item?.publishTime, 103 + metadataModificationTime: new Date(item.publishTime).getTime() || 0,
101 blogTitle: item?.newsTitle, 104 blogTitle: item?.newsTitle,
102 blogType: 'Normal', 105 blogType: 'Normal',
103 - blogCategory: item,  
104 - categoryDisplayName: '', //TODO 分类名称 106 + blogCategory: item?.reLInfo?.channelId === 2001 ? '推荐' : '热点',
  107 + categoryDisplayName: item.newsTitle || '',
105 blogSubTitle: item?.newsSummary.length > 20 ? 108 blogSubTitle: item?.newsSummary.length > 20 ?
106 item?.newsSummary.substring(0, 20) : item?.newsSummary, 109 item?.newsSummary.substring(0, 20) : item?.newsSummary,
  110 + description: item?.newsSummary || '',//必传
107 blogAuthor: item?.newsSourceName, 111 blogAuthor: item?.newsSourceName,
108 - blogPublishTime: item?.publishTime, 112 + blogPublishTime: `${new Date(item.publishTime).getTime()}` || '',
109 tag: item?.newsTags.split(','), 113 tag: item?.newsTags.split(','),
110 viewCount: item?.viewCount || 0, 114 viewCount: item?.viewCount || 0,
111 likeCount: interactData?.likeNum || 0, 115 likeCount: interactData?.likeNum || 0,
@@ -4,7 +4,7 @@ import { @@ -4,7 +4,7 @@ import {
4 EditListInfo, editModel, editModelParams, WDEditDataModelType } from '../model/EditInfoModel'; 4 EditListInfo, editModel, editModelParams, WDEditDataModelType } from '../model/EditInfoModel';
5 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork'; 5 import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
6 import { Logger, ResourcesUtils } from 'wdKit'; 6 import { Logger, ResourcesUtils } from 'wdKit';
7 -import { AreaListManageModel, AreaListModel } from '../model/AreaListModel'; 7 +import { AreaListManageModel, AreaListModel,AreaListData } from '../model/AreaListModel';
8 import promptAction from '@ohos.promptAction'; 8 import promptAction from '@ohos.promptAction';
9 9
10 const TAG = "EditInfoViewModel" 10 const TAG = "EditInfoViewModel"
@@ -74,17 +74,16 @@ class EditInfoViewModel { @@ -74,17 +74,16 @@ class EditInfoViewModel {
74 74
75 getAreaList(context: Context):PromiseLike<AreaListModel[]>{ 75 getAreaList(context: Context):PromiseLike<AreaListModel[]>{
76 return new Promise((success, error) => { 76 return new Promise((success, error) => {
77 - success(this.getAreaListLocal(context))  
78 - // HttpRequest.post(HttpUrlUtils.APPOINTMENT_AccountOwner_PATH).then((navResDTO:ResponseDTO) =>{  
79 - // if (navResDTO.code == 200) {  
80 - // // let editM = navResDTO.data as EditInfoModel  
81 - // // success(JSON.parse(navResDTO.data)  
82 - // }  
83 - // }).catch((error: Error) => {  
84 - // Logger.info(TAG,'getAreaList','EditInfoViewModel')  
85 - // success(this.getAreaListLocal(context))  
86 - //  
87 - // }) 77 + WDHttp.get<AreaListData>(HttpUrlUtils.getHost() + HttpUrlUtils.APPOINTMENT_userArea_PATH).then((navResDTO: AreaListData) => {
  78 + if (navResDTO.code == 0) {
  79 + success(navResDTO.data)
  80 + }else {
  81 + success(this.getAreaListLocal(context))
  82 + }
  83 + }).catch((error: Error) => {
  84 + Logger.info(TAG,'executeCollcet','ResponseDTO')
  85 + success(this.getAreaListLocal(context))
  86 + })
88 }) 87 })
89 } 88 }
90 89
@@ -11,17 +11,5 @@ @@ -11,17 +11,5 @@
11 "compressNativeLibs": true, 11 "compressNativeLibs": true,
12 "deliveryWithInstall": true, 12 "deliveryWithInstall": true,
13 "pages": "$profile:main_pages", 13 "pages": "$profile:main_pages",
14 - "requestPermissions": [  
15 - {  
16 - "name": "ohos.permission.APPROXIMATELY_LOCATION",  
17 - "reason": "$string:location_reason",  
18 - "usedScene": {  
19 - "abilities": [  
20 - "FormAbility"  
21 - ],  
22 - "when": "inuse"  
23 - }  
24 - }  
25 - ]  
26 } 14 }
27 } 15 }
@@ -246,6 +246,8 @@ export class LoginViewModel { @@ -246,6 +246,8 @@ export class LoginViewModel {
246 } 246 }
247 if(data.userExtend.headPhotoUrl!=undefined){ 247 if(data.userExtend.headPhotoUrl!=undefined){
248 SPHelper.default.saveSync(SpConstants.USER_HEAD_PHOTO_URL, data.userExtend.headPhotoUrl) 248 SPHelper.default.saveSync(SpConstants.USER_HEAD_PHOTO_URL, data.userExtend.headPhotoUrl)
  249 + }else {
  250 + SPHelper.default.deleteSync(SpConstants.USER_HEAD_PHOTO_URL)
249 } 251 }
250 if(data.userExtend.birthday!=undefined){ 252 if(data.userExtend.birthday!=undefined){
251 SPHelper.default.saveSync(SpConstants.USER_BIRTHDAY, data.userExtend.birthday) 253 SPHelper.default.saveSync(SpConstants.USER_BIRTHDAY, data.userExtend.birthday)
@@ -69,7 +69,7 @@ struct OneKeyLoginPage { @@ -69,7 +69,7 @@ struct OneKeyLoginPage {
69 } 69 }
70 70
71 onPageHide(): void { 71 onPageHide(): void {
72 - const duration = (Date.now() - this.pageStartDate!) 72 + const duration = Math.floor((Date.now() - this.pageStartDate!)/1000)
73 TrackingPageBrowse.trackCommonPageExposureEnd(this.pageName, this.pageName, duration) 73 TrackingPageBrowse.trackCommonPageExposureEnd(this.pageName, this.pageName, duration)
74 } 74 }
75 75
@@ -6,7 +6,7 @@ import { Tracking } from './Tracking' @@ -6,7 +6,7 @@ import { Tracking } from './Tracking'
6 export class TrackingPageBrowse { 6 export class TrackingPageBrowse {
7 7
8 /// 页面浏览事件 8 /// 页面浏览事件
9 - // duration 浏览时长，上层计算，单位毫秒 9 + // duration 浏览时长，上层计算，单位秒
10 static trackCommonPageExposureEnd(pageId: string, pageName: string, duration: number ,extParams?: ParamType) { 10 static trackCommonPageExposureEnd(pageId: string, pageName: string, duration: number ,extParams?: ParamType) {
11 let params = TrackingUtils.generateParams(extParams) 11 let params = TrackingUtils.generateParams(extParams)
12 if (pageId.length) { 12 if (pageId.length) {
@@ -16,7 +16,7 @@ export class TrackingPageBrowse { @@ -16,7 +16,7 @@ export class TrackingPageBrowse {
16 params["pageName"] = pageName 16 params["pageName"] = pageName
17 } 17 }
18 18
19 - params["duration"] = duration / 1000 19 + params["duration"] = duration
20 params["action"] = TrackConstants.ActionType.Browse 20 params["action"] = TrackConstants.ActionType.Browse
21 TrackingUtils.fillPositionWith(params) 21 TrackingUtils.fillPositionWith(params)
22 Tracking.event("channel_exposure", params) 22 Tracking.event("channel_exposure", params)
1 -import { LogoutViewModel, PermissionDesComponent } from 'wdComponent'; 1 +import { LogoutViewModel } from 'wdComponent';
2 import { BreakpointConstants } from 'wdConstant'; 2 import { BreakpointConstants } from 'wdConstant';
3 3
4 -import { common } from '@kit.AbilityKit';  
5 import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger, MpaasUpgradeCheck, WindowModel } from 'wdKit'; 4 import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger, MpaasUpgradeCheck, WindowModel } from 'wdKit';
6 import { promptAction, window } from '@kit.ArkUI'; 5 import { promptAction, window } from '@kit.ArkUI';
7 import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog" 6 import { UpgradeTipDialog } from "./upgradePage/UpgradeTipDialog"
@@ -20,7 +19,6 @@ struct MainPage { @@ -20,7 +19,6 @@ struct MainPage {
20 private breakpointSystem: BreakpointSystem = new BreakpointSystem() 19 private breakpointSystem: BreakpointSystem = new BreakpointSystem()
21 @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = 20 @StorageLink('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string =
22 BreakpointConstants.BREAKPOINT_XS; 21 BreakpointConstants.BREAKPOINT_XS;
23 - @State isPermission: boolean = false  
24 upgradeDialogController?: CustomDialogController 22 upgradeDialogController?: CustomDialogController
25 23
26 watchCurrentBreakpoint() { 24 watchCurrentBreakpoint() {
@@ -37,9 +35,6 @@ struct MainPage { @@ -37,9 +35,6 @@ struct MainPage {
37 EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => { 35 EmitterUtils.receiveEvent(EmitterEventId.FORCE_USER_LOGIN_OUT, () => {
38 LogoutViewModel.clearLoginInfo() 36 LogoutViewModel.clearLoginInfo()
39 }) 37 })
40 - EmitterUtils.receiveEvent(EmitterEventId.LOCATION, () => {  
41 - this.isPermission = true  
42 - })  
43 } 38 }
44 39
45 pageTransition() { 40 pageTransition() {
@@ -114,9 +109,6 @@ struct MainPage { @@ -114,9 +109,6 @@ struct MainPage {
114 build() { 109 build() {
115 Stack({ alignContent: Alignment.Top }) { 110 Stack({ alignContent: Alignment.Top }) {
116 BottomNavigationComponent() 111 BottomNavigationComponent()
117 - if (this.isPermission) {  
118 - PermissionDesComponent()  
119 - }  
120 } 112 }
121 } 113 }
122 } 114 }