developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
80a23155 2 parents 5cc0986a 6a881eae

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

Inline Side-by-side
Showing 18 changed files with 266 additions and 197 deletions
@@ -40,15 +40,10 @@ export class Logger { @@ -40,15 +40,10 @@ export class Logger {
40 Logger.domain = domain; 40 Logger.domain = domain;
41 } 41 }
42 42
43 - static debug(prefixStr?:string,...args: string[]) { 43 + static debug(...args: string[]) {
44 if (!Logger.isDebug) { 44 if (!Logger.isDebug) {
45 return 45 return
46 } 46 }
47 - if(prefixStr){  
48 - Logger.prefix = prefixStr  
49 - }else {  
50 - Logger.prefix = 'SightApp';  
51 - }  
52 Logger.logContent(LogLevel.DEBUG, ...args) 47 Logger.logContent(LogLevel.DEBUG, ...args)
53 } 48 }
54 49
@@ -90,55 +85,68 @@ export class Logger { @@ -90,55 +85,68 @@ export class Logger {
90 85
91 static logContent(level: LogLevel, ...args: string[]) { 86 static logContent(level: LogLevel, ...args: string[]) {
92 let msg = Logger.getMsg(...args) 87 let msg = Logger.getMsg(...args)
  88 + let tag = Logger.getTag(...args)
93 let length = msg.length 89 let length = msg.length
94 if (length < Logger.CHUNK_SIZE) { 90 if (length < Logger.CHUNK_SIZE) {
95 // 不超限，保持原来的打印 91 // 不超限，保持原来的打印
96 - Logger.print(level, ...args) 92 + Logger.print(tag, level, ...args)
97 } else { 93 } else {
98 // 超限，分段打印 94 // 超限，分段打印
99 for (let i = 0; i < length; i += Logger.CHUNK_SIZE) { 95 for (let i = 0; i < length; i += Logger.CHUNK_SIZE) {
100 let count = Math.min(length - i, Logger.CHUNK_SIZE); 96 let count = Math.min(length - i, Logger.CHUNK_SIZE);
101 - Logger.printExt(level, msg.substring(i, i + count)); 97 + Logger.printExt(tag, level, msg.substring(i, i + count));
102 } 98 }
103 } 99 }
104 } 100 }
105 101
106 - static print(level: LogLevel, ...msg: string[]) { 102 + static print(tag: string, level: LogLevel, ...msg: string[]) {
  103 +
  104 + let prefix = Logger.prefix
  105 + if (tag) {
  106 + prefix = tag
  107 + }
  108 +
107 switch (level) { 109 switch (level) {
108 case LogLevel.DEBUG: 110 case LogLevel.DEBUG:
109 - hilog.debug(Logger.domain, Logger.prefix, Logger.format, msg); 111 + hilog.debug(Logger.domain, prefix, Logger.format, msg);
110 break 112 break
111 case LogLevel.INFO: 113 case LogLevel.INFO:
112 - hilog.info(Logger.domain, Logger.prefix, Logger.format, msg); 114 + hilog.info(Logger.domain, prefix, Logger.format, msg);
113 break 115 break
114 case LogLevel.WARN: 116 case LogLevel.WARN:
115 - hilog.warn(Logger.domain, Logger.prefix, Logger.format, msg); 117 + hilog.warn(Logger.domain, prefix, Logger.format, msg);
116 break 118 break
117 case LogLevel.ERROR: 119 case LogLevel.ERROR:
118 - hilog.error(Logger.domain, Logger.prefix, Logger.format, msg); 120 + hilog.error(Logger.domain, prefix, Logger.format, msg);
119 break 121 break
120 case LogLevel.FATAL: 122 case LogLevel.FATAL:
121 - hilog.fatal(Logger.domain, Logger.prefix, Logger.format, msg); 123 + hilog.fatal(Logger.domain, prefix, Logger.format, msg);
122 break 124 break
123 } 125 }
124 } 126 }
125 127
126 - static printExt(level: LogLevel, msg: string) { 128 + static printExt(tag: string, level: LogLevel, msg: string) {
  129 +
  130 + let prefix = Logger.prefix
  131 + if (tag) {
  132 + prefix = tag
  133 + }
  134 +
127 switch (level) { 135 switch (level) {
128 case LogLevel.DEBUG: 136 case LogLevel.DEBUG:
129 - hilog.debug(Logger.domain, Logger.prefix, Logger.format_ext, msg); 137 + hilog.debug(Logger.domain, prefix, Logger.format_ext, msg);
130 break 138 break
131 case LogLevel.INFO: 139 case LogLevel.INFO:
132 - hilog.info(Logger.domain, Logger.prefix, Logger.format_ext, msg); 140 + hilog.info(Logger.domain, prefix, Logger.format_ext, msg);
133 break 141 break
134 case LogLevel.WARN: 142 case LogLevel.WARN:
135 - hilog.warn(Logger.domain, Logger.prefix, Logger.format_ext, msg); 143 + hilog.warn(Logger.domain, prefix, Logger.format_ext, msg);
136 break 144 break
137 case LogLevel.ERROR: 145 case LogLevel.ERROR:
138 - hilog.error(Logger.domain, Logger.prefix, Logger.format_ext, msg); 146 + hilog.error(Logger.domain, prefix, Logger.format_ext, msg);
139 break 147 break
140 case LogLevel.FATAL: 148 case LogLevel.FATAL:
141 - hilog.fatal(Logger.domain, Logger.prefix, Logger.format_ext, msg); 149 + hilog.fatal(Logger.domain, prefix, Logger.format_ext, msg);
142 break 150 break
143 } 151 }
144 } 152 }
@@ -153,6 +161,20 @@ export class Logger { @@ -153,6 +161,20 @@ export class Logger {
153 }) 161 })
154 return msg.substring(2, msg.length); 162 return msg.substring(2, msg.length);
155 } 163 }
  164 +
  165 + static getTag(...args: string[]): string {
  166 + if (args == null || args.length <= 0) {
  167 + return '';
  168 + }
  169 +
  170 + if (args.length > 1) {
  171 +
  172 + return args[0]
  173 + } else {
  174 + return ''
  175 + }
  176 +
  177 + }
156 } 178 }
157 179
158 // export default new Logger('SightApp', 0xFF00) 180 // export default new Logger('SightApp', 0xFF00)
@@ -55,7 +55,7 @@ export struct Card14Component { @@ -55,7 +55,7 @@ export struct Card14Component {
55 ) 55 )
56 } 56 }
57 // 左标题，右图 57 // 左标题，右图
58 - Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.SpaceBetween }) { 58 + Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Start }) {
59 59
60 Text() { 60 Text() {
61 if (this.titleMarked) { 61 if (this.titleMarked) {
@@ -77,16 +77,14 @@ export struct Card14Component { @@ -77,16 +77,14 @@ export struct Card14Component {
77 .lineHeight(25) 77 .lineHeight(25)
78 .fontFamily('PingFang SC-Regular') 78 .fontFamily('PingFang SC-Regular')
79 .textAlign(TextAlign.Start) 79 .textAlign(TextAlign.Start)
80 - // .flexBasis('auto')  
81 .margin({right: 12}) 80 .margin({right: 12})
82 - .flexBasis(214) 81 + .width('64%')
83 82
84 Image(this.loadImg ? this.contentDTO.coverUrl : '') 83 Image(this.loadImg ? this.contentDTO.coverUrl : '')
85 .backgroundColor(0xf5f5f5) 84 .backgroundColor(0xf5f5f5)
86 - .flexBasis(117) 85 + .aspectRatio(3 / 2)
87 .height(78) 86 .height(78)
88 .borderRadius($r('app.float.image_border_radius')) 87 .borderRadius($r('app.float.image_border_radius'))
89 - // .flexBasis(160)  
90 .backgroundImageSize(ImageSize.Auto) 88 .backgroundImageSize(ImageSize.Auto)
91 89
92 } 90 }
@@ -161,7 +161,7 @@ export struct ZhSingleColumn09 { @@ -161,7 +161,7 @@ export struct ZhSingleColumn09 {
161 .height(90) 161 .height(90)
162 .columnsTemplate('1fr 1fr 1fr 1fr') 162 .columnsTemplate('1fr 1fr 1fr 1fr')
163 .rowsTemplate('1fr 1fr') 163 .rowsTemplate('1fr 1fr')
164 - .margin({bottom: 10}) 164 + .margin({bottom: 5})
165 165
166 Row() { 166 Row() {
167 Row() { 167 Row() {
@@ -188,7 +188,7 @@ export struct ZhSingleColumn09 { @@ -188,7 +188,7 @@ export struct ZhSingleColumn09 {
188 this.selfClosed = true; 188 this.selfClosed = true;
189 }) 189 })
190 } 190 }
191 - .height(40) 191 + .height(20)
192 .width('100%') 192 .width('100%')
193 .borderRadius(3) 193 .borderRadius(3)
194 .justifyContent(FlexAlign.SpaceBetween) 194 .justifyContent(FlexAlign.SpaceBetween)
@@ -5,7 +5,7 @@ export struct PeopleShipHomeAttentionComponent { @@ -5,7 +5,7 @@ export struct PeopleShipHomeAttentionComponent {
5 @Consume isAttention: string 5 @Consume isAttention: string
6 @Consume isLoadingAttention: boolean 6 @Consume isLoadingAttention: boolean
7 build() { 7 build() {
8 - Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { 8 + Flex({ alignItems: ItemAlign.Start, justifyContent: FlexAlign.Start }) {
9 Button({type: ButtonType.Normal, stateEffect: false } ) { 9 Button({type: ButtonType.Normal, stateEffect: false } ) {
10 Stack() { 10 Stack() {
11 Row() 11 Row()
@@ -117,7 +117,6 @@ export struct PeopleShipHomeAttentionComponent { @@ -117,7 +117,6 @@ export struct PeopleShipHomeAttentionComponent {
117 ToastUtils.showToast('分享为公共方法，待开发', 1000); 117 ToastUtils.showToast('分享为公共方法，待开发', 1000);
118 }) 118 })
119 .visibility(Visibility.Hidden) 119 .visibility(Visibility.Hidden)
120 -  
121 } 120 }
122 121
123 } 122 }
@@ -253,7 +253,7 @@ export struct PeopleShipHomePageTopComponent { @@ -253,7 +253,7 @@ export struct PeopleShipHomePageTopComponent {
253 253
254 // 分享-关注 254 // 分享-关注
255 PeopleShipHomeAttentionComponent() 255 PeopleShipHomeAttentionComponent()
256 - .width('100%') 256 + .width(`calc(100% - ${32 + 'vp'})`)
257 .margin({ 257 .margin({
258 top: '10vp', 258 top: '10vp',
259 bottom: '16vp' 259 bottom: '16vp'
@@ -85,8 +85,8 @@ export default struct CustomLayout { @@ -85,8 +85,8 @@ export default struct CustomLayout {
85 name: this.animateName, 85 name: this.animateName,
86 path: "lottie/refresh_step1.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径 86 path: "lottie/refresh_step1.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径
87 }) 87 })
88 - }  
89 this.animateItem.goToAndStop(1) 88 this.animateItem.goToAndStop(1)
  89 + }
90 let total = CustomLayout.REFRESH_HEIGHT 90 let total = CustomLayout.REFRESH_HEIGHT
91 let progress = offset * 100 / total 91 let progress = offset * 100 / total
92 this.animateItem?.goToAndStop(this.getFramesByProgress(progress), true); 92 this.animateItem?.goToAndStop(this.getFramesByProgress(progress), true);
@@ -103,9 +103,6 @@ export default struct CustomLayout { @@ -103,9 +103,6 @@ export default struct CustomLayout {
103 path: "lottie/refresh_step2.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径 103 path: "lottie/refresh_step2.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径
104 }) 104 })
105 } 105 }
106 - // this.animateItem2.isLoaded  
107 - // TODO 是否拦截重复触发  
108 - this.animateItem2.goToAndPlay(1)  
109 } 106 }
110 107
111 getFramesByProgress(progress: number): number { 108 getFramesByProgress(progress: number): number {
@@ -18,14 +18,18 @@ export struct CustomPullToRefresh { @@ -18,14 +18,18 @@ export struct CustomPullToRefresh {
18 .setAnimDuration(500); 18 .setAnimDuration(500);
19 private refreshSettings: RenderingContextSettings = new RenderingContextSettings(true) 19 private refreshSettings: RenderingContextSettings = new RenderingContextSettings(true)
20 private refreshContext: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.refreshSettings) 20 private refreshContext: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.refreshSettings)
  21 + private refreshingSettings: RenderingContextSettings = new RenderingContextSettings(true)
  22 + private refreshingContext: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.refreshingSettings)
21 private loadMoreSettings: RenderingContextSettings = new RenderingContextSettings(true) 23 private loadMoreSettings: RenderingContextSettings = new RenderingContextSettings(true)
22 private loadMoreContext: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.loadMoreSettings) 24 private loadMoreContext: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.loadMoreSettings)
23 private refreshAnimation: AnimationItem | null = null; 25 private refreshAnimation: AnimationItem | null = null;
  26 + private refreshingAnimation: AnimationItem | null = null;
24 private loadMoreAnimation: AnimationItem | null = null; 27 private loadMoreAnimation: AnimationItem | null = null;
25 private refreshAnimName: string = "refresh"; 28 private refreshAnimName: string = "refresh";
26 private refreshingAnimName: string = "refreshing"; 29 private refreshingAnimName: string = "refreshing";
27 private loadMoreAnimName: string = "loadMore"; 30 private loadMoreAnimName: string = "loadMore";
28 private refreshAnimationDestroy = true 31 private refreshAnimationDestroy = true
  32 + private refreshingAnimationDestroy = true
29 // refresh-1,refreshing-2,refreshed-3,idle-4 33 // refresh-1,refreshing-2,refreshed-3,idle-4
30 @State @Watch('stateChange') private refreshState: number = 4; 34 @State @Watch('stateChange') private refreshState: number = 4;
31 35
@@ -120,9 +124,23 @@ export struct CustomPullToRefresh { @@ -120,9 +124,23 @@ export struct CustomPullToRefresh {
120 }) 124 })
121 .onDisAppear(() => { 125 .onDisAppear(() => {
122 lottie.destroy(this.refreshAnimName); 126 lottie.destroy(this.refreshAnimName);
  127 + })
  128 + .visibility(this.refreshState == 1 ? Visibility.Visible : Visibility.Hidden)
  129 +
  130 + Canvas(this.refreshingContext)
  131 + .width(60)
  132 + .height(60)
  133 + .backgroundColor(Color.Transparent)
  134 + .onReady(() => {
  135 + // 可在此生命回调周期中加载动画，可以保证动画尺寸正确
  136 + //抗锯齿的设置
  137 + this.refreshContext.imageSmoothingEnabled = true;
  138 + this.refreshContext.imageSmoothingQuality = 'medium'
  139 + })
  140 + .onDisAppear(() => {
123 lottie.destroy(this.refreshingAnimName); 141 lottie.destroy(this.refreshingAnimName);
124 }) 142 })
125 - .visibility((this.refreshState == 1 || this.refreshState == 2) ? Visibility.Visible : Visibility.Hidden) 143 + .visibility(this.refreshState == 2 ? Visibility.Visible : Visibility.Hidden)
126 144
127 Text('已更新至最新') 145 Text('已更新至最新')
128 .fontSize(14) 146 .fontSize(14)
@@ -175,10 +193,7 @@ export struct CustomPullToRefresh { @@ -175,10 +193,7 @@ export struct CustomPullToRefresh {
175 } 193 }
176 194
177 private refreshAnim(percent: number) { 195 private refreshAnim(percent: number) {
178 - if (this.refreshAnimation == null || this.refreshAnimation.name != this.refreshAnimName ||  
179 - this.refreshAnimationDestroy) {  
180 - this.refreshAnimation?.destroy(this.refreshAnimName)  
181 - this.refreshAnimation?.destroy(this.refreshingAnimName) 196 + if (this.refreshAnimation == null || this.refreshAnimationDestroy) {
182 this.refreshAnimation = lottie.loadAnimation({ 197 this.refreshAnimation = lottie.loadAnimation({
183 container: this.refreshContext, 198 container: this.refreshContext,
184 renderer: 'canvas', // canvas 渲染模式 199 renderer: 'canvas', // canvas 渲染模式
@@ -212,21 +227,19 @@ export struct CustomPullToRefresh { @@ -212,21 +227,19 @@ export struct CustomPullToRefresh {
212 } 227 }
213 228
214 private refreshingAnim() { 229 private refreshingAnim() {
215 - // Logger.error('zzzz', 'animate2, 1')  
216 // 先销毁之前的动画 230 // 先销毁之前的动画
217 - if (this.refreshAnimation == null || this.refreshAnimation.name != this.refreshingAnimName ||  
218 - this.refreshAnimationDestroy) {  
219 - this.refreshAnimation?.destroy(this.refreshAnimName)  
220 - this.refreshAnimation?.destroy(this.refreshingAnimName)  
221 - this.refreshAnimation = lottie.loadAnimation({  
222 - container: this.refreshContext, 231 + if (this.refreshingAnimation == null || this.refreshingAnimationDestroy) {
  232 + this.refreshingAnimation?.destroy(this.refreshingAnimName)
  233 + this.refreshingAnimation = lottie.loadAnimation({
  234 + container: this.refreshingContext,
223 renderer: 'canvas', // canvas 渲染模式 235 renderer: 'canvas', // canvas 渲染模式
224 loop: 10, 236 loop: 10,
225 autoplay: true, 237 autoplay: true,
226 name: this.refreshingAnimName, 238 name: this.refreshingAnimName,
227 path: "lottie/refresh_step2.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径 239 path: "lottie/refresh_step2.json", // 路径加载动画只支持entry/src/main/ets 文件夹下的相对路径
228 }) 240 })
229 - this.addRefreshAnimListener() 241 + this.refreshingAnimationDestroy = false
  242 + this.addRefreshingAnimListener()
230 } 243 }
231 // Logger.error('zzzz', 'animate2, 2') 244 // Logger.error('zzzz', 'animate2, 2')
232 } 245 }
@@ -242,6 +255,13 @@ export struct CustomPullToRefresh { @@ -242,6 +255,13 @@ export struct CustomPullToRefresh {
242 }); 255 });
243 } 256 }
244 257
  258 + private addRefreshingAnimListener() {
  259 + this.refreshingAnimation?.addEventListener('destroy', (args: Object): void => {
  260 + // Logger.error('zzzz', "lottie destroy");
  261 + this.refreshingAnimationDestroy = true
  262 + });
  263 + }
  264 +
245 loadMoreAnimate() { 265 loadMoreAnimate() {
246 if (this.loadMoreAnimation == null) { 266 if (this.loadMoreAnimation == null) {
247 this.loadMoreAnimation = lottie.loadAnimation({ 267 this.loadMoreAnimation = lottie.loadAnimation({
@@ -66,31 +66,31 @@ export struct SearchComponent { @@ -66,31 +66,31 @@ export struct SearchComponent {
66 this.breakpointSystem.unregister(); 66 this.breakpointSystem.unregister();
67 } 67 }
68 68
69 - getRelatedSearchContent() {  
70 - if (StringUtils.isNotEmpty(this.searchText)) {  
71 - SearcherAboutDataModel.getRelatedSearchContentData(encodeURI(this.searchText), getContext(this)).then((value) => { 69 + getRelatedSearchContent(searchText: string) {
  70 + if (StringUtils.isNotEmpty(searchText)) {
  71 + SearcherAboutDataModel.getRelatedSearchContentData(encodeURI(searchText), getContext(this)).then((value) => {
72 if (value != null && value.length > 0) { 72 if (value != null && value.length > 0) {
73 this.relatedSearchContentsData = [] 73 this.relatedSearchContentsData = []
74 value.forEach(item => { 74 value.forEach(item => {
75 let tempValue: string = item 75 let tempValue: string = item
76 let tempArr: string[] = [] 76 let tempArr: string[] = []
77 - if (tempValue.indexOf(this.searchText) === -1) { 77 + if (tempValue.indexOf(searchText) === -1) {
78 tempArr.push(item) 78 tempArr.push(item)
79 this.relatedSearchContentsData.push(new SearchRelatedItem(item, tempArr)) 79 this.relatedSearchContentsData.push(new SearchRelatedItem(item, tempArr))
80 } else { 80 } else {
81 - while (tempValue.indexOf(this.searchText) != -1) {  
82 - let index = tempValue.indexOf(this.searchText) 81 + while (tempValue.indexOf(searchText) != -1) {
  82 + let index = tempValue.indexOf(searchText)
83 if (index === 0) { 83 if (index === 0) {
84 try { 84 try {
85 - tempArr.push(this.searchText)  
86 - tempValue = tempValue.substring(this.searchText.length, tempValue.length) 85 + tempArr.push(searchText)
  86 + tempValue = tempValue.substring(searchText.length, tempValue.length)
87 } catch (e) { 87 } catch (e) {
88 } 88 }
89 } else { 89 } else {
90 try { 90 try {
91 tempArr.push(tempValue.substring(0, index)) 91 tempArr.push(tempValue.substring(0, index))
92 - tempArr.push(this.searchText)  
93 - tempValue = tempValue.substring(index + this.searchText.length, tempValue.length) 92 + tempArr.push(searchText)
  93 + tempValue = tempValue.substring(index + searchText.length, tempValue.length)
94 } catch (e) { 94 } catch (e) {
95 } 95 }
96 } 96 }
@@ -356,7 +356,7 @@ export struct SearchComponent { @@ -356,7 +356,7 @@ export struct SearchComponent {
356 this.resetSearch() 356 this.resetSearch()
357 } else { 357 } else {
358 if (this.hasInputContent) { 358 if (this.hasInputContent) {
359 - this.getRelatedSearchContent() 359 + this.getRelatedSearchContent(value)
360 } 360 }
361 } 361 }
362 }) 362 })
@@ -142,7 +142,7 @@ export struct SearchResultComponent { @@ -142,7 +142,7 @@ export struct SearchResultComponent {
142 SearchResultContentComponent({ keywords: this.searchText, searchType: item ,sameSearch:this.sameSearch,isCurrentShow:this.currentIndex === index}) 142 SearchResultContentComponent({ keywords: this.searchText, searchType: item ,sameSearch:this.sameSearch,isCurrentShow:this.currentIndex === index})
143 }.tabBar(this.TabBuilder(index, item)) 143 }.tabBar(this.TabBuilder(index, item))
144 .layoutWeight(1) 144 .layoutWeight(1)
145 - }, (item: string, index: number) => index.toString()) 145 + }, (item: string) => item)
146 } 146 }
147 .vertical(false) 147 .vertical(false)
148 .barMode(BarMode.Fixed) 148 .barMode(BarMode.Fixed)
@@ -19,8 +19,7 @@ import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem' @@ -19,8 +19,7 @@ import { FollowListDetailItem } from '../../viewmodel/FollowListDetailItem'
19 import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusRequestItem' 19 import { FollowListStatusRequestItem } from '../../viewmodel/FollowListStatusRequestItem'
20 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem' 20 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
21 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData' 21 import { SearchResultContentData } from '../../viewmodel/SearchResultContentData'
22 -import {  
23 - SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem' 22 +import { SearchResultContentItem, SearchRmhDescription } from '../../viewmodel/SearchResultContentItem'
24 import { CardParser } from '../CardParser' 23 import { CardParser } from '../CardParser'
25 import { FollowChildComponent } from '../mine/follow/FollowChildComponent' 24 import { FollowChildComponent } from '../mine/follow/FollowChildComponent'
26 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI' 25 import { ListHasNoMoreDataUI } from '../reusable/ListHasNoMoreDataUI'
@@ -38,7 +37,7 @@ export struct SearchResultContentComponent { @@ -38,7 +37,7 @@ export struct SearchResultContentComponent {
38 @State keywords: string = "" 37 @State keywords: string = ""
39 @State searchType: string = "" 38 @State searchType: string = ""
40 @State data: LazyDataSource<ContentDTO> = new LazyDataSource(); 39 @State data: LazyDataSource<ContentDTO> = new LazyDataSource();
41 - tempList : ContentDTO[] = [] 40 + tempList: ContentDTO[] = []
42 @State data_rmh: SearchRmhDescription[] = [] 41 @State data_rmh: SearchRmhDescription[] = []
43 @State count: number = -1; 42 @State count: number = -1;
44 @State isLoading: boolean = false 43 @State isLoading: boolean = false
@@ -48,14 +47,14 @@ export struct SearchResultContentComponent { @@ -48,14 +47,14 @@ export struct SearchResultContentComponent {
48 scroller: Scroller = new Scroller() 47 scroller: Scroller = new Scroller()
49 private scroller2: Scroller = new Scroller() 48 private scroller2: Scroller = new Scroller()
50 @State ellipseW: number = 0 49 @State ellipseW: number = 0
51 - @State moreWidth:number = 20 50 + @State moreWidth: number = 20
52 @State listLeft: number = 0 51 @State listLeft: number = 0
53 @State isEnd: boolean = false 52 @State isEnd: boolean = false
54 - @Watch('updateData') @Prop sameSearch:number = 0  
55 - @Prop isCurrentShow:boolean = false; 53 + @Watch('updateData') @Prop sameSearch: number = 0
  54 + @Prop isCurrentShow: boolean = false;
56 55
57 - updateData(){  
58 - if(this.isCurrentShow){ 56 + updateData() {
  57 + if (this.isCurrentShow) {
59 this.data_rmh = [] 58 this.data_rmh = []
60 59
61 this.data.clearAllData() 60 this.data.clearAllData()
@@ -115,7 +114,7 @@ export struct SearchResultContentComponent { @@ -115,7 +114,7 @@ export struct SearchResultContentComponent {
115 data.headerPhotoUrl = item.headPhotoUrl.split("?")[0] 114 data.headerPhotoUrl = item.headPhotoUrl.split("?")[0]
116 data.mainControl = item.mainControl + "" 115 data.mainControl = item.mainControl + ""
117 116
118 - if(data_temp.length === 1){ 117 + if (data_temp.length === 1) {
119 this.bean.headPhotoUrl = item.headPhotoUrl.split("?")[0] 118 this.bean.headPhotoUrl = item.headPhotoUrl.split("?")[0]
120 this.bean.cnUserName = item.userName 119 this.bean.cnUserName = item.userName
121 this.bean.creatorId = item.creatorId 120 this.bean.creatorId = item.creatorId
@@ -133,8 +132,8 @@ export struct SearchResultContentComponent { @@ -133,8 +132,8 @@ export struct SearchResultContentComponent {
133 } else { 132 } else {
134 this.bean.cnFansNum = item.fansNum + "" 133 this.bean.cnFansNum = item.fansNum + ""
135 } 134 }
136 - let regex:RegExp = new RegExp('\n','g')  
137 - this.bean.introduction = item.introduction.replace(regex,'') 135 + let regex: RegExp = new RegExp('\n', 'g')
  136 + this.bean.introduction = item.introduction.replace(regex, '')
138 137
139 this.bean.mainControl = item.mainControl 138 this.bean.mainControl = item.mainControl
140 this.bean.banControl = item.banControl 139 this.bean.banControl = item.banControl
@@ -148,9 +147,13 @@ export struct SearchResultContentComponent { @@ -148,9 +147,13 @@ export struct SearchResultContentComponent {
148 data_temp.forEach((data) => { 147 data_temp.forEach((data) => {
149 this.data_rmh.push(data) 148 this.data_rmh.push(data)
150 }) 149 })
  150 +
  151 + if(this.data_rmh.length > 0){
  152 + this.count = 1
  153 + }
151 //只有一条创作者，获取 创作者信息 154 //只有一条创作者，获取 创作者信息
152 if (this.data_rmh.length === 1) { 155 if (this.data_rmh.length === 1) {
153 - if(StringUtils.isNotEmpty(UserDataLocal.getUserId())){ 156 + if (StringUtils.isNotEmpty(UserDataLocal.getUserId())) {
154 //查询是否被关注 157 //查询是否被关注
155 let status = new FollowListStatusRequestItem() 158 let status = new FollowListStatusRequestItem()
156 status.creatorIds.push(new QueryListIsFollowedItem(this.data_rmh[0].creatorId)) 159 status.creatorIds.push(new QueryListIsFollowedItem(this.data_rmh[0].creatorId))
@@ -159,7 +162,7 @@ export struct SearchResultContentComponent { @@ -159,7 +162,7 @@ export struct SearchResultContentComponent {
159 }).catch((err: Error) => { 162 }).catch((err: Error) => {
160 console.log(TAG, "请求失败") 163 console.log(TAG, "请求失败")
161 }) 164 })
162 - }else{ 165 + } else {
163 this.bean.status = "" 166 this.bean.status = ""
164 } 167 }
165 } 168 }
@@ -192,6 +195,8 @@ export struct SearchResultContentComponent { @@ -192,6 +195,8 @@ export struct SearchResultContentComponent {
192 }) 195 })
193 }) 196 })
194 197
  198 + if (data.contentList.length > 0) {
  199 +
195 SearcherAboutDataModel.getInteractListData(data, getContext(this)).then((newValue) => { 200 SearcherAboutDataModel.getInteractListData(data, getContext(this)).then((newValue) => {
196 newValue.forEach((item) => { 201 newValue.forEach((item) => {
197 resultData.list.forEach((data) => { 202 resultData.list.forEach((data) => {
@@ -206,32 +211,32 @@ export struct SearchResultContentComponent { @@ -206,32 +211,32 @@ export struct SearchResultContentComponent {
206 }) 211 })
207 // 批量号主信息 212 // 批量号主信息
208 let creatorIdList: string[] = [] 213 let creatorIdList: string[] = []
209 - resultData.list.forEach((value:SearchResultContentItem) => { 214 + resultData.list.forEach((value: SearchResultContentItem) => {
210 creatorIdList.push(value.data.creatorId) 215 creatorIdList.push(value.data.creatorId)
211 }) 216 })
212 - SearcherAboutDataModel.getCreatorDetailListData({creatorIdList:creatorIdList}).then((rem) => { 217 + SearcherAboutDataModel.getCreatorDetailListData({ creatorIdList: creatorIdList }).then((rem) => {
213 resultData.list.forEach((value: SearchResultContentItem) => { 218 resultData.list.forEach((value: SearchResultContentItem) => {
214 const landscape = value.data.landscape 219 const landscape = value.data.landscape
215 let photos: FullColumnImgUrlDTO[] = [] 220 let photos: FullColumnImgUrlDTO[] = []
216 // if (value.data.appStyle === 4) { 221 // if (value.data.appStyle === 4) {
217 value.data.appStyleImages.split("&&").forEach((value) => { 222 value.data.appStyleImages.split("&&").forEach((value) => {
218 let resizeParams = MinePageDatasModel.extractResizeParams(value) 223 let resizeParams = MinePageDatasModel.extractResizeParams(value)
219 - if(resizeParams && resizeParams.length === 2){ 224 + if (resizeParams && resizeParams.length === 2) {
220 photos.push( 225 photos.push(
221 { 226 {
222 fullUrl: value, 227 fullUrl: value,
223 - weight:resizeParams[0],  
224 - height:resizeParams[1], 228 + weight: resizeParams[0],
  229 + height: resizeParams[1],
225 landscape: Number(landscape), 230 landscape: Number(landscape),
226 } as FullColumnImgUrlDTO 231 } as FullColumnImgUrlDTO
227 ) 232 )
228 } 233 }
229 }) 234 })
230 // } 235 // }
231 - let contentDTO = this.dataTransform(rem,value, photos);  
232 - if(value.data.type != "13"){ 236 + let contentDTO = this.dataTransform(rem, value, photos);
  237 + if (value.data.type != "13") {
233 this.data.push(contentDTO) 238 this.data.push(contentDTO)
234 - if(value.data.sameContentList != null && value.data.sameContentList.length > 0) { 239 + if (value.data.sameContentList != null && value.data.sameContentList.length > 0) {
235 let contentDTO2 = new ContentDTO(); 240 let contentDTO2 = new ContentDTO();
236 contentDTO2.sameContentListJson = JSON.stringify(value.data.sameContentList) 241 contentDTO2.sameContentListJson = JSON.stringify(value.data.sameContentList)
237 contentDTO2.sameContentListSize = value.data.sameContentList.length 242 contentDTO2.sameContentListSize = value.data.sameContentList.length
@@ -257,6 +262,9 @@ export struct SearchResultContentComponent { @@ -257,6 +262,9 @@ export struct SearchResultContentComponent {
257 this.isLoading = false 262 this.isLoading = false
258 this.count = this.count === -1 ? 0 : this.count 263 this.count = this.count === -1 ? 0 : this.count
259 }) 264 })
  265 + }else {
  266 + this.hasMore = false
  267 + }
260 } 268 }
261 269
262 build() { 270 build() {
@@ -264,15 +272,15 @@ export struct SearchResultContentComponent { @@ -264,15 +272,15 @@ export struct SearchResultContentComponent {
264 if (this.count == 0) { 272 if (this.count == 0) {
265 ListHasNoMoreDataUI({ style: 2 }) 273 ListHasNoMoreDataUI({ style: 2 })
266 } else { 274 } else {
267 - List({scroller:this.scroller2}) {  
268 - if (this.data_rmh != null && this.data_rmh.length > 0){  
269 - if (this.data_rmh.length === 1){  
270 - ListItem(){ 275 + List({ scroller: this.scroller2 }) {
  276 + if (this.data_rmh != null && this.data_rmh.length > 0) {
  277 + if (this.data_rmh.length === 1) {
  278 + ListItem() {
271 FollowChildComponent({ data: this.bean, type: 1 }) 279 FollowChildComponent({ data: this.bean, type: 1 })
272 - }.padding({left:"31lpx",right:"31lpx"})  
273 - }else{  
274 - ListItem(){  
275 - Column(){ 280 + }.padding({ left: "31lpx", right: "31lpx" })
  281 + } else {
  282 + ListItem() {
  283 + Column() {
276 this.SearchListUI() 284 this.SearchListUI()
277 } 285 }
278 } 286 }
@@ -283,21 +291,26 @@ export struct SearchResultContentComponent { @@ -283,21 +291,26 @@ export struct SearchResultContentComponent {
283 Column() { 291 Column() {
284 if (this.searchType == "activity") { 292 if (this.searchType == "activity") {
285 ActivityItemComponent({ contentDTO: item }) 293 ActivityItemComponent({ contentDTO: item })
286 - }else if(item.sameContentListSize > 0){ 294 + } else if (item.sameContentListSize > 0) {
287 MoreComponent({ contentDTO: item }) 295 MoreComponent({ contentDTO: item })
288 - }else if(item.appStyle == "9"){  
289 - Column(){  
290 - Card9Component({ compDTO: new CompDTO, contentDTO:item, pageId: "", pageName: "" }) 296 + } else if (item.appStyle == "9") {
  297 + Column() {
  298 + Card9Component({
  299 + compDTO: new CompDTO,
  300 + contentDTO: item,
  301 + pageId: "",
  302 + pageName: ""
  303 + })
291 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) 304 Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 })
292 } 305 }
293 } else { 306 } else {
294 - if(this.data?.get(index + 1)?.sameContentListSize > 0) { 307 + if (this.data?.get(index + 1)?.sameContentListSize > 0) {
295 Divider() 308 Divider()
296 .width('100%') 309 .width('100%')
297 .color($r('app.color.color_F5F5F5')) 310 .color($r('app.color.color_F5F5F5'))
298 .strokeWidth(4) 311 .strokeWidth(4)
299 } 312 }
300 - CardParser({compDTO:new CompDTO, contentDTO: item }) 313 + CardParser({ compDTO: new CompDTO, contentDTO: item })
301 } 314 }
302 if (index != this.data.totalCount() - 1) { 315 if (index != this.data.totalCount() - 1) {
303 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 316 Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 })
@@ -312,7 +325,7 @@ export struct SearchResultContentComponent { @@ -312,7 +325,7 @@ export struct SearchResultContentComponent {
312 }, (item: ContentDTO, index: number) => index.toString()) 325 }, (item: ContentDTO, index: number) => index.toString())
313 326
314 //没有更多数据 显示提示 327 //没有更多数据 显示提示
315 - if (!this.hasMore && this.data.totalCount() > 0) { 328 + if (!this.hasMore && (this.data.totalCount() > 0|| (this.data_rmh != null && this.data_rmh.length > 0))) {
316 ListItem() { 329 ListItem() {
317 ListHasNoMoreDataUI() 330 ListHasNoMoreDataUI()
318 } 331 }
@@ -320,6 +333,7 @@ export struct SearchResultContentComponent { @@ -320,6 +333,7 @@ export struct SearchResultContentComponent {
320 }.cachedCount(5) 333 }.cachedCount(5)
321 .edgeEffect(EdgeEffect.None) 334 .edgeEffect(EdgeEffect.None)
322 .scrollBar(BarState.Off) 335 .scrollBar(BarState.Off)
  336 + .height('100%')
323 .onReachEnd(() => { 337 .onReachEnd(() => {
324 console.log(TAG, "触底了"); 338 console.log(TAG, "触底了");
325 if (!this.isLoading) { 339 if (!this.isLoading) {
@@ -334,23 +348,23 @@ export struct SearchResultContentComponent { @@ -334,23 +348,23 @@ export struct SearchResultContentComponent {
334 348
335 @Builder 349 @Builder
336 SearchListUI() { 350 SearchListUI() {
337 - List({initialIndex: 0,space:'8lpx',scroller: this.scroller}) {  
338 - ListItemGroup(){ 351 + List({ initialIndex: 0, space: '8lpx', scroller: this.scroller }) {
  352 + ListItemGroup() {
339 ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => { 353 ForEach(this.data_rmh, (item: SearchRmhDescription, index: number) => {
340 ListItem() { 354 ListItem() {
341 - SearchCreatorComponent({item:item}) 355 + SearchCreatorComponent({ item: item })
342 } 356 }
343 .width('150lpx') 357 .width('150lpx')
344 .height('100%') 358 .height('100%')
345 }) 359 })
346 }.offset({ left: this.listLeft }) 360 }.offset({ left: this.listLeft })
347 361
348 - ListItem(){  
349 - if (this.data_rmh.length === 10){ 362 + ListItem() {
  363 + if (this.data_rmh.length === 10) {
350 this.itemEnd() 364 this.itemEnd()
351 } 365 }
352 }.height('100%') 366 }.height('100%')
353 - .margin({left:'23lpx'}) 367 + .margin({ left: '23lpx' })
354 } 368 }
355 .edgeEffect(EdgeEffect.None) 369 .edgeEffect(EdgeEffect.None)
356 .scrollBar(BarState.Off) 370 .scrollBar(BarState.Off)
@@ -359,10 +373,10 @@ export struct SearchResultContentComponent { @@ -359,10 +373,10 @@ export struct SearchResultContentComponent {
359 .height('219lpx') 373 .height('219lpx')
360 .onReachEnd(() => { 374 .onReachEnd(() => {
361 this.isEnd = true 375 this.isEnd = true
362 - console.log(TAG,'is end') 376 + console.log(TAG, 'is end')
363 }) 377 })
364 .onScrollFrameBegin((offset: number, state: ScrollState) => { 378 .onScrollFrameBegin((offset: number, state: ScrollState) => {
365 - console.log(TAG,'offset', offset) 379 + console.log(TAG, 'offset', offset)
366 if (!this.scroller.isAtEnd()) { 380 if (!this.scroller.isAtEnd()) {
367 this.isEnd = false 381 this.isEnd = false
368 } 382 }
@@ -374,31 +388,35 @@ export struct SearchResultContentComponent { @@ -374,31 +388,35 @@ export struct SearchResultContentComponent {
374 .parallelGesture( 388 .parallelGesture(
375 PanGesture({ direction: PanDirection.Horizontal, distance: 1 }) 389 PanGesture({ direction: PanDirection.Horizontal, distance: 1 })
376 .onActionStart((event: GestureEvent) => { 390 .onActionStart((event: GestureEvent) => {
377 - console.info(TAG,'Pan start') 391 + console.info(TAG, 'Pan start')
378 }) 392 })
379 .onActionUpdate((event: GestureEvent) => { 393 .onActionUpdate((event: GestureEvent) => {
380 ///小于10个不展示滑动 394 ///小于10个不展示滑动
381 - if (this.data_rmh.length < 10) return; 395 + if (this.data_rmh.length < 10) {
  396 + return;
  397 + }
382 if (event && this.isEnd) { 398 if (event && this.isEnd) {
383 // console.log('event.offsetX',event.offsetX) 399 // console.log('event.offsetX',event.offsetX)
384 this.listLeft = event.offsetX < -60 ? -60 : event.offsetX > 0 ? 0 : event.offsetX 400 this.listLeft = event.offsetX < -60 ? -60 : event.offsetX > 0 ? 0 : event.offsetX
385 this.ellipseW = (-this.listLeft) / 1.5 401 this.ellipseW = (-this.listLeft) / 1.5
386 402
387 - console.log(TAG,"this.ellipseW==>" + this.ellipseW) 403 + console.log(TAG, "this.ellipseW==>" + this.ellipseW)
388 } 404 }
389 }) 405 })
390 .onActionEnd((event: GestureEvent) => { 406 .onActionEnd((event: GestureEvent) => {
391 - if (this.data_rmh.length < 10) return;  
392 - console.info(TAG,'Pan end') 407 + if (this.data_rmh.length < 10) {
  408 + return;
  409 + }
  410 + console.info(TAG, 'Pan end')
393 this.listLeft = 0 411 this.listLeft = 0
394 // this.moreWidth = 20 412 // this.moreWidth = 20
395 413
396 - if (event.offsetX < 0 && this.ellipseW >=20) {  
397 - console.log(TAG,'跳转') 414 + if (event.offsetX < 0 && this.ellipseW >= 20) {
  415 + console.log(TAG, '跳转')
398 let params: Params = { 416 let params: Params = {
399 pageID: this.keywords 417 pageID: this.keywords
400 } 418 }
401 - WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage,params) 419 + WDRouterRule.jumpWithPage(WDRouterPage.searchCreatorPage, params)
402 } 420 }
403 this.ellipseW = 0 421 this.ellipseW = 0
404 }) 422 })
@@ -411,18 +429,17 @@ export struct SearchResultContentComponent { @@ -411,18 +429,17 @@ export struct SearchResultContentComponent {
411 .strokeWidth('12lpx') 429 .strokeWidth('12lpx')
412 } 430 }
413 431
414 -  
415 @Builder 432 @Builder
416 itemEnd() { 433 itemEnd() {
417 Row() { 434 Row() {
418 Ellipse() 435 Ellipse()
419 - .width(2* this.ellipseW) 436 + .width(2 * this.ellipseW)
420 .height('100%') 437 .height('100%')
421 .fill('rgb(240,235,238)') 438 .fill('rgb(240,235,238)')
422 .position({ left: -this.ellipseW, top: 0 }) 439 .position({ left: -this.ellipseW, top: 0 })
423 440
424 - Column(){  
425 - Text(this.ellipseW === 0 ? '' : this.ellipseW < 20? '查看更多' : '松手查看') 441 + Column() {
  442 + Text(this.ellipseW === 0 ? '' : this.ellipseW < 20 ? '查看更多' : '松手查看')
426 .width('19lpx') 443 .width('19lpx')
427 .fontSize('19lpx') 444 .fontSize('19lpx')
428 .fontWeight('400lpx') 445 .fontWeight('400lpx')
@@ -437,17 +454,18 @@ export struct SearchResultContentComponent { @@ -437,17 +454,18 @@ export struct SearchResultContentComponent {
437 .height('100%') 454 .height('100%')
438 } 455 }
439 456
440 - private dataTransform(rem:CreatorDetailResponseItem[],value: SearchResultContentItem, photos: FullColumnImgUrlDTO[]): ContentDTO {  
441 - let rmhInfo = this.getRmhInfo(rem,value)  
442 - console.log('获取photos',JSON.stringify(photos))  
443 - console.log('获取value2',JSON.stringify(value)) 457 + private dataTransform(rem: CreatorDetailResponseItem[], value: SearchResultContentItem,
  458 + photos: FullColumnImgUrlDTO[]): ContentDTO {
  459 + let rmhInfo = this.getRmhInfo(rem, value)
  460 + console.log('获取photos', JSON.stringify(photos))
  461 + console.log('获取value2', JSON.stringify(value))
444 let liveType = value.data?.liveType; 462 let liveType = value.data?.liveType;
445 let seoTags = value.data?.seoTags 463 let seoTags = value.data?.seoTags
446 let cornerMark = value.data?.cornerMark 464 let cornerMark = value.data?.cornerMark
447 let contentDTO = new ContentDTO(); 465 let contentDTO = new ContentDTO();
448 - contentDTO.liveType = liveType?liveType: ""  
449 - contentDTO.seoTags = seoTags?seoTags: ""  
450 - contentDTO.cornerMark = cornerMark?cornerMark: "" 466 + contentDTO.liveType = liveType ? liveType : ""
  467 + contentDTO.seoTags = seoTags ? seoTags : ""
  468 + contentDTO.cornerMark = cornerMark ? cornerMark : ""
451 contentDTO.appStyle = value.data.appStyle + "" 469 contentDTO.appStyle = value.data.appStyle + ""
452 contentDTO.cityCode = value.data.cityCode 470 contentDTO.cityCode = value.data.cityCode
453 contentDTO.coverSize = "" 471 contentDTO.coverSize = ""
@@ -529,13 +547,13 @@ export struct SearchResultContentComponent { @@ -529,13 +547,13 @@ export struct SearchResultContentComponent {
529 } 547 }
530 548
531 // 搜索数据转化rmhInfo 549 // 搜索数据转化rmhInfo
532 - private getRmhInfo(rem:CreatorDetailResponseItem[],value:SearchResultContentItem){ 550 + private getRmhInfo(rem: CreatorDetailResponseItem[], value: SearchResultContentItem) {
533 let obj = value.data 551 let obj = value.data
534 - let rmhInfo:RmhInfoDTO = {  
535 - rmhHeadUrl:obj.headerPhotoUrl,  
536 - rmhName:obj.creatorName,  
537 - rmhId:obj.creatorId,  
538 - authIcon:obj.authIcon, 552 + let rmhInfo: RmhInfoDTO = {
  553 + rmhHeadUrl: obj.headerPhotoUrl,
  554 + rmhName: obj.creatorName,
  555 + rmhId: obj.creatorId,
  556 + authIcon: obj.authIcon,
539 authTitle: obj.authTitle, 557 authTitle: obj.authTitle,
540 authTitle2: '', 558 authTitle2: '',
541 banControl: 0, 559 banControl: 0,
@@ -546,44 +564,43 @@ export struct SearchResultContentComponent { @@ -546,44 +564,43 @@ export struct SearchResultContentComponent {
546 cnMainControl: 0, 564 cnMainControl: 0,
547 cnShareControl: 0, 565 cnShareControl: 0,
548 cnIsComment: 0, 566 cnIsComment: 0,
549 - cnIsLike:0, 567 + cnIsLike: 0,
550 posterShareControl: 0, 568 posterShareControl: 0,
551 rmhDesc: obj.introduction, 569 rmhDesc: obj.introduction,
552 userId: obj.userId, 570 userId: obj.userId,
553 userType: obj.userType, 571 userType: obj.userType,
554 - honoraryIcon:'',  
555 - rmhPlatform:0 572 + honoraryIcon: '',
  573 + rmhPlatform: 0
556 } 574 }
557 - if(rem.length>0){  
558 - rem.forEach(item=>{  
559 - if(item.creatorId === obj.creatorId){ 575 + if (rem.length > 0) {
  576 + rem.forEach(item => {
  577 + if (item.creatorId === obj.creatorId) {
560 rmhInfo = { 578 rmhInfo = {
561 - rmhHeadUrl:item.headPhotoUrl,  
562 - rmhName:item.userName,  
563 - rmhId:item.creatorId,  
564 - authIcon:item.authIcon, 579 + rmhHeadUrl: item.headPhotoUrl,
  580 + rmhName: item.userName,
  581 + rmhId: item.creatorId,
  582 + authIcon: item.authIcon,
565 authTitle: item.authTitle, 583 authTitle: item.authTitle,
566 authTitle2: '', 584 authTitle2: '',
567 banControl: 0, 585 banControl: 0,
568 - cnIsAttention:item.isAttention, 586 + cnIsAttention: item.isAttention,
569 cnAttention: 0, 587 cnAttention: 0,
570 cnlsComment: 0, 588 cnlsComment: 0,
571 cnlsLike: 0, 589 cnlsLike: 0,
572 cnMainControl: 0, 590 cnMainControl: 0,
573 cnShareControl: 0, 591 cnShareControl: 0,
574 cnIsComment: 0, 592 cnIsComment: 0,
575 - cnIsLike:0, 593 + cnIsLike: 0,
576 posterShareControl: 0, 594 posterShareControl: 0,
577 rmhDesc: item.introduction, 595 rmhDesc: item.introduction,
578 userId: item.userId, 596 userId: item.userId,
579 userType: item.userType, 597 userType: item.userType,
580 - honoraryIcon:'',  
581 - rmhPlatform:0 598 + honoraryIcon: '',
  599 + rmhPlatform: 0
582 } 600 }
583 } 601 }
584 }) 602 })
585 } 603 }
586 return rmhInfo 604 return rmhInfo
587 } 605 }
588 -  
589 } 606 }
@@ -57,10 +57,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent { @@ -57,10 +57,10 @@ export struct HorizontalStrokeCardThreeTwoRadioForMoreComponent {
57 57
58 liveToMore() { 58 liveToMore() {
59 if (!!this.compDTO.dataSourceType) { 59 if (!!this.compDTO.dataSourceType) {
60 - if (this.compDTO.dataSourceType === 'OBJECT_POS') {  
61 - ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)  
62 - return;  
63 - } 60 + // if (this.compDTO.dataSourceType === 'OBJECT_POS') {
  61 + // ProcessUtils.jumpChannelTab(this.compDTO.objectId, this.compDTO.pageId as string, this.compDTO.objectTitle)
  62 + // return;
  63 + // }
64 if (this.compDTO.linkUrl) { 64 if (this.compDTO.linkUrl) {
65 let taskAction: Action = { 65 let taskAction: Action = {
66 type: 'JUMP_H5_BY_WEB_VIEW', 66 type: 'JUMP_H5_BY_WEB_VIEW',
@@ -5,11 +5,25 @@ @@ -5,11 +5,25 @@
5 */ 5 */
6 export class SearchResultCountItem{ 6 export class SearchResultCountItem{
7 7
  8 + /*
  9 + "allTotal":0,
  10 + "activityTotal":0,
  11 + "cmsTotal":0,
  12 + "trueTotal":0,
  13 + "pageSize":1,
  14 + "keyword":"wuhuhuan",
  15 + "totalCount":0,
  16 + "pageNum":1,
  17 + "videoTotal":0,
  18 + "rmhTotal":5
  19 + */
8 20
  21 + keyword:string ='' //搜索关键字
9 allTotal: number = 0 //所有tab总量 22 allTotal: number = 0 //所有tab总量
10 cmsTotal: number = 0 //精选总量 23 cmsTotal: number = 0 //精选总量
11 rmhTotal: number = 0 //人民号总量 24 rmhTotal: number = 0 //人民号总量
12 videoTotal: number = 0 //视频总量 25 videoTotal: number = 0 //视频总量
13 activityTotal: number = 0 //活动数据总量 26 activityTotal: number = 0 //活动数据总量
14 27
  28 +
15 } 29 }
@@ -370,6 +370,7 @@ export struct PlayUIComponent { @@ -370,6 +370,7 @@ export struct PlayUIComponent {
370 this.playerController?.pause() 370 this.playerController?.pause()
371 } else { 371 } else {
372 this.isPlayStatus = true 372 this.isPlayStatus = true
  373 + this.playerController?.firstPlay(this.liveUrl)
373 this.playerController?.play() 374 this.playerController?.play()
374 } 375 }
375 }) 376 })
@@ -36,6 +36,7 @@ struct GuidePages { @@ -36,6 +36,7 @@ struct GuidePages {
36 ChildItem(index: number) { 36 ChildItem(index: number) {
37 RelativeContainer() { 37 RelativeContainer() {
38 Image(this.guideImage[index]) 38 Image(this.guideImage[index])
  39 + .objectFit(ImageFit.Contain)
39 .alignRules({ 40 .alignRules({
40 top: { anchor: "__container__", align: VerticalAlign.Top }, 41 top: { anchor: "__container__", align: VerticalAlign.Top },
41 bottom: { anchor: "__container__", align: VerticalAlign.Bottom } 42 bottom: { anchor: "__container__", align: VerticalAlign.Bottom }
@@ -122,6 +122,7 @@ struct LoginPage { @@ -122,6 +122,7 @@ struct LoginPage {
122 this.disableScreenCapture() 122 this.disableScreenCapture()
123 } 123 }
124 124
  125 +
125 onPageHide(): void { 126 onPageHide(): void {
126 this.pageHideTime = DateTimeUtils.getTimeStamp() 127 this.pageHideTime = DateTimeUtils.getTimeStamp()
127 let duration = 0 128 let duration = 0
@@ -132,8 +133,6 @@ struct LoginPage { @@ -132,8 +133,6 @@ struct LoginPage {
132 }else{ 133 }else{
133 TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration) 134 TrackingPageBrowse.trackCommonPageExposureEnd(TrackConstants.PageName.Login_Page,TrackConstants.PageName.Login_Page,duration)
134 } 135 }
135 - this.isPrivacyMode = false  
136 - this.disableScreenCapture()  
137 } 136 }
138 137
139 build() { 138 build() {
@@ -262,6 +261,10 @@ struct LoginPage { @@ -262,6 +261,10 @@ struct LoginPage {
262 right: { anchor: "__container__", align: HorizontalAlign.End } 261 right: { anchor: "__container__", align: HorizontalAlign.End }
263 }) 262 })
264 .onClick(() => { 263 .onClick(() => {
  264 + ///关闭禁止截图
  265 + this.isPrivacyMode = false
  266 + this.disableScreenCapture()
  267 +
265 router.back() 268 router.back()
266 }) 269 })
267 .id('id_close') 270 .id('id_close')
@@ -91,11 +91,11 @@ struct LaunchAdvertisingPage { @@ -91,11 +91,11 @@ struct LaunchAdvertisingPage {
91 Text('广告') 91 Text('广告')
92 .fontColor(Color.White) 92 .fontColor(Color.White)
93 .textAlign(TextAlign.Center) 93 .textAlign(TextAlign.Center)
94 - .fontSize('24lpx')  
95 - .width('72lpx')  
96 - .height('36lpx') 94 + .fontSize(12)
  95 + .width(36)
  96 + .height(18)
97 .borderRadius(2) 97 .borderRadius(2)
98 - .margin({top:'15lpx',left:'19lpx'}) 98 + .margin({top:'8px',left:'10px'})
99 .backgroundColor('#80000000') 99 .backgroundColor('#80000000')
100 .margin({left:16}) 100 .margin({left:16})
101 } 101 }
@@ -104,13 +104,13 @@ struct LaunchAdvertisingPage { @@ -104,13 +104,13 @@ struct LaunchAdvertisingPage {
104 104
105 Button(){ 105 Button(){
106 Text(this.time + 's 跳过') 106 Text(this.time + 's 跳过')
107 - .fontSize('27lpx') 107 + .fontSize(14)
108 .fontColor(Color.White) 108 .fontColor(Color.White)
109 - .margin({left:'28lpx',right:'28lpx'}) 109 + .margin({left:14,right:14})
110 } 110 }
111 - .width('148lpx')  
112 - .height('56lpx')  
113 - .margin({top:'10lpx',right:'19lpx'}) 111 + .width(74)
  112 + .height(28)
  113 + .margin({top:5,right:10})
114 .backgroundColor('#80000000') 114 .backgroundColor('#80000000')
115 .onClick(() => { 115 .onClick(() => {
116 this.trackingLaunchJumpOver() 116 this.trackingLaunchJumpOver()
@@ -125,21 +125,21 @@ struct LaunchAdvertisingPage { @@ -125,21 +125,21 @@ struct LaunchAdvertisingPage {
125 Button(){ 125 Button(){
126 Row(){ 126 Row(){
127 Text(this.defaultModel.isAd == '1'?'点击跳转至详情或第三方应用':'点击跳转至详情') 127 Text(this.defaultModel.isAd == '1'?'点击跳转至详情或第三方应用':'点击跳转至详情')
128 - .fontSize('31lpx') 128 + .fontSize(16)
129 .fontColor(Color.White) 129 .fontColor(Color.White)
130 .margin({ 130 .margin({
131 - left:'55lpx' 131 + left:28
132 }) 132 })
133 Image($r('app.media.Slice')) 133 Image($r('app.media.Slice'))
134 - .width('46lpx')  
135 - .height('46lpx')  
136 - .margin({right:'55lpx'}) 134 + .width(28)
  135 + .height(23)
  136 + .margin({right:28})
137 }.alignItems(VerticalAlign.Center) 137 }.alignItems(VerticalAlign.Center)
138 } 138 }
139 - .width('566lpx')  
140 - .height('111lpx') 139 + .width(284)
  140 + .height(56)
141 .margin({ 141 .margin({
142 - bottom: '51lpx' 142 + bottom: 26
143 }) 143 })
144 .borderWidth(1) 144 .borderWidth(1)
145 .borderColor(Color.White) 145 .borderColor(Color.White)
@@ -151,8 +151,8 @@ struct LaunchAdvertisingPage { @@ -151,8 +151,8 @@ struct LaunchAdvertisingPage {
151 if(this.defaultModel.screenType == '1') { 151 if(this.defaultModel.screenType == '1') {
152 Column(){ 152 Column(){
153 Image($r('app.media.LaunchPage_logo')) 153 Image($r('app.media.LaunchPage_logo'))
154 - .width('278lpx')  
155 - .height('154lpx') 154 + .width(140)
  155 + .height(77)
156 .margin({top:20}) 156 .margin({top:20})
157 }.width('100%').height('16%').backgroundColor(Color.White) 157 }.width('100%').height('16%').backgroundColor(Color.White)
158 // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM]) 158 // .expandSafeArea([SafeAreaType.SYSTEM], [SafeAreaEdge.TOP, SafeAreaEdge.BOTTOM])
@@ -40,11 +40,11 @@ struct LaunchInterestsHobbiesPage { @@ -40,11 +40,11 @@ struct LaunchInterestsHobbiesPage {
40 Row(){ 40 Row(){
41 Blank() 41 Blank()
42 Text('跳过') 42 Text('跳过')
43 - .fontSize('27lpx') 43 + .fontSize(14)
44 .fontColor('#333333') 44 .fontColor('#333333')
45 - .width('54lpx')  
46 - .height('35lpx')  
47 - .margin({top:'30lpx',right:'46lpx'}) 45 + .width(30)
  46 + .height(18)
  47 + .margin({top:15,right:23})
48 .onClick(()=>{ 48 .onClick(()=>{
49 //直接跳过到首页 49 //直接跳过到首页
50 //跳转首页 50 //跳转首页
@@ -58,20 +58,20 @@ struct LaunchInterestsHobbiesPage { @@ -58,20 +58,20 @@ struct LaunchInterestsHobbiesPage {
58 .justifyContent(FlexAlign.End) 58 .justifyContent(FlexAlign.End)
59 59
60 Text('选择感兴趣的内容') 60 Text('选择感兴趣的内容')
61 - .fontSize('46lpx') 61 + .fontSize(23)
62 .fontWeight(FontWeight.Bold) 62 .fontWeight(FontWeight.Bold)
63 .textAlign(TextAlign.Center) 63 .textAlign(TextAlign.Center)
64 .fontColor('#333333') 64 .fontColor('#333333')
65 .width('100%') 65 .width('100%')
66 - .height('61lpx')  
67 - .margin({top:'54lpx'}) 66 + .height(30)
  67 + .margin({top:27})
68 Text('完善信息,将为您推荐个性化的内容') 68 Text('完善信息,将为您推荐个性化的内容')
69 - .fontSize('27lpx') 69 + .fontSize(14)
70 .textAlign(TextAlign.Center) 70 .textAlign(TextAlign.Center)
71 .fontColor('#9E9E9E') 71 .fontColor('#9E9E9E')
72 .width('100%') 72 .width('100%')
73 - .height('35lpx')  
74 - .margin({top:'12lpx'}) 73 + .height(17)
  74 + .margin({top:6})
75 75
76 if(!this.isConnectNetwork){ 76 if(!this.isConnectNetwork){
77 EmptyComponent({ emptyType: 1,emptyHeight:"60%" ,retry: () => { 77 EmptyComponent({ emptyType: 1,emptyHeight:"60%" ,retry: () => {
@@ -141,39 +141,36 @@ struct LaunchInterestsHobbiesPage { @@ -141,39 +141,36 @@ struct LaunchInterestsHobbiesPage {
141 }) 141 })
142 } 142 }
143 .width('90%') 143 .width('90%')
144 - .margin({top:'61lpx',bottom:'300lpx'}) 144 + .margin({top:30,bottom:150})
145 .columnsTemplate('1fr 1fr 1fr') 145 .columnsTemplate('1fr 1fr 1fr')
146 .columnsGap('23lpx') 146 .columnsGap('23lpx')
147 .rowsGap('23lpx') 147 .rowsGap('23lpx')
148 .scrollBar(BarState.Off) 148 .scrollBar(BarState.Off)
149 } 149 }
150 -  
151 -  
152 } 150 }
153 .width('100%') 151 .width('100%')
154 .height('100%') 152 .height('100%')
155 } 153 }
156 .width('100%') 154 .width('100%')
157 - .height(`calc(100% - ${158 + 'lpx'})`)  
158 - // .backgroundColor(Color.Red) 155 + .height(`calc(100% - ${260 + 'px'})`)
159 156
160 Stack({alignContent:Alignment.Center}){ 157 Stack({alignContent:Alignment.Center}){
161 Button(this.selectCount == 0?'选好了':'选好了(' + this.selectCount + ')') 158 Button(this.selectCount == 0?'选好了':'选好了(' + this.selectCount + ')')
162 - .fontSize('35lpx') 159 + .fontSize(18)
163 .fontColor('#FFFFFF') 160 .fontColor('#FFFFFF')
164 .backgroundColor('#ED2800') 161 .backgroundColor('#ED2800')
165 .type(ButtonType.Normal) 162 .type(ButtonType.Normal)
166 - .borderRadius('10lpx')  
167 - .width('662lpx')  
168 - .height('84lpx')  
169 - .margin({top:'10lpx'}) 163 + .borderRadius(5)
  164 + .width(320)
  165 + .height(44)
  166 + .margin({top:5})
170 Image('') 167 Image('')
171 - .width('662lpx')  
172 - .height('84lpx')  
173 - .margin({top:'10lpx'}) 168 + .width(320)
  169 + .height(44)
  170 + .margin({top:5})
174 .backgroundColor(Color.White) 171 .backgroundColor(Color.White)
175 .opacity(this.selectCount == 0 ? 0.6 : 0) 172 .opacity(this.selectCount == 0 ? 0.6 : 0)
176 - .borderRadius('10lpx') 173 + .borderRadius(5)
177 .onClick(()=>{ 174 .onClick(()=>{
178 if (this.selectCount == 0) { 175 if (this.selectCount == 0) {
179 this.dialogToast.open() 176 this.dialogToast.open()
@@ -188,8 +185,8 @@ struct LaunchInterestsHobbiesPage { @@ -188,8 +185,8 @@ struct LaunchInterestsHobbiesPage {
188 }) 185 })
189 } 186 }
190 .width('100%') 187 .width('100%')
191 - .height('108lpx')  
192 - .margin({top:0}) 188 + .height(54)
  189 + .margin({top:5})
193 // .backgroundColor(Color.Orange) 190 // .backgroundColor(Color.Orange)
194 } 191 }
195 .width('100%') 192 .width('100%')
@@ -166,10 +166,10 @@ struct LaunchPage { @@ -166,10 +166,10 @@ struct LaunchPage {
166 166
167 Stack({alignContent:Alignment.Bottom}){ 167 Stack({alignContent:Alignment.Bottom}){
168 Image($r('app.media.LaunchPage_logo')) 168 Image($r('app.media.LaunchPage_logo'))
169 - .width('278lpx')  
170 - .height('154lpx') 169 + .width(139)
  170 + .height(87)
171 .margin({ 171 .margin({
172 - bottom:'48lpx' 172 + bottom:24
173 }) 173 })
174 174
175 } 175 }