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 @@
"arkOptions": {
"obfuscation": {
"ruleOptions": {
"enable": true,
"enable": false,
"files": [
"./obfuscation-rules.txt"
]
... ...
... ... @@ -129,7 +129,11 @@ export struct DynamicDetailComponent {
})
}
aboutToDisappear() {
if (this.lastTimeoutId) {
clearTimeout(this.lastTimeoutId)
}
this.viewBlogInsightIntentShare()
}
... ...
... ... @@ -75,65 +75,71 @@ export struct FeedBackActivity {
Stack({ alignContent: Alignment.Bottom }) {
Scroll(this.scroller) {
Column() {
Text($r('app.string.feedback_opinion_type'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14_5'))
.fontWeight(600)
.width('100%')
.margin({ left: 24, top: $r('app.float.vp_14') })
Blank()
.height(0.5)
.width('94%')
.margin({ top: $r('app.float.vp_12') })
.backgroundColor($r('app.color.color_EDEDED'))
GridRow({
columns:3,
}) {
ForEach(this.feedbackTypeBeans, (feedbackTypeBean: FeedbackTypeBean, index: number) => {
GridCol({
}) {
Row(){
Image(feedbackTypeBean.isSelect ? $r('app.media.checkbox_true') : $r('app.media.checkbox_false'))
.width(17)
.height(17)
Text(feedbackTypeBean.classifyName)
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14'))
.margin({ left: $r('app.float.vp_4') })
}
.width($r('app.float.margin_115'))
.height($r('app.float.vp_22'))
.margin({bottom:$r('app.float.margin_16')})
.backgroundColor($r('app.color.color_fff'))
.onClick(() => {
let temp = {} as FeedbackTypeBean
temp.id = feedbackTypeBean.id
temp.classifyName = feedbackTypeBean.classifyName
if(feedbackTypeBean.isSelect){
temp.isSelect = false
}else{
temp.isSelect = true
Column() {
Text($r('app.string.feedback_opinion_type'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14_5'))
.fontWeight(600)
.width('100%')
.margin({ left: 24, top: $r('app.float.vp_14') })
Blank()
.height(0.5)
.width('94%')
.margin({ top: $r('app.float.vp_12') })
.backgroundColor($r('app.color.color_EDEDED'))
GridRow({
columns: 3,
}) {
ForEach(this.feedbackTypeBeans, (feedbackTypeBean: FeedbackTypeBean, index: number) => {
GridCol({}) {
Row() {
Image(feedbackTypeBean.isSelect ? $r('app.media.checkbox_true') : $r('app.media.checkbox_false'))
.width(17)
.height(17)
Text(feedbackTypeBean.classifyName)
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14'))
.margin({ left: $r('app.float.vp_4') })
}
this.feedbackTypeBeans[index] = temp
this.canSubmit = this.checkSubmit()
TrackingButton.click('submit_feedback',TrackConstants.PageName.FeedbackPage,TrackConstants.PageName.FeedbackPage,{
'feedback_type':feedbackTypeBean.id+''
.width($r('app.float.margin_115'))
.height($r('app.float.vp_22'))
.margin({ bottom: $r('app.float.margin_16') })
.backgroundColor($r('app.color.color_fff'))
.onClick(() => {
let temp = {} as FeedbackTypeBean
temp.id = feedbackTypeBean.id
temp.classifyName = feedbackTypeBean.classifyName
if (feedbackTypeBean.isSelect) {
temp.isSelect = false
} else {
temp.isSelect = true
}
this.feedbackTypeBeans[index] = temp
this.canSubmit = this.checkSubmit()
TrackingButton.click('submit_feedback', TrackConstants.PageName.FeedbackPage,
TrackConstants.PageName.FeedbackPage, {
'feedback_type': feedbackTypeBean.id + ''
})
})
})
}
})
}
})
}
.width('90%')
.margin({ top: $r('app.float.vp_16') })
}
.width('90%')
.margin({top:$r('app.float.vp_16')})
.padding({left: 6, right: 6})
Blank()
.height($r('app.float.margin_5'))
.backgroundColor($r('app.color.color_F5F5F5'))
Text($r('app.string.feedback_opinion_tv'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14_5'))
.fontWeight(600)
.width(CommonConstants.FULL_WIDTH)
.margin({ left: 24, top: $r('app.float.vp_12') })
Column() {
Text($r('app.string.feedback_opinion_tv'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_14_5'))
.fontWeight(600)
.width(CommonConstants.FULL_WIDTH)
.margin({ left: 24, top: $r('app.float.vp_12') })
Stack({ alignContent: Alignment.BottomEnd }) {
TextArea({ placeholder: $r('app.string.feedback_comments'),text: this.editValue.classifyName})
.width(CommonConstants.FULL_WIDTH)
... ... @@ -158,7 +164,7 @@ export struct FeedBackActivity {
}
// Logger.debug(TAG, "onChange " + value)
this.textNumLabel = value.length
this.canSubmit = this.checkSubmit()
this.canSubmit = this.checkSubmit()
})
GridRow({
columns:5,
... ... @@ -231,8 +237,8 @@ export struct FeedBackActivity {
}
}
}
.margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_11')})
.fontSize($r('app.float.font_size_13_5'))
.margin({bottom: $r('app.float.vp_12'), right: $r('app.float.vp_11')})
.fontSize($r('app.float.font_size_13_5'))
}
.height(200)
.width('94%')
... ... @@ -243,52 +249,54 @@ export struct FeedBackActivity {
Text($r('app.string.feedback_email'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_13_2'))
.width('94%')
.margin({ top: $r('app.float.margin_24') })
Row() {
Blank().width('3%')
Text($r('app.string.feedback_mail'))
.height(CommonConstants.FULL_HEIGHT)
Text($r('app.string.feedback_email'))
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_13_2'))
.fontWeight(600)
.padding({left: $r('app.float.margin_12') })
.backgroundColor($r('app.color.color_F5F5F5'))
.borderRadius({
topLeft: 4,
topRight: 0,
bottomLeft: 4,
bottomRight: 0,
})
.width('94%')
.margin({ top: $r('app.float.margin_24') })
TextInput({ placeholder: $r('app.string.feedback_hideemail') })
.width(0)
.layoutWeight(1)
.height(CommonConstants.FULL_HEIGHT)
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_13_2'))
.placeholderColor($r('app.color.color_CCCCCC'))
.placeholderFont({size:$r('app.float.font_size_13_2')})
.backgroundColor($r('app.color.color_F5F5F5'))
.borderRadius({
topLeft: 0,
topRight: 4,
bottomLeft: 0,
bottomRight: 4,
})
.onChange((value) => {
this.email = value
})
Blank().width('3%')
Row() {
Blank().width('3%')
Text($r('app.string.feedback_mail'))
.height(CommonConstants.FULL_HEIGHT)
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_13_2'))
.fontWeight(600)
.padding({left: $r('app.float.margin_12') })
.backgroundColor($r('app.color.color_F5F5F5'))
.borderRadius({
topLeft: 4,
topRight: 0,
bottomLeft: 4,
bottomRight: 0,
})
TextInput({ placeholder: $r('app.string.feedback_hideemail') })
.width(0)
.layoutWeight(1)
.height(CommonConstants.FULL_HEIGHT)
.fontColor($r('app.color.color_222222'))
.fontSize($r('app.float.font_size_13_2'))
.placeholderColor($r('app.color.color_CCCCCC'))
.placeholderFont({size:$r('app.float.font_size_13_2')})
.backgroundColor($r('app.color.color_F5F5F5'))
.borderRadius({
topLeft: 0,
topRight: 4,
bottomLeft: 0,
bottomRight: 4,
})
.onChange((value) => {
this.email = value
})
Blank().width('3%')
}
.height(42)
.width(CommonConstants.FULL_WIDTH)
.margin({top: $r('app.float.margin_16')})
Blank().layoutWeight(1)
}
.height(42)
.width(CommonConstants.FULL_WIDTH)
.margin({top: $r('app.float.margin_16')})
Blank().layoutWeight(1)
.padding({left: 6, right: 6})
}
}
.width(CommonConstants.FULL_WIDTH)
... ... @@ -313,6 +321,7 @@ export struct FeedBackActivity {
})
.margin({ bottom: 64+64+15 })
}
.padding({left: 6, right: 6})
}
}
.backgroundColor($r('app.color.color_fff'))
... ...
... ... @@ -558,6 +558,9 @@ export struct ImageAndTextPageComponent {
}
aboutToDisappear() {
if (this.lastTimeoutId) {
clearTimeout(this.lastTimeoutId)
}
//意图上报
this.viewBlogInsightIntentShare()
}
... ...
... ... @@ -140,7 +140,7 @@ export struct AppointmentListUI {
.cachedCount(4)
.scrollBar(BarState.Off)
.edgeEffect(EdgeEffect.None)
.margin({ top: 4, left: 12, right: 12})
.margin({ top: 4, left: 16, right: 16})
.layoutWeight(1)
}
... ...
... ... @@ -269,7 +269,6 @@ export struct BottomNavigationComponent {
// 底导切换函数
async onBottomNavigationIndexChange(navItem: BottomNavDTO, index: number) {
// Logger.info(TAG, `onBottomNavigationIndexChange to Index:${index},this.currentNavIndex: ${this.currentNavIndex}`);
if (navItem.name === '我的') {
this.barBackgroundColor = Color.White
... ... @@ -306,10 +305,12 @@ export struct BottomNavigationComponent {
}
}
if (index >= 0 && index != this.currentNavIndex) {
this.onBottomNavigationIndexChange(this.bottomNavList[index], index)
// 切底导
this.currentNavIndex = index
}
setTimeout(() => {
// 底导切换后，触发顶导切换
this.assignChannel = new AssignChannelParam()
... ...