developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
douaojie
39d8ce5d 2 parents 67b21ac3 5112aaad

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 15 changed files with 106 additions and 154 deletions
@@ -41,6 +41,7 @@ export struct ZhSingleRow06 { @@ -41,6 +41,7 @@ export struct ZhSingleRow06 {
41 41
42 Column(){ 42 Column(){
43 Text(this.compDTO.operDataList[0]?.commentInfo?.commentTitle) 43 Text(this.compDTO.operDataList[0]?.commentInfo?.commentTitle)
  44 + .fontWeight(500)
44 .maxLines(4) 45 .maxLines(4)
45 .textOverflow({overflow: TextOverflow.Ellipsis}) 46 .textOverflow({overflow: TextOverflow.Ellipsis})
46 .lineHeight(23) 47 .lineHeight(23)
@@ -88,7 +89,7 @@ export struct ZhSingleRow06 { @@ -88,7 +89,7 @@ export struct ZhSingleRow06 {
88 .margin({right: 3}) 89 .margin({right: 3})
89 90
90 Text('点赞') 91 Text('点赞')
91 - .fontSize(14) 92 + .fontSize(15)
92 .fontColor(0x999999) 93 .fontColor(0x999999)
93 } 94 }
94 .onClick(() => { 95 .onClick(() => {
@@ -125,6 +126,7 @@ export struct ZhSingleRow06 { @@ -125,6 +126,7 @@ export struct ZhSingleRow06 {
125 .fontSize(14) 126 .fontSize(14)
126 .fontColor(0x222222) 127 .fontColor(0x222222)
127 .maxLines(1) 128 .maxLines(1)
  129 + .fontWeight(500)
128 .textOverflow({overflow: TextOverflow.Ellipsis}) 130 .textOverflow({overflow: TextOverflow.Ellipsis})
129 } 131 }
130 .onClick(() => { 132 .onClick(() => {
@@ -155,106 +157,3 @@ function textOverflowStyle(maxLine: number) { @@ -155,106 +157,3 @@ function textOverflowStyle(maxLine: number) {
155 .maxLines(maxLine) 157 .maxLines(maxLine)
156 .textOverflow({ overflow: TextOverflow.Ellipsis }) 158 .textOverflow({ overflow: TextOverflow.Ellipsis })
157 } 159 }
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
@@ -17,9 +17,7 @@ export struct AppointmentListChildComponent{ @@ -17,9 +17,7 @@ export struct AppointmentListChildComponent{
17 }), 17 }),
18 autoCancel: true, 18 autoCancel: true,
19 alignment: DialogAlignment.Center, 19 alignment: DialogAlignment.Center,
20 - offset: { dx: 0, dy: -20 },  
21 - gridCount: 4,  
22 - customStyle: false 20 + customStyle: true
23 }) 21 })
24 22
25 23
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 - ProcessUtils.gotoMorningEveningPaper() 212 + if (NetworkUtil.isNetConnected()) {
  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)
@@ -4,9 +4,12 @@ export struct MyCustomDialog { @@ -4,9 +4,12 @@ export struct MyCustomDialog {
4 @State titleShow: boolean = true 4 @State titleShow: boolean = true
5 @State tipValue: string ="提示文字" 5 @State tipValue: string ="提示文字"
6 @State tipShow: boolean = true 6 @State tipShow: boolean = true
7 - 7 + @State cancelIsLeft :boolean = true//取消是否在左边
8 @State leftText: string = "取消" 8 @State leftText: string = "取消"
9 @State rightText: string = "确认" 9 @State rightText: string = "确认"
  10 + @State leftTextColor: Resource = $r('app.color.color_333333')
  11 + @State rightTextColor: Resource = $r('app.color.color_648DF2')
  12 +
10 13
11 controller: CustomDialogController 14 controller: CustomDialogController
12 cancel: () => void = () => { 15 cancel: () => void = () => {
@@ -16,21 +19,25 @@ export struct MyCustomDialog { @@ -16,21 +19,25 @@ export struct MyCustomDialog {
16 19
17 build() { 20 build() {
18 Column() { 21 Column() {
19 - if(this.titleShow){  
20 - Text(this.title)  
21 - .fontSize("32lpx")  
22 - .margin({ top: "40lpx", bottom: "15lpx" })  
23 - .fontColor($r('app.color.color_333333'))  
24 - .fontSize('35lpx')  
25 - .fontWeight('600lpx')  
26 - } 22 + Column(){
  23 + if(this.titleShow){
  24 + Text(this.title)
  25 + .fontSize("32lpx")
  26 + .fontColor($r('app.color.color_333333'))
  27 + .lineHeight('50lpx')
  28 + .fontWeight(600)
  29 + }
27 30
28 - if(this.tipShow){  
29 - Text(this.tipValue)  
30 - .margin({ bottom: "30lpx" })  
31 - .fontSize("27lpx")  
32 - .fontColor($r('app.color.color_B0B0B0'))  
33 - } 31 + if(this.tipShow){
  32 + Text(this.tipValue)
  33 + .margin({ top:this.titleShow?"10lpx":"0lpx" })
  34 + .fontSize("27lpx")
  35 + .fontWeight(400)
  36 + .lineHeight('38lpx')
  37 + .fontColor($r('app.color.color_999999'))
  38 + }
  39 + }.padding({top:"48lpx",bottom:"48lpx"})
  40 + .alignItems(HorizontalAlign.Center)
34 41
35 Divider() 42 Divider()
36 .width("100%") 43 .width("100%")
@@ -41,13 +48,21 @@ export struct MyCustomDialog { @@ -41,13 +48,21 @@ export struct MyCustomDialog {
41 Row(){ 48 Row(){
42 Text(this.leftText) 49 Text(this.leftText)
43 .fontSize('35lpx') 50 .fontSize('35lpx')
44 - .fontWeight('400lpx')  
45 - .fontColor($r('app.color.color_333333')) 51 + .fontWeight(400)
  52 + .fontColor(this.leftTextColor)
46 .onClick(() => { 53 .onClick(() => {
47 - this.controller.close()  
48 - this.cancel() 54 + if (this.controller != undefined){
  55 + if(this.cancelIsLeft){
  56 + this.controller.close()
  57 + this.cancel()
  58 + }else{
  59 + this.controller.close()
  60 + this.confirm()
  61 + }
  62 + }
49 }).layoutWeight(1) 63 }).layoutWeight(1)
50 .textAlign(TextAlign.Center) 64 .textAlign(TextAlign.Center)
  65 +
51 Divider() 66 Divider()
52 .width("1lpx") 67 .width("1lpx")
53 .strokeWidth('1lpx') 68 .strokeWidth('1lpx')
@@ -58,17 +73,24 @@ export struct MyCustomDialog { @@ -58,17 +73,24 @@ export struct MyCustomDialog {
58 Text(this.rightText) 73 Text(this.rightText)
59 .fontSize('35lpx') 74 .fontSize('35lpx')
60 .textAlign(TextAlign.Center) 75 .textAlign(TextAlign.Center)
61 - .fontWeight('400lpx')  
62 - .fontColor($r('app.color.color_648DF2')) 76 + .fontWeight(400)
  77 + .fontColor(this.rightTextColor)
63 .onClick(() => { 78 .onClick(() => {
64 if (this.controller != undefined) { 79 if (this.controller != undefined) {
65 - this.controller.close()  
66 - this.confirm() 80 + if(this.cancelIsLeft){
  81 + this.controller.close()
  82 + this.confirm()
  83 + }else{
  84 + this.controller.close()
  85 + this.cancel()
  86 + }
67 } 87 }
68 }).layoutWeight(1) 88 }).layoutWeight(1)
69 } 89 }
70 .alignItems(VerticalAlign.Center) 90 .alignItems(VerticalAlign.Center)
71 .height('96lpx') 91 .height('96lpx')
72 }.borderRadius(10) 92 }.borderRadius(10)
  93 + .width("518lpx")
  94 + .backgroundColor("#FFF")
73 } 95 }
74 } 96 }
@@ -17,13 +17,12 @@ export struct SearchHistoryComponent{ @@ -17,13 +17,12 @@ 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,
24 - offset: { dx: 0, dy: -20 },  
25 - gridCount: 4,  
26 - customStyle: false 25 + customStyle: true
27 }) 26 })
28 27
29 onAccept(){ 28 onAccept(){
@@ -3,7 +3,7 @@ import { SearchRelatedItem } from '../../viewmodel/SearchRelatedItem' @@ -3,7 +3,7 @@ import { SearchRelatedItem } from '../../viewmodel/SearchRelatedItem'
3 const TAG = "SearchRelatedComponent" 3 const TAG = "SearchRelatedComponent"
4 4
5 /** 5 /**
6 - * 热门搜索 6 + * 相关搜索
7 */ 7 */
8 @Component 8 @Component
9 export struct SearchRelatedComponent { 9 export struct SearchRelatedComponent {
@@ -40,11 +40,24 @@ export struct SearchResultComponent { @@ -40,11 +40,24 @@ export struct SearchResultComponent {
40 40
41 SearcherAboutDataModel.getSearchSuggestData(request, getContext(this)).then((value) => { 41 SearcherAboutDataModel.getSearchSuggestData(request, getContext(this)).then((value) => {
42 value.forEach((item) => { 42 value.forEach((item) => {
43 - this.data.push(item) 43 + if(item.appStyle != "13"){
  44 + this.data.push(item)
  45 + }
44 }) 46 })
45 this.data.notifyDataReload() 47 this.data.notifyDataReload()
46 this.suggest_count = this.data.totalCount() 48 this.suggest_count = this.data.totalCount()
47 this.isLoading = false 49 this.isLoading = false
  50 +
  51 + if(this.suggest_count === 0 && value.length > 0){
  52 + this.suggest_count = -1
  53 + if(!this.isLoading){
  54 + this.getSuggestData()
  55 + }
  56 + }else if(this.suggest_count <= 20 && value.length > 0){
  57 + if(!this.isLoading){
  58 + this.getSuggestData()
  59 + }
  60 + }
48 }) 61 })
49 } 62 }
50 63
@@ -110,6 +123,7 @@ export struct SearchResultComponent { @@ -110,6 +123,7 @@ export struct SearchResultComponent {
110 TabContent() { 123 TabContent() {
111 SearchResultContentComponent({ keywords: this.searchText, searchType: item }) 124 SearchResultContentComponent({ keywords: this.searchText, searchType: item })
112 }.tabBar(this.TabBuilder(index, item)) 125 }.tabBar(this.TabBuilder(index, item))
  126 + .layoutWeight(1)
113 }, (item: string, index: number) => index.toString()) 127 }, (item: string, index: number) => index.toString())
114 } 128 }
115 .vertical(false) 129 .vertical(false)
@@ -124,6 +138,7 @@ export struct SearchResultComponent { @@ -124,6 +138,7 @@ export struct SearchResultComponent {
124 .layoutWeight(1) 138 .layoutWeight(1)
125 } 139 }
126 }.width('100%') 140 }.width('100%')
  141 + .layoutWeight(1)
127 .margin({ top: '12lpx' }) 142 .margin({ top: '12lpx' })
128 } 143 }
129 144
@@ -54,6 +54,7 @@ export struct SearchResultContentComponent{ @@ -54,6 +54,7 @@ export struct SearchResultContentComponent{
54 if (!this.data || value.list.length == 0){ 54 if (!this.data || value.list.length == 0){
55 this.hasMore = false 55 this.hasMore = false
56 this.isLoading = false 56 this.isLoading = false
  57 + this.count = this.count===-1?0:this.count
57 }else{ 58 }else{
58 if(value.list[0].dataList!=null){ 59 if(value.list[0].dataList!=null){
59 let data_temp: SearchRmhDescription[] = [] 60 let data_temp: SearchRmhDescription[] = []
@@ -205,8 +206,10 @@ export struct SearchResultContentComponent{ @@ -205,8 +206,10 @@ export struct SearchResultContentComponent{
205 extra:'', 206 extra:'',
206 titleShow:value.data.type == "5"?1:0, 207 titleShow:value.data.type == "5"?1:0,
207 } 208 }
  209 + if(contentDTO.appStyle != "13"){
  210 + this.data.push(contentDTO)
  211 + }
208 212
209 - this.data.push(contentDTO)  
210 }) 213 })
211 this.data.notifyDataReload() 214 this.data.notifyDataReload()
212 this.count = this.data.totalCount() 215 this.count = this.data.totalCount()
@@ -216,6 +219,19 @@ export struct SearchResultContentComponent{ @@ -216,6 +219,19 @@ export struct SearchResultContentComponent{
216 this.hasMore = false 219 this.hasMore = false
217 } 220 }
218 this.isLoading = false 221 this.isLoading = false
  222 +
  223 + if(this.count === 0 && resultData.list.length > 0){
  224 + this.count = -1
  225 + if(!this.isLoading){
  226 + //加载分页数据
  227 + this.getNewSearchResultData()
  228 + }
  229 + }else if(this.count <= 20 && resultData.list.length > 0){
  230 + if(!this.isLoading){
  231 + //加载分页数据
  232 + this.getNewSearchResultData()
  233 + }
  234 + }
219 }).catch((err:Error)=>{ 235 }).catch((err:Error)=>{
220 console.log(TAG,"请求失败") 236 console.log(TAG,"请求失败")
221 this.isLoading = false 237 this.isLoading = false
@@ -297,13 +313,10 @@ export struct SearchResultContentComponent{ @@ -297,13 +313,10 @@ export struct SearchResultContentComponent{
297 } 313 }
298 } 314 }
299 } 315 }
300 - .onClick(()=>{  
301 - //TODO 跳转  
302 - })  
303 }, (item: ContentDTO, index: number) => index.toString()) 316 }, (item: ContentDTO, index: number) => index.toString())
304 317
305 //没有更多数据 显示提示 318 //没有更多数据 显示提示
306 - if(!this.hasMore){ 319 + if(!this.hasMore && this.data.totalCount() > 0){
307 ListItem(){ 320 ListItem(){
308 ListHasNoMoreDataUI() 321 ListHasNoMoreDataUI()
309 } 322 }
@@ -319,11 +332,11 @@ export struct SearchResultContentComponent{ @@ -319,11 +332,11 @@ export struct SearchResultContentComponent{
319 this.getNewSearchResultData() 332 this.getNewSearchResultData()
320 } 333 }
321 }) 334 })
322 - } 335 + }.layoutWeight(1)
323 } 336 }
324 } 337 }
325 .backgroundColor($r('app.color.white')) 338 .backgroundColor($r('app.color.white'))
326 - .height('100%') 339 + .layoutWeight(1)
327 .width('100%') 340 .width('100%')
328 } 341 }
329 } 342 }
@@ -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
@@ -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;