developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
王士厅
b4bcc4e6 2 parents ff89759a 0abfcee7

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

Inline Side-by-side
Showing 6 changed files with 118 additions and 101 deletions
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 "arkOptions": { 13 "arkOptions": {
14 "obfuscation": { 14 "obfuscation": {
15 "ruleOptions": { 15 "ruleOptions": {
16 - "enable": true, 16 + "enable": false,
17 "files": [ 17 "files": [
18 "./obfuscation-rules.txt" 18 "./obfuscation-rules.txt"
19 ] 19 ]
@@ -129,7 +129,11 @@ export struct DynamicDetailComponent { @@ -129,7 +129,11 @@ export struct DynamicDetailComponent {
129 }) 129 })
130 130
131 } 131 }
  132 +
132 aboutToDisappear() { 133 aboutToDisappear() {
  134 + if (this.lastTimeoutId) {
  135 + clearTimeout(this.lastTimeoutId)
  136 + }
133 this.viewBlogInsightIntentShare() 137 this.viewBlogInsightIntentShare()
134 138
135 } 139 }
@@ -75,65 +75,71 @@ export struct FeedBackActivity { @@ -75,65 +75,71 @@ export struct FeedBackActivity {
75 Stack({ alignContent: Alignment.Bottom }) { 75 Stack({ alignContent: Alignment.Bottom }) {
76 Scroll(this.scroller) { 76 Scroll(this.scroller) {
77 Column() { 77 Column() {
78 - Text($r('app.string.feedback_opinion_type'))  
79 - .fontColor($r('app.color.color_222222'))  
80 - .fontSize($r('app.float.font_size_14_5'))  
81 - .fontWeight(600)  
82 - .width('100%')  
83 - .margin({ left: 24, top: $r('app.float.vp_14') })  
84 - Blank()  
85 - .height(0.5)  
86 - .width('94%')  
87 - .margin({ top: $r('app.float.vp_12') })  
88 - .backgroundColor($r('app.color.color_EDEDED'))  
89 - GridRow({  
90 - columns:3,  
91 - }) {  
92 - ForEach(this.feedbackTypeBeans, (feedbackTypeBean: FeedbackTypeBean, index: number) => {  
93 - GridCol({  
94 - }) {  
95 - Row(){  
96 - Image(feedbackTypeBean.isSelect ? $r('app.media.checkbox_true') : $r('app.media.checkbox_false'))  
97 - .width(17)  
98 - .height(17)  
99 - Text(feedbackTypeBean.classifyName)  
100 - .fontColor($r('app.color.color_222222'))  
101 - .fontSize($r('app.float.font_size_14'))  
102 - .margin({ left: $r('app.float.vp_4') })  
103 - }  
104 - .width($r('app.float.margin_115'))  
105 - .height($r('app.float.vp_22'))  
106 - .margin({bottom:$r('app.float.margin_16')})  
107 - .backgroundColor($r('app.color.color_fff'))  
108 - .onClick(() => {  
109 - let temp = {} as FeedbackTypeBean  
110 - temp.id = feedbackTypeBean.id  
111 - temp.classifyName = feedbackTypeBean.classifyName  
112 - if(feedbackTypeBean.isSelect){  
113 - temp.isSelect = false  
114 - }else{  
115 - temp.isSelect = true 78 + Column() {
  79 + Text($r('app.string.feedback_opinion_type'))
  80 + .fontColor($r('app.color.color_222222'))
  81 + .fontSize($r('app.float.font_size_14_5'))
  82 + .fontWeight(600)
  83 + .width('100%')
  84 + .margin({ left: 24, top: $r('app.float.vp_14') })
  85 + Blank()
  86 + .height(0.5)
  87 + .width('94%')
  88 + .margin({ top: $r('app.float.vp_12') })
  89 + .backgroundColor($r('app.color.color_EDEDED'))
  90 + GridRow({
  91 + columns: 3,
  92 + }) {
  93 + ForEach(this.feedbackTypeBeans, (feedbackTypeBean: FeedbackTypeBean, index: number) => {
  94 + GridCol({}) {
  95 + Row() {
  96 + Image(feedbackTypeBean.isSelect ? $r('app.media.checkbox_true') : $r('app.media.checkbox_false'))
  97 + .width(17)
  98 + .height(17)
  99 + Text(feedbackTypeBean.classifyName)
  100 + .fontColor($r('app.color.color_222222'))
  101 + .fontSize($r('app.float.font_size_14'))
  102 + .margin({ left: $r('app.float.vp_4') })
116 } 103 }
117 - this.feedbackTypeBeans[index] = temp  
118 - this.canSubmit = this.checkSubmit()  
119 - TrackingButton.click('submit_feedback',TrackConstants.PageName.FeedbackPage,TrackConstants.PageName.FeedbackPage,{  
120 - 'feedback_type':feedbackTypeBean.id+'' 104 + .width($r('app.float.margin_115'))
  105 + .height($r('app.float.vp_22'))
  106 + .margin({ bottom: $r('app.float.margin_16') })
  107 + .backgroundColor($r('app.color.color_fff'))
  108 + .onClick(() => {
  109 + let temp = {} as FeedbackTypeBean
  110 + temp.id = feedbackTypeBean.id
  111 + temp.classifyName = feedbackTypeBean.classifyName
  112 + if (feedbackTypeBean.isSelect) {
  113 + temp.isSelect = false
  114 + } else {
  115 + temp.isSelect = true
  116 + }
  117 + this.feedbackTypeBeans[index] = temp
  118 + this.canSubmit = this.checkSubmit()
  119 + TrackingButton.click('submit_feedback', TrackConstants.PageName.FeedbackPage,
  120 + TrackConstants.PageName.FeedbackPage, {
  121 + 'feedback_type': feedbackTypeBean.id + ''
  122 + })
121 }) 123 })
122 - })  
123 - }  
124 - }) 124 + }
  125 + })
  126 + }
  127 + .width('90%')
  128 + .margin({ top: $r('app.float.vp_16') })
125 } 129 }
126 - .width('90%')  
127 - .margin({top:$r('app.float.vp_16')}) 130 + .padding({left: 6, right: 6})
  131 +
128 Blank() 132 Blank()
129 .height($r('app.float.margin_5')) 133 .height($r('app.float.margin_5'))
130 .backgroundColor($r('app.color.color_F5F5F5')) 134 .backgroundColor($r('app.color.color_F5F5F5'))
131 - Text($r('app.string.feedback_opinion_tv'))  
132 - .fontColor($r('app.color.color_222222'))  
133 - .fontSize($r('app.float.font_size_14_5'))  
134 - .fontWeight(600)  
135 - .width(CommonConstants.FULL_WIDTH)  
136 - .margin({ left: 24, top: $r('app.float.vp_12') }) 135 +
  136 + Column() {
  137 + Text($r('app.string.feedback_opinion_tv'))
  138 + .fontColor($r('app.color.color_222222'))
  139 + .fontSize($r('app.float.font_size_14_5'))
  140 + .fontWeight(600)
  141 + .width(CommonConstants.FULL_WIDTH)
  142 + .margin({ left: 24, top: $r('app.float.vp_12') })
137 Stack({ alignContent: Alignment.BottomEnd }) { 143 Stack({ alignContent: Alignment.BottomEnd }) {
138 TextArea({ placeholder: $r('app.string.feedback_comments'),text: this.editValue.classifyName}) 144 TextArea({ placeholder: $r('app.string.feedback_comments'),text: this.editValue.classifyName})
139 .width(CommonConstants.FULL_WIDTH) 145 .width(CommonConstants.FULL_WIDTH)
@@ -158,7 +164,7 @@ export struct FeedBackActivity { @@ -158,7 +164,7 @@ export struct FeedBackActivity {
158 } 164 }
159 // Logger.debug(TAG, "onChange " + value) 165 // Logger.debug(TAG, "onChange " + value)
160 this.textNumLabel = value.length 166 this.textNumLabel = value.length
161 - this.canSubmit = this.checkSubmit() 167 + this.canSubmit = this.checkSubmit()
162 }) 168 })
163 GridRow({ 169 GridRow({
164 columns:5, 170 columns:5,
@@ -231,8 +237,8 @@ export struct FeedBackActivity { @@ -231,8 +237,8 @@ export struct FeedBackActivity {
231 } 237 }
232 } 238 }
233 } 239 }
234 - .margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_11')})  
235 - .fontSize($r('app.float.font_size_13_5')) 240 + .margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_11')})
  241 + .fontSize($r('app.float.font_size_13_5'))
236 } 242 }
237 .height(200) 243 .height(200)
238 .width('94%') 244 .width('94%')
@@ -243,52 +249,54 @@ export struct FeedBackActivity { @@ -243,52 +249,54 @@ export struct FeedBackActivity {
243 249
244 250
245 251
246 - Text($r('app.string.feedback_email'))  
247 - .fontColor($r('app.color.color_222222'))  
248 - .fontSize($r('app.float.font_size_13_2'))  
249 - .width('94%')  
250 - .margin({ top: $r('app.float.margin_24') })  
251 -  
252 - Row() {  
253 - Blank().width('3%')  
254 - Text($r('app.string.feedback_mail'))  
255 - .height(CommonConstants.FULL_HEIGHT) 252 + Text($r('app.string.feedback_email'))
256 .fontColor($r('app.color.color_222222')) 253 .fontColor($r('app.color.color_222222'))
257 .fontSize($r('app.float.font_size_13_2')) 254 .fontSize($r('app.float.font_size_13_2'))
258 - .fontWeight(600)  
259 - .padding({left: $r('app.float.margin_12') })  
260 - .backgroundColor($r('app.color.color_F5F5F5'))  
261 - .borderRadius({  
262 - topLeft: 4,  
263 - topRight: 0,  
264 - bottomLeft: 4,  
265 - bottomRight: 0,  
266 - }) 255 + .width('94%')
  256 + .margin({ top: $r('app.float.margin_24') })
267 257
268 - TextInput({ placeholder: $r('app.string.feedback_hideemail') })  
269 - .width(0)  
270 - .layoutWeight(1)  
271 - .height(CommonConstants.FULL_HEIGHT)  
272 - .fontColor($r('app.color.color_222222'))  
273 - .fontSize($r('app.float.font_size_13_2'))  
274 - .placeholderColor($r('app.color.color_CCCCCC'))  
275 - .placeholderFont({size:$r('app.float.font_size_13_2')})  
276 - .backgroundColor($r('app.color.color_F5F5F5'))  
277 - .borderRadius({  
278 - topLeft: 0,  
279 - topRight: 4,  
280 - bottomLeft: 0,  
281 - bottomRight: 4,  
282 - })  
283 - .onChange((value) => {  
284 - this.email = value  
285 - })  
286 - Blank().width('3%') 258 + Row() {
  259 + Blank().width('3%')
  260 + Text($r('app.string.feedback_mail'))
  261 + .height(CommonConstants.FULL_HEIGHT)
  262 + .fontColor($r('app.color.color_222222'))
  263 + .fontSize($r('app.float.font_size_13_2'))
  264 + .fontWeight(600)
  265 + .padding({left: $r('app.float.margin_12') })
  266 + .backgroundColor($r('app.color.color_F5F5F5'))
  267 + .borderRadius({
  268 + topLeft: 4,
  269 + topRight: 0,
  270 + bottomLeft: 4,
  271 + bottomRight: 0,
  272 + })
  273 +
  274 + TextInput({ placeholder: $r('app.string.feedback_hideemail') })
  275 + .width(0)
  276 + .layoutWeight(1)
  277 + .height(CommonConstants.FULL_HEIGHT)
  278 + .fontColor($r('app.color.color_222222'))
  279 + .fontSize($r('app.float.font_size_13_2'))
  280 + .placeholderColor($r('app.color.color_CCCCCC'))
  281 + .placeholderFont({size:$r('app.float.font_size_13_2')})
  282 + .backgroundColor($r('app.color.color_F5F5F5'))
  283 + .borderRadius({
  284 + topLeft: 0,
  285 + topRight: 4,
  286 + bottomLeft: 0,
  287 + bottomRight: 4,
  288 + })
  289 + .onChange((value) => {
  290 + this.email = value
  291 + })
  292 + Blank().width('3%')
  293 + }
  294 + .height(42)
  295 + .width(CommonConstants.FULL_WIDTH)
  296 + .margin({top: $r('app.float.margin_16')})
  297 + Blank().layoutWeight(1)
287 } 298 }
288 - .height(42)  
289 - .width(CommonConstants.FULL_WIDTH)  
290 - .margin({top: $r('app.float.margin_16')})  
291 - Blank().layoutWeight(1) 299 + .padding({left: 6, right: 6})
292 } 300 }
293 } 301 }
294 .width(CommonConstants.FULL_WIDTH) 302 .width(CommonConstants.FULL_WIDTH)
@@ -313,6 +321,7 @@ export struct FeedBackActivity { @@ -313,6 +321,7 @@ export struct FeedBackActivity {
313 }) 321 })
314 .margin({ bottom: 64+64+15 }) 322 .margin({ bottom: 64+64+15 })
315 } 323 }
  324 + .padding({left: 6, right: 6})
316 } 325 }
317 } 326 }
318 .backgroundColor($r('app.color.color_fff')) 327 .backgroundColor($r('app.color.color_fff'))
@@ -558,6 +558,9 @@ export struct ImageAndTextPageComponent { @@ -558,6 +558,9 @@ export struct ImageAndTextPageComponent {
558 } 558 }
559 559
560 aboutToDisappear() { 560 aboutToDisappear() {
  561 + if (this.lastTimeoutId) {
  562 + clearTimeout(this.lastTimeoutId)
  563 + }
561 //意图上报 564 //意图上报
562 this.viewBlogInsightIntentShare() 565 this.viewBlogInsightIntentShare()
563 } 566 }
@@ -140,7 +140,7 @@ export struct AppointmentListUI { @@ -140,7 +140,7 @@ export struct AppointmentListUI {
140 .cachedCount(4) 140 .cachedCount(4)
141 .scrollBar(BarState.Off) 141 .scrollBar(BarState.Off)
142 .edgeEffect(EdgeEffect.None) 142 .edgeEffect(EdgeEffect.None)
143 - .margin({ top: 4, left: 12, right: 12}) 143 + .margin({ top: 4, left: 16, right: 16})
144 .layoutWeight(1) 144 .layoutWeight(1)
145 } 145 }
146 146
@@ -269,7 +269,6 @@ export struct BottomNavigationComponent { @@ -269,7 +269,6 @@ export struct BottomNavigationComponent {
269 269
270 // 底导切换函数 270 // 底导切换函数
271 async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) { 271 async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) {
272 - // Logger.info(TAG, `onBottomNavigationIndexChange to Index:${index},this.currentNavIndex: ${this.currentNavIndex}`);  
273 272
274 if (navItem.name === '我的') { 273 if (navItem.name === '我的') {
275 this.barBackgroundColor = Color.White 274 this.barBackgroundColor = Color.White
@@ -306,10 +305,12 @@ export struct BottomNavigationComponent { @@ -306,10 +305,12 @@ export struct BottomNavigationComponent {
306 } 305 }
307 } 306 }
308 if (index >= 0 && index != this.currentNavIndex) { 307 if (index >= 0 && index != this.currentNavIndex) {
  308 + this.onBottomNavigationIndexChange(this.bottomNavList[index], index)
309 // 切底导 309 // 切底导
310 this.currentNavIndex = index 310 this.currentNavIndex = index
311 } 311 }
312 312
  313 +
313 setTimeout(() => { 314 setTimeout(() => {
314 // 底导切换后，触发顶导切换 315 // 底导切换后，触发顶导切换
315 this.assignChannel = new AssignChannelParam() 316 this.assignChannel = new AssignChannelParam()