diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json index a9bd6d3..5c85f84 100644 --- a/AppScope/resources/base/element/string.json +++ b/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "Demo" + "value": "同仁堂中医" } ] } diff --git a/entry/src/main/ets/widget/pages/WidgetCard.ets b/entry/src/main/ets/widget/pages/WidgetCard.ets index 87c1eeb..727fe7e 100644 --- a/entry/src/main/ets/widget/pages/WidgetCard.ets +++ b/entry/src/main/ets/widget/pages/WidgetCard.ets @@ -33,29 +33,64 @@ struct WidgetCard { build() { Stack() { - Image($r("app.media.ic_widget")) - .width(this.FULL_WIDTH_PERCENT) - .height(this.FULL_HEIGHT_PERCENT) - .objectFit(ImageFit.Cover) Column() { - Text($r('app.string.title_immersive')) - .fontSize($r('app.float.title_immersive_font_size')) - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontColor($r('app.color.text_font_color')) - .maxLines(this.MAX_LINES) - Text($r('app.string.detail_immersive')) - .fontSize($r('app.float.detail_immersive_font_size')) - .opacity($r('app.float.detail_immersive_opacity')) - .margin({ top: $r('app.float.detail_immersive_margin_top') }) - .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontColor($r('app.color.text_font_color')) - .maxLines(this.MAX_LINES) + Image($r("app.media.banner")) + .width(this.FULL_WIDTH_PERCENT) + .height(77) + .objectFit(ImageFit.Auto) + Row() { + Column() { + Image($r("app.media.icon_jisu")) + .width(48) + .height(48) + .objectFit(ImageFit.Contain) + Text("急速问诊") + .fontColor("#000000") + .fontSize(13) + .margin({ top: 3 }) + Text("在家也能问医生") + .fontColor("#767581") + .fontSize(11) + .margin({ top: 3 }) + } + + Column() { + Image($r("app.media.icon_y")) + .width(48) + .height(48) + .objectFit(ImageFit.Contain) + Text("居家购药") + .fontColor("#000000") + .fontSize(13) + .margin({ top: 3 }) + Text("品质放心药") + .fontColor("#767581") + .fontSize(11) + .margin({ top: 3 }) + } + + Column() { + Image($r("app.media.icon_d")) + .width(48) + .height(48) + .objectFit(ImageFit.Contain) + Text("找医生") + .fontColor("#000000") + .fontSize(13) + .margin({ top: 3 }) + Text("多专家多专科") + .fontColor("#767581") + .fontSize(11) + .margin({ top: 3 }) + } + }.margin({ top: 8 }) + .width("100%") + .justifyContent(FlexAlign.SpaceEvenly) } .width(this.FULL_WIDTH_PERCENT) .height(this.FULL_HEIGHT_PERCENT) .alignItems(HorizontalAlign.Start) - .justifyContent(FlexAlign.End) - .padding($r('app.float.column_padding')) + .justifyContent(FlexAlign.Start) } .width(this.FULL_WIDTH_PERCENT) .height(this.FULL_HEIGHT_PERCENT) diff --git a/entry/src/main/resources/base/element/color.json b/entry/src/main/resources/base/element/color.json index 074928d..2618290 100644 --- a/entry/src/main/resources/base/element/color.json +++ b/entry/src/main/resources/base/element/color.json @@ -7,6 +7,10 @@ { "name": "text_font_color", "value": "#FFFFFF" + }, + { + "name": "text_font_color_blank", + "value": "#000000" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index e1cef37..2103e5c 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -10,7 +10,7 @@ }, { "name": "EntryAbility_label", - "value": "label" + "value": "test" }, { "name": "EntryFormAbility_desc", diff --git a/entry/src/main/resources/base/media/banner.png b/entry/src/main/resources/base/media/banner.png new file mode 100644 index 0000000..fa62f05 Binary files /dev/null and b/entry/src/main/resources/base/media/banner.png differ diff --git a/entry/src/main/resources/base/media/ic_widget.png b/entry/src/main/resources/base/media/ic_widget.png deleted file mode 100644 index c13bb4d..0000000 Binary files a/entry/src/main/resources/base/media/ic_widget.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/icon_d.png b/entry/src/main/resources/base/media/icon_d.png new file mode 100644 index 0000000..3893dac Binary files /dev/null and b/entry/src/main/resources/base/media/icon_d.png differ diff --git a/entry/src/main/resources/base/media/icon_jisu.png b/entry/src/main/resources/base/media/icon_jisu.png new file mode 100644 index 0000000..61cf0f7 Binary files /dev/null and b/entry/src/main/resources/base/media/icon_jisu.png differ diff --git a/entry/src/main/resources/base/media/icon_y.png b/entry/src/main/resources/base/media/icon_y.png new file mode 100644 index 0000000..e473136 Binary files /dev/null and b/entry/src/main/resources/base/media/icon_y.png differ diff --git a/entry/src/main/resources/base/profile/form_config.json b/entry/src/main/resources/base/profile/form_config.json index 05c99d1..a0da751 100644 --- a/entry/src/main/resources/base/profile/form_config.json +++ b/entry/src/main/resources/base/profile/form_config.json @@ -14,9 +14,9 @@ "updateEnabled": false, "scheduledUpdateTime": "10:30", "updateDuration": 1, - "defaultDimension": "2*2", + "defaultDimension": "2*4", "supportDimensions": [ - "2*2" + "2*4" ] } ] diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index e1cef37..db3cacb 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -10,7 +10,7 @@ }, { "name": "EntryAbility_label", - "value": "label" + "value": "label1" }, { "name": "EntryFormAbility_desc", diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index ab47e74..8d8bfaa 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -10,7 +10,7 @@ }, { "name": "EntryAbility_label", - "value": "label" + "value": "label2" }, { "name": "EntryFormAbility_desc",