Showing
14 changed files
with
59 additions
and
146 deletions
| 1 | -import ArrayList from '@ohos.util.ArrayList' | ||
| 2 | -import { ViewType } from 'wdConstant/Index'; | ||
| 3 | import { DateTimeUtils, EmitterEventId, EmitterUtils, LazyDataSource } from 'wdKit/Index'; | 1 | import { DateTimeUtils, EmitterEventId, EmitterUtils, LazyDataSource } from 'wdKit/Index'; |
| 4 | -import PageModel from '../../../viewmodel/PageModel'; | ||
| 5 | -import { commentItemModel, commentListModel, WDPublicUserType } from '../model/CommentModel'; | ||
| 6 | -import commentViewModel from '../viewmodel/CommentViewModel' | 2 | +import { commentItemModel, WDPublicUserType } from '../model/CommentModel'; |
| 3 | +import commentViewModel from '../viewmodel/CommentViewModel'; | ||
| 7 | import { CommentText } from './CommentText'; | 4 | import { CommentText } from './CommentText'; |
| 8 | -import measure from '@ohos.measure' | ||
| 9 | -import { CommentCustomDialog } from './CommentCustomDialog' | 5 | +import { CommentCustomDialog } from './CommentCustomDialog'; |
| 10 | import { publishCommentModel } from '../model/PublishCommentModel'; | 6 | import { publishCommentModel } from '../model/PublishCommentModel'; |
| 11 | -import { ifaa } from '@kit.OnlineAuthenticationKit'; | ||
| 12 | -import { HttpUrlUtils, HttpUtils } from 'wdNetwork/Index'; | ||
| 13 | -import NoMoreLayout from '../../page/NoMoreLayout'; | 7 | +import { HttpUtils } from 'wdNetwork/Index'; |
| 14 | import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; | 8 | import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; |
| 15 | -import { ColorUtils } from '../../../utils/ColorUtils'; | 9 | +import { EmptyComponent } from '../../view/EmptyComponent'; |
| 16 | 10 | ||
| 17 | const TAG = 'CommentComponent'; | 11 | const TAG = 'CommentComponent'; |
| 18 | 12 | ||
| @@ -27,10 +21,8 @@ export struct CommentComponent { | @@ -27,10 +21,8 @@ export struct CommentComponent { | ||
| 27 | // @State private browSingModel: commentListModel = new commentListModel() | 21 | // @State private browSingModel: commentListModel = new commentListModel() |
| 28 | /*必传*/ | 22 | /*必传*/ |
| 29 | @ObjectLink publishCommentModel: publishCommentModel | 23 | @ObjectLink publishCommentModel: publishCommentModel |
| 30 | - | ||
| 31 | listScroller: ListScroller = new ListScroller(); // scroller控制器 | 24 | listScroller: ListScroller = new ListScroller(); // scroller控制器 |
| 32 | historyOffset: number = 0; // 上次浏览到列表距离顶端的偏移量offset | 25 | historyOffset: number = 0; // 上次浏览到列表距离顶端的偏移量offset |
| 33 | - | ||
| 34 | isloading: boolean = false | 26 | isloading: boolean = false |
| 35 | @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource(); | 27 | @State allDatas: LazyDataSource<commentItemModel> = new LazyDataSource(); |
| 36 | @State dialogController: CustomDialogController | null = null; | 28 | @State dialogController: CustomDialogController | null = null; |
| @@ -142,7 +134,7 @@ export struct CommentComponent { | @@ -142,7 +134,7 @@ export struct CommentComponent { | ||
| 142 | 134 | ||
| 143 | build() { | 135 | build() { |
| 144 | Column() { | 136 | Column() { |
| 145 | - List({scroller:this.listScroller}) { | 137 | + List({ scroller: this.listScroller }) { |
| 146 | ListItemGroup({ header: this.titleHeader() }) | 138 | ListItemGroup({ header: this.titleHeader() }) |
| 147 | 139 | ||
| 148 | LazyForEach(this.allDatas, (item: commentItemModel, index: number) => { | 140 | LazyForEach(this.allDatas, (item: commentItemModel, index: number) => { |
| @@ -181,10 +173,15 @@ export struct CommentComponent { | @@ -181,10 +173,15 @@ export struct CommentComponent { | ||
| 181 | 173 | ||
| 182 | // 加载更多 | 174 | // 加载更多 |
| 183 | ListItem() { | 175 | ListItem() { |
| 184 | - if (this.hasMore === false) NoMoreLayout() | 176 | + if (this.hasMore === false) { |
| 177 | + // NoMoreLayout() | ||
| 178 | + EmptyComponent({ emptyType: 17 }) | ||
| 179 | + .height(300) | ||
| 185 | } | 180 | } |
| 181 | + | ||
| 186 | } | 182 | } |
| 187 | - .onReachEnd(()=>{ | 183 | + } |
| 184 | + .onReachEnd(() => { | ||
| 188 | if (this.hasMore) { | 185 | if (this.hasMore) { |
| 189 | this.getData() | 186 | this.getData() |
| 190 | } | 187 | } |
| @@ -197,11 +194,13 @@ export struct CommentComponent { | @@ -197,11 +194,13 @@ export struct CommentComponent { | ||
| 197 | 194 | ||
| 198 | //获取数据 | 195 | //获取数据 |
| 199 | async getData() { | 196 | async getData() { |
| 200 | - commentViewModel.fetchContentCommentList(this.currentPage + '', this.publishCommentModel.targetId, this.publishCommentModel.targetType) | 197 | + commentViewModel.fetchContentCommentList(this.currentPage + '', this.publishCommentModel.targetId, |
| 198 | + this.publishCommentModel.targetType) | ||
| 201 | .then(commentListModel => { | 199 | .then(commentListModel => { |
| 202 | this.currentPage++ | 200 | this.currentPage++ |
| 203 | 201 | ||
| 204 | - if (Number.parseInt(commentListModel.totalCommentNum) > Number.parseInt(this.publishCommentModel.totalCommentNumer)) { | 202 | + if (Number.parseInt(commentListModel.totalCommentNum) > |
| 203 | + Number.parseInt(this.publishCommentModel.totalCommentNumer)) { | ||
| 205 | this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + '' | 204 | this.publishCommentModel.totalCommentNumer = commentListModel.totalCommentNum + '' |
| 206 | } | 205 | } |
| 207 | 206 | ||
| @@ -223,7 +222,7 @@ export struct CommentComponent { | @@ -223,7 +222,7 @@ export struct CommentComponent { | ||
| 223 | }); | 222 | }); |
| 224 | 223 | ||
| 225 | 224 | ||
| 226 | - }else{ | 225 | + } else { |
| 227 | this.hasMore = false | 226 | this.hasMore = false |
| 228 | } | 227 | } |
| 229 | }) | 228 | }) |
| 1 | import { commentInfo, CompDTO, ContentDTO, Params } from 'wdBean'; | 1 | import { commentInfo, CompDTO, ContentDTO, Params } from 'wdBean'; |
| 2 | import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; | 2 | import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'; |
| 3 | -import { HttpUtils } from 'wdNetwork/Index'; | ||
| 4 | -import { postInteractAccentionOperateParams } from 'wdBean'; | ||
| 5 | -import { PageRepository } from '../../repository/PageRepository'; | ||
| 6 | -import { DateTimeUtils } from 'wdKit/Index'; | 3 | +import { DateTimeUtils, SPHelper } from 'wdKit/Index'; |
| 7 | import { ProcessUtils } from 'wdRouter'; | 4 | import { ProcessUtils } from 'wdRouter'; |
| 5 | +import { SpConstants } from 'wdConstant/Index' | ||
| 8 | 6 | ||
| 9 | /** | 7 | /** |
| 10 | * 精选评论卡 | 8 | * 精选评论卡 |
| @@ -32,6 +30,20 @@ export struct ZhSingleRow06 { | @@ -32,6 +30,20 @@ export struct ZhSingleRow06 { | ||
| 32 | @State compDTO: CompDTO = {} as CompDTO | 30 | @State compDTO: CompDTO = {} as CompDTO |
| 33 | @State likeBl: boolean = false; | 31 | @State likeBl: boolean = false; |
| 34 | 32 | ||
| 33 | + async likeAction() { | ||
| 34 | + const user_id = await SPHelper.default.get(SpConstants.USER_ID, '') | ||
| 35 | + if (!user_id) { | ||
| 36 | + WDRouterRule.jumpWithPage(WDRouterPage.loginPage) | ||
| 37 | + return | ||
| 38 | + } | ||
| 39 | + | ||
| 40 | + if (this.likeBl) { | ||
| 41 | + this.likeBl = false; | ||
| 42 | + } else { | ||
| 43 | + this.likeBl = true; | ||
| 44 | + } | ||
| 45 | + } | ||
| 46 | + | ||
| 35 | build() { | 47 | build() { |
| 36 | Column() { | 48 | Column() { |
| 37 | //顶部 | 49 | //顶部 |
| @@ -41,6 +53,7 @@ export struct ZhSingleRow06 { | @@ -41,6 +53,7 @@ export struct ZhSingleRow06 { | ||
| 41 | 53 | ||
| 42 | Column(){ | 54 | Column(){ |
| 43 | Text(this.compDTO.operDataList[0]?.commentInfo?.commentTitle) | 55 | Text(this.compDTO.operDataList[0]?.commentInfo?.commentTitle) |
| 56 | + .fontWeight(500) | ||
| 44 | .maxLines(4) | 57 | .maxLines(4) |
| 45 | .textOverflow({overflow: TextOverflow.Ellipsis}) | 58 | .textOverflow({overflow: TextOverflow.Ellipsis}) |
| 46 | .lineHeight(23) | 59 | .lineHeight(23) |
| @@ -88,15 +101,11 @@ export struct ZhSingleRow06 { | @@ -88,15 +101,11 @@ export struct ZhSingleRow06 { | ||
| 88 | .margin({right: 3}) | 101 | .margin({right: 3}) |
| 89 | 102 | ||
| 90 | Text('点赞') | 103 | Text('点赞') |
| 91 | - .fontSize(14) | 104 | + .fontSize(15) |
| 92 | .fontColor(0x999999) | 105 | .fontColor(0x999999) |
| 93 | } | 106 | } |
| 94 | .onClick(() => { | 107 | .onClick(() => { |
| 95 | - if (this.likeBl) { | ||
| 96 | - this.likeBl = false; | ||
| 97 | - } else { | ||
| 98 | - this.likeBl = true; | ||
| 99 | - } | 108 | + this.likeAction() |
| 100 | }) | 109 | }) |
| 101 | } | 110 | } |
| 102 | .justifyContent(FlexAlign.SpaceBetween) | 111 | .justifyContent(FlexAlign.SpaceBetween) |
| @@ -125,6 +134,7 @@ export struct ZhSingleRow06 { | @@ -125,6 +134,7 @@ export struct ZhSingleRow06 { | ||
| 125 | .fontSize(14) | 134 | .fontSize(14) |
| 126 | .fontColor(0x222222) | 135 | .fontColor(0x222222) |
| 127 | .maxLines(1) | 136 | .maxLines(1) |
| 137 | + .fontWeight(500) | ||
| 128 | .textOverflow({overflow: TextOverflow.Ellipsis}) | 138 | .textOverflow({overflow: TextOverflow.Ellipsis}) |
| 129 | } | 139 | } |
| 130 | .onClick(() => { | 140 | .onClick(() => { |
| @@ -155,106 +165,3 @@ function textOverflowStyle(maxLine: number) { | @@ -155,106 +165,3 @@ function textOverflowStyle(maxLine: number) { | ||
| 155 | .maxLines(maxLine) | 165 | .maxLines(maxLine) |
| 156 | .textOverflow({ overflow: TextOverflow.Ellipsis }) | 166 | .textOverflow({ overflow: TextOverflow.Ellipsis }) |
| 157 | } | 167 | } |
| 158 | - | ||
| 159 | -@Component | ||
| 160 | -struct CreatorItem { | ||
| 161 | - @Prop item: ContentDTO | ||
| 162 | - @State rmhIsAttention: number = 0 | ||
| 163 | - build() { | ||
| 164 | - ListItem() { | ||
| 165 | - Column() { | ||
| 166 | - Flex({direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween}) { | ||
| 167 | - Column() { | ||
| 168 | - Row() { | ||
| 169 | - Image('') | ||
| 170 | - .width(20) | ||
| 171 | - .height(20) | ||
| 172 | - .margin({right: 4}) | ||
| 173 | - .border({width: 1, color: 0xcccccc, radius: 10}) | ||
| 174 | - Text('立志之间') | ||
| 175 | - .fontColor(0x212228) | ||
| 176 | - .fontSize(12) | ||
| 177 | - } | ||
| 178 | - } | ||
| 179 | - | ||
| 180 | - Column() { | ||
| 181 | - Row() { | ||
| 182 | - Image($r('app.media.icon_like_no')) | ||
| 183 | - .width(16) | ||
| 184 | - .height(16) | ||
| 185 | - .margin({right: 4}) | ||
| 186 | - Text('3835') | ||
| 187 | - .fontSize(14) | ||
| 188 | - .fontColor(0x999999) | ||
| 189 | - } | ||
| 190 | - } | ||
| 191 | - } | ||
| 192 | - .margin({top: 10, left: 10, right: 10, bottom: 8}) | ||
| 193 | - | ||
| 194 | - Text('就业不仅是民生问题,也是发展问题,就业不仅是民生问题,也是发展问题,就业不仅是民生问题,也是发展问题,') | ||
| 195 | - .maxLines(2) | ||
| 196 | - .textOverflow({overflow: TextOverflow.Ellipsis}) | ||
| 197 | - .margin({left: 10, right: 10, bottom: 8}) | ||
| 198 | - .fontSize(17) | ||
| 199 | - .fontColor(0x212228) | ||
| 200 | - .lineHeight(25) | ||
| 201 | - | ||
| 202 | - Row() { | ||
| 203 | - Image('') | ||
| 204 | - .width(66) | ||
| 205 | - .height(44) | ||
| 206 | - .borderRadius({topLeft: 3, topRight: 0, bottomLeft: 3, bottomRight: 0}) | ||
| 207 | - Text('原文|强化就业优先政策 健全就业促进机制原文|强化就业优先政策 健全就业促进机制原文|强化就业优先政策 健全就业促进机制') | ||
| 208 | - .margin({left: 8}) | ||
| 209 | - .width(172) | ||
| 210 | - .maxLines(2) | ||
| 211 | - .textOverflow({overflow: TextOverflow.Ellipsis}) | ||
| 212 | - } | ||
| 213 | - .linearGradient({ | ||
| 214 | - direction: GradientDirection.Right, | ||
| 215 | - colors: [[0xffffff, 0.0],[0xffffff, 0.8], [0xf9f9f9, 1.0]] | ||
| 216 | - }) | ||
| 217 | - } | ||
| 218 | - .width(276) | ||
| 219 | - .height(150) | ||
| 220 | - .margin({ right: 10 }) | ||
| 221 | - .borderWidth(1) | ||
| 222 | - .borderColor($r('app.color.color_EDEDED')) | ||
| 223 | - .borderRadius($r('app.float.image_border_radius')) | ||
| 224 | - .backgroundColor(0xf9f9f9) | ||
| 225 | - } | ||
| 226 | - .onClick(() => { | ||
| 227 | - console.log('跳转到rmh'); | ||
| 228 | - }) | ||
| 229 | - } | ||
| 230 | - | ||
| 231 | - /** | ||
| 232 | - * 关注号主 TODO 这里后面需要抽离 | ||
| 233 | - */ | ||
| 234 | - handleAccention(item: ContentDTO, status: number) { | ||
| 235 | - this.rmhIsAttention = this.rmhIsAttention ? 0 : 1 | ||
| 236 | - return | ||
| 237 | - // 未登录,跳转登录 | ||
| 238 | - if (!HttpUtils.getUserId()) { | ||
| 239 | - WDRouterRule.jumpWithPage(WDRouterPage.loginPage) | ||
| 240 | - return | ||
| 241 | - } | ||
| 242 | - | ||
| 243 | - const params: postInteractAccentionOperateParams = { | ||
| 244 | - attentionUserType: item.rmhInfo?.userType || '', //被关注用户类型(1 普通用户 2 视频号 3 矩阵号) | ||
| 245 | - attentionUserId: item.rmhInfo?.userId || '', // 被关注用户号主id | ||
| 246 | - attentionCreatorId: item.rmhInfo?.rmhId || '', // 被关注用户号主id | ||
| 247 | - // userType: 1, | ||
| 248 | - // userId: '1', // TODO 用户id需要从本地获取 | ||
| 249 | - status: status, | ||
| 250 | - } | ||
| 251 | - PageRepository.postInteractAccentionOperate(params).then(res => { | ||
| 252 | - console.log(TAG, '关注号主==', JSON.stringify(res.data)) | ||
| 253 | - if (status === 1) { | ||
| 254 | - this.rmhIsAttention = 0 | ||
| 255 | - } else { | ||
| 256 | - this.rmhIsAttention = 1 | ||
| 257 | - } | ||
| 258 | - }) | ||
| 259 | - } | ||
| 260 | -} |
| @@ -47,7 +47,7 @@ export default struct MinePageMoreFunctionUI { | @@ -47,7 +47,7 @@ export default struct MinePageMoreFunctionUI { | ||
| 47 | .fontWeight(400) | 47 | .fontWeight(400) |
| 48 | 48 | ||
| 49 | Blank() | 49 | Blank() |
| 50 | - Image($r('app.media.mine_user_arrow')) | 50 | + Image($r('app.media.mine_user_arrow_2')) |
| 51 | .width('27lpx') | 51 | .width('27lpx') |
| 52 | .height('27lpx') | 52 | .height('27lpx') |
| 53 | .objectFit(ImageFit.Auto) | 53 | .objectFit(ImageFit.Auto) |
| @@ -83,14 +83,15 @@ export default struct MinePageUserSimpleInfoUI { | @@ -83,14 +83,15 @@ export default struct MinePageUserSimpleInfoUI { | ||
| 83 | .height('29lpx') | 83 | .height('29lpx') |
| 84 | }.margin({top:'15lpx'}) | 84 | }.margin({top:'15lpx'}) |
| 85 | }.alignItems(HorizontalAlign.Start) | 85 | }.alignItems(HorizontalAlign.Start) |
| 86 | - .margin({top:'12lpx',left:'17lpx'}) | 86 | + .margin({top:'12lpx',left:'23lpx'}) |
| 87 | .width('352lpx') | 87 | .width('352lpx') |
| 88 | }else{ | 88 | }else{ |
| 89 | Row(){ | 89 | Row(){ |
| 90 | Text("登录注册") | 90 | Text("登录注册") |
| 91 | .fontColor($r('app.color.color_222222')) | 91 | .fontColor($r('app.color.color_222222')) |
| 92 | - .textOverflow({ overflow: TextOverflow.Ellipsis }) | ||
| 93 | - .fontSize('33lpx') | 92 | + .fontSize('38lpx') |
| 93 | + .lineHeight("46lpx") | ||
| 94 | + .fontWeight(600) | ||
| 94 | 95 | ||
| 95 | Image($r('app.media.mine_user_edit')) | 96 | Image($r('app.media.mine_user_edit')) |
| 96 | .width('11lpx') | 97 | .width('11lpx') |
| @@ -101,7 +102,7 @@ export default struct MinePageUserSimpleInfoUI { | @@ -101,7 +102,7 @@ export default struct MinePageUserSimpleInfoUI { | ||
| 101 | }.onClick(()=>{ | 102 | }.onClick(()=>{ |
| 102 | this.jumpLogin() | 103 | this.jumpLogin() |
| 103 | }) | 104 | }) |
| 104 | - .margin({top:'11lpx',left:'17lpx'}) | 105 | + .margin({top:'11lpx',left:'23lpx'}) |
| 105 | .width('352lpx') | 106 | .width('352lpx') |
| 106 | } | 107 | } |
| 107 | 108 |
| 1 | import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean'; | 1 | import { BottomNavDTO, CompDTO, TopNavDTO } from 'wdBean'; |
| 2 | import { SpConstants } from 'wdConstant'; | 2 | import { SpConstants } from 'wdConstant'; |
| 3 | -import { DisplayUtils, LazyDataSource, Logger, SPHelper } from 'wdKit'; | 3 | +import { DisplayUtils, LazyDataSource, Logger, SPHelper, NetworkUtil, ToastUtils } from 'wdKit'; |
| 4 | import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter'; | 4 | import { ProcessUtils, WDRouterPage, WDRouterRule } from 'wdRouter'; |
| 5 | import { PageComponent } from './PageComponent'; | 5 | import { PageComponent } from './PageComponent'; |
| 6 | import { ChannelSubscriptionLayout } from './ChannelSubscriptionLayout'; | 6 | import { ChannelSubscriptionLayout } from './ChannelSubscriptionLayout'; |
| @@ -209,7 +209,11 @@ export struct TopNavigationComponent { | @@ -209,7 +209,11 @@ export struct TopNavigationComponent { | ||
| 209 | .height(30) | 209 | .height(30) |
| 210 | .width(124) | 210 | .width(124) |
| 211 | .onClick(() => { | 211 | .onClick(() => { |
| 212 | + if (NetworkUtil.isNetConnected()) { | ||
| 212 | ProcessUtils.gotoMorningEveningPaper() | 213 | ProcessUtils.gotoMorningEveningPaper() |
| 214 | + } else { | ||
| 215 | + ToastUtils.showToast('网络出小差了,请检查网络后重试', 1000) | ||
| 216 | + } | ||
| 213 | }) | 217 | }) |
| 214 | }.width('100%') | 218 | }.width('100%') |
| 215 | .justifyContent(FlexAlign.SpaceBetween) | 219 | .justifyContent(FlexAlign.SpaceBetween) |
| @@ -17,7 +17,8 @@ export struct SearchHistoryComponent{ | @@ -17,7 +17,8 @@ export struct SearchHistoryComponent{ | ||
| 17 | this.onAccept() | 17 | this.onAccept() |
| 18 | }, | 18 | }, |
| 19 | title: "确认清空历史记录", | 19 | title: "确认清空历史记录", |
| 20 | - tipShow:false | 20 | + tipShow:false, |
| 21 | + leftTextColor:$r('app.color.color_648DF2') | ||
| 21 | }), | 22 | }), |
| 22 | autoCancel: true, | 23 | autoCancel: true, |
| 23 | alignment: DialogAlignment.Center, | 24 | alignment: DialogAlignment.Center, |
| @@ -256,7 +256,7 @@ export struct MineSettingComponent { | @@ -256,7 +256,7 @@ export struct MineSettingComponent { | ||
| 256 | 256 | ||
| 257 | // 右侧文案和右箭头 | 257 | // 右侧文案和右箭头 |
| 258 | Row() { | 258 | Row() { |
| 259 | - Text((item.itemType=='clear_cache') ? this.cacheSize.toFixed(2) + 'MB' : '') | 259 | + Text((item.itemType=='clear_cache') ? this.cacheSize.toFixed(2) + 'M' : '') |
| 260 | .fontColor('#999999') | 260 | .fontColor('#999999') |
| 261 | .maxLines(1) | 261 | .maxLines(1) |
| 262 | Image($r('app.media.mine_user_arrow')) | 262 | Image($r('app.media.mine_user_arrow')) |
| @@ -231,7 +231,7 @@ export struct EmptyComponent { | @@ -231,7 +231,7 @@ export struct EmptyComponent { | ||
| 231 | this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1) { | 231 | this.emptyType === WDViewDefaultType.WDViewDefaultType_NoComment1) { |
| 232 | imageString = $r('app.media.icon_no_comment') | 232 | imageString = $r('app.media.icon_no_comment') |
| 233 | } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) { | 233 | } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoSearchResult) { |
| 234 | - imageString = $r('app.media.icon_no_result') | 234 | + imageString = $r('app.media.icon_no_result1') |
| 235 | } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) { | 235 | } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_NoNetwork) { |
| 236 | imageString = $r('app.media.icon_no_net1') | 236 | imageString = $r('app.media.icon_no_net1') |
| 237 | } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) { | 237 | } else if (this.emptyType === WDViewDefaultType.WDViewDefaultType_ContentFailed) { |
| @@ -47,13 +47,13 @@ class MineSettingDatasModel{ | @@ -47,13 +47,13 @@ class MineSettingDatasModel{ | ||
| 47 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '接收推送', null, 1, pushState,"push_switch")) | 47 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '接收推送', null, 1, pushState,"push_switch")) |
| 48 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false,"private_setting")) | 48 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '隐私设罝', null, 0, false,"private_setting")) |
| 49 | let wifiState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_IMAGE_SWITCH,false) as boolean | 49 | let wifiState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_IMAGE_SWITCH,false) as boolean |
| 50 | - this.mainSettingData.push(new MineMainSettingFunctionItem(null, '仅WiFi网络加载图片', null, 1, wifiState,"wifi_switch")) | 50 | + this.mainSettingData.push(new MineMainSettingFunctionItem(null, '仅wifi网络加载图片', null, 1, wifiState,"wifi_switch")) |
| 51 | let videoState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_VIDEO_SWITCH,false) as boolean | 51 | let videoState=SPHelper.default.getSync(SpConstants.SETTING_WIFI_VIDEO_SWITCH,false) as boolean |
| 52 | - this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'WiFi网络情况下自动播放视频', null, 1, videoState,"video_switch")) | 52 | + this.mainSettingData.push(new MineMainSettingFunctionItem(null, 'wifi网络情况下自动播放视频', null, 1, videoState,"video_switch")) |
| 53 | let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean | 53 | let suspensionState=SPHelper.default.getSync(SpConstants.SETTING_SUSPENSION_SWITCH,false) as boolean |
| 54 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch")) | 54 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '开启播放器悬浮窗', null, 1, suspensionState,"suspensionState_switch")) |
| 55 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,"")) | 55 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, null, null, 2, null,"")) |
| 56 | - this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清除缓存', '32MB', 0, false,"clear_cache")) | 56 | + this.mainSettingData.push(new MineMainSettingFunctionItem(null, '清理缓存', '32MB', 0, false,"clear_cache")) |
| 57 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,"")) | 57 | this.mainSettingData.push(new MineMainSettingFunctionItem(null, '评价我们', null, 0, false,"")) |
| 58 | 58 | ||
| 59 | return this.mainSettingData | 59 | return this.mainSettingData |
| @@ -392,7 +392,7 @@ struct MineHomePage { | @@ -392,7 +392,7 @@ struct MineHomePage { | ||
| 392 | this.userName = value.userName | 392 | this.userName = value.userName |
| 393 | this.headPhotoUrl = value.headPhotoUrl | 393 | this.headPhotoUrl = value.headPhotoUrl |
| 394 | if(StringUtils.isNotEmpty(value.introduction)){ | 394 | if(StringUtils.isNotEmpty(value.introduction)){ |
| 395 | - this.desc = value.introduction | 395 | + this.desc = "简介:" + value.introduction |
| 396 | this.isHasIntroduction = true | 396 | this.isHasIntroduction = true |
| 397 | }else{ | 397 | }else{ |
| 398 | this.desc = "点击添加简介,让大家认识你" | 398 | this.desc = "点击添加简介,让大家认识你" |
271 Bytes
| @@ -90,7 +90,7 @@ export struct TabLiveComponent { | @@ -90,7 +90,7 @@ export struct TabLiveComponent { | ||
| 90 | 20) | 90 | 20) |
| 91 | .then( | 91 | .then( |
| 92 | (data) => { | 92 | (data) => { |
| 93 | - Logger.debug(TAG, `${JSON.stringify(data)}`) | 93 | + Logger.debug(TAG, '直播间数据:' + `${JSON.stringify(data)}`) |
| 94 | if (data.barrageResponses && data.barrageResponses.length > 0) { | 94 | if (data.barrageResponses && data.barrageResponses.length > 0) { |
| 95 | /** | 95 | /** |
| 96 | * 在直播聊天添加一条新内容逻辑: | 96 | * 在直播聊天添加一条新内容逻辑: |
| @@ -117,6 +117,7 @@ export struct TabLiveComponent { | @@ -117,6 +117,7 @@ export struct TabLiveComponent { | ||
| 117 | if (StringUtils.isEmpty(this.liveDetailsBean.oldNewsId) | 117 | if (StringUtils.isEmpty(this.liveDetailsBean.oldNewsId) |
| 118 | && this.liveDetailsBean | 118 | && this.liveDetailsBean |
| 119 | && this.liveDetailsBean.liveInfo.liveState != 'wait') { | 119 | && this.liveDetailsBean.liveInfo.liveState != 'wait') { |
| 120 | + this.pageModel.viewType = ViewType.LOADED; | ||
| 120 | this.updateLiveListData() | 121 | this.updateLiveListData() |
| 121 | } else { | 122 | } else { |
| 122 | this.pageModel.viewType = ViewType.EMPTY; | 123 | this.pageModel.viewType = ViewType.EMPTY; |
-
Please register or login to post a comment