diff --git a/README.md b/README.md index 6aada342939dc1139f9459f2542032923c07e220..466e3ffc490832b9a785d698f2d216ba6001292e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 桌面快捷方式开发实践 +# 通过module.json5文件配置应用快捷打开方式入口 ## 介绍 桌面快捷方式能让用户快速访问应用的核心功能,有效提高操作效率,同时增加用户对应用的依赖性。 @@ -14,12 +14,12 @@ │ │ └──EntryBackupAbility.ets │ └──pages │ ├──GoCompany.ets // 我的公司页 -│ ├──Login.ets // 我的家页 -│ └──Logout.ets // 首页 +│ ├──GoHouse.ets // 我的家页 +│ └──Index.ets // 首页 └──entry/src/main/resources // 应用资源目录 ```` ## 使用说明 -长安应用图标,即可出现快捷方式列表。点击对应图标,即可快速打开应用中对应的页面。 +长按应用图标,即可出现快捷方式列表。点击对应图标,即可快速打开应用中对应的页面。 ## 实现说明 * 在/resources/base/profile/目录下配置shortcuts_config.json配置文件 diff --git a/entry/src/main/ets/pages/GoCompany.ets b/entry/src/main/ets/pages/GoCompany.ets index f723ca47ae852fe54ebe41b479bbe27ab4c6a54f..154af701431ae51b1d046e5cd6fd06b51ead0ff7 100644 --- a/entry/src/main/ets/pages/GoCompany.ets +++ b/entry/src/main/ets/pages/GoCompany.ets @@ -14,6 +14,7 @@ */ import { display, promptAction } from '@kit.ArkUI'; +import { i18n } from '@kit.LocalizationKit'; @Entry @Component @@ -22,6 +23,7 @@ export struct GoCompany { @State foldStatus: number = 2; @State routes: number[] = [1, 2, 3, 4, 5]; @State currentIndex: number = 0; + @State isEnglish: boolean = false; private tabList: ResourceStr[] = [$r('app.string.driving'), $r('app.string.taxi'), $r('app.string.bus_and_subway'), $r('app.string.ride'), $r('app.string.walking'), $r('app.string.substitute_driver'), $r('app.string.train'), $r('app.string.coach')]; private tabsController: TabsController = new TabsController(); controller: TextInputController = new TextInputController(); @@ -38,6 +40,10 @@ export struct GoCompany { } display.on('change', callback); } + let systemLanguage = i18n.System.getSystemLanguage(); + if (systemLanguage === 'en-Latn-US') { + this.isEnglish = true; + } } showTips() { @@ -313,6 +319,7 @@ export struct GoCompany { .onClick(() => { this.showTips(); }) + .visibility(this.isEnglish? Visibility.None : Visibility.Visible) Image($r('app.media.routes2')) .width(148) .height(260) diff --git a/entry/src/main/ets/pages/GoHouse.ets b/entry/src/main/ets/pages/GoHouse.ets index 8453b0fe5c96dc41e9180e3a2ce513c5f270020e..0513f003c02a8db6f8bdc371d990ff634d31818a 100644 --- a/entry/src/main/ets/pages/GoHouse.ets +++ b/entry/src/main/ets/pages/GoHouse.ets @@ -14,6 +14,7 @@ */ import { display, promptAction } from '@kit.ArkUI'; +import { i18n } from '@kit.LocalizationKit'; @Entry @Component @@ -22,7 +23,10 @@ export struct GoHouse { @State foldStatus: number = 2; @State routes: number[] = [1, 2, 3, 4, 5]; @State currentIndex: number = 0; - private tabList: ResourceStr[] = [$r('app.string.driving'), $r('app.string.taxi'), $r('app.string.bus_and_subway'), $r('app.string.ride'), $r('app.string.walking'), $r('app.string.substitute_driver'), $r('app.string.train'), $r('app.string.coach')]; + @State isEnglish: boolean = false; + private tabList: ResourceStr[] = + [$r('app.string.driving'), $r('app.string.taxi'), $r('app.string.bus_and_subway'), $r('app.string.ride'), + $r('app.string.walking'), $r('app.string.substitute_driver'), $r('app.string.train'), $r('app.string.coach')]; private tabsController: TabsController = new TabsController(); controller: TextInputController = new TextInputController(); controller1: TextInputController = new TextInputController(); @@ -38,6 +42,10 @@ export struct GoHouse { } display.on('change', callback); } + let systemLanguage = i18n.System.getSystemLanguage(); + if (systemLanguage === 'en-Latn-US') { + this.isEnglish = true; + } } showTips() { @@ -138,7 +146,11 @@ export struct GoHouse { Column() { Image($r('app.media.public_right')) .draggable(false) - .height(33) + .height(20) + Text($r('app.string.collection')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .onClick(() => { this.showTips(); @@ -147,7 +159,11 @@ export struct GoHouse { Column() { Image($r('app.media.share')) .draggable(false) - .height(33) + .height(20) + Text($r('app.string.share')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .onClick(() => { this.showTips(); @@ -205,7 +221,7 @@ export struct GoHouse { .opacity(0.9) .margin({ bottom: 2 }) Text($r('app.string.10_minutes')) - .fontSize(20) + .fontSize(this.isEnglish ? 18 : 20) .fontWeight(FontWeight.Bold) .fontColor($r('app.color.text_fontColor')) .opacity(0.9) @@ -237,7 +253,7 @@ export struct GoHouse { .opacity(0.9) .margin({ bottom: 2 }) Text($r('app.string.12_minutes')) - .fontSize(20) + .fontSize(this.isEnglish ? 18 : 20) .fontWeight(FontWeight.Bold) .fontColor(Color.Black) .opacity(0.9) @@ -264,7 +280,7 @@ export struct GoHouse { .opacity(0.9) .margin({ bottom: 2 }) Text($r('app.string.8_minutes')) - .fontSize(20) + .fontSize(this.isEnglish ? 18 : 20) .fontWeight(FontWeight.Bold) .fontColor(Color.Black) .opacity(0.9) @@ -320,14 +336,14 @@ export struct GoHouse { @Builder TabList() { Tabs({ barPosition: BarPosition.Start, controller: this.tabsController }) { - ForEach(this.tabList,(_:ResourceStr,index: number)=>{ + ForEach(this.tabList, (_: ResourceStr, index: number) => { TabContent() { - if(index === 0){ + if (index === 0) { this.PlanList(); } } .tabBar(this.TabBuilder(this.tabList[index], index)) - },(item:ResourceStr)=> item.toString()) + }, (item: ResourceStr) => item.toString()) } .barHeight(45) .width('100%') @@ -356,7 +372,7 @@ export struct GoHouse { x: this.isFoldAble && this.foldStatus === 2 ? 270 : this.isFoldAble && this.foldStatus === 1 ? 624 : 306, y: this.isFoldAble ? 296 : 328 }) - .onClick(()=>{ + .onClick(() => { this.showTips(); }) .draggable(false) diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 8158eab4095c39685d752cc527dbb66b5ca08371..0c771953972c06528c3b598842c1582bc5ccfa33 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -16,6 +16,7 @@ import { display, promptAction } from '@kit.ArkUI'; import { GoHouse } from './GoHouse'; import { GoCompany } from './GoCompany'; +import { i18n } from '@kit.LocalizationKit'; @Entry @Component @@ -24,6 +25,7 @@ struct Index { @State foldStatus: number = 2; @State voiceIcon: number = 326; @State text: string = ''; + @State isEnglish: boolean = false; pageInfos: NavPathStack = new NavPathStack(); aboutToAppear(): void { @@ -52,6 +54,11 @@ struct Index { this.voiceIcon = 312; } } + + let systemLanguage = i18n.System.getSystemLanguage(); + if (systemLanguage === 'en-Latn-US') { + this.isEnglish = true; + } } showTips() { @@ -117,6 +124,11 @@ struct Index { Image($r('app.media.avatar1')) .width(48) .draggable(false) + Text($r('app.string.driving')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) + .margin({ top: 6 }) } .width(56) .height(64) @@ -128,6 +140,10 @@ struct Index { Image($r('app.media.avatar2')) .width(48) .draggable(false) + Text($r('app.string.bus_and_subway')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .width(56) .height(64) @@ -139,6 +155,10 @@ struct Index { Image($r('app.media.avatar3')) .width(40) .draggable(false) + Text($r('app.string.taxi')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .width(56) .height(64) @@ -150,6 +170,10 @@ struct Index { Image($r('app.media.avatar4')) .width(48) .draggable(false) + Text($r('app.string.real_time_bus')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .width(56) .height(64) @@ -161,6 +185,10 @@ struct Index { Image($r('app.media.avatar5')) .width(40) .draggable(false) + Text($r('app.string.book_a_hotel')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .width(56) .height(64) @@ -243,8 +271,12 @@ struct Index { Row() { Column() { Image($r('app.media.homePage')) - .height(41) + .height(28) .draggable(false) + Text($r('app.string.home_page')) + .fontSize(12) + .fontWeight(FontWeight.Medium) + .fontColor('#0A59F7') } .width(82) .height(54) @@ -254,8 +286,12 @@ struct Index { Column({ space: 4 }) { Image($r('app.media.near')) - .height(41) + .height(28) .draggable(false) + Text($r('app.string.near')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .width(82) .height(54) @@ -265,8 +301,12 @@ struct Index { Column({ space: 4 }) { Image($r('app.media.taxi')) - .height(41) + .height(28) .draggable(false) + Text($r('app.string.taxi')) + .fontSize(12) + .fontColor(Color.Black) + .opacity(0.6) } .width(82) .height(54) @@ -276,8 +316,13 @@ struct Index { Column({ space: 4 }) { Image($r('app.media.mine')) - .height(41) + .height(28) .draggable(false) + Text($r('app.string.mine')) + .fontSize(12) + .fontWeight(FontWeight.Medium) + .fontColor(Color.Black) + .opacity(0.6) } .width(82) .height(54) @@ -333,6 +378,7 @@ struct Index { .onClick(() => { this.showTips(); }) + .visibility(this.isEnglish ? Visibility.None : Visibility.Visible) this.myBuilder(); } .justifyContent(FlexAlign.End) diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index fdd5718ff337ca6052d9a1098f65c90edd0cf346..ffe0164fc833fa7bd002b9501438dfff0078d4e7 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -138,7 +138,7 @@ }, { "name": "intelligent_recommendation", - "value": "intelligent recommendation" + "value": "Intelligent" }, { "name": "estimate", @@ -178,7 +178,7 @@ }, { "name": "substitute_driver", - "value": "Sub driver" + "value": "Sub" }, { "name": "train", diff --git a/entry/src/main/resources/base/media/avatar1.png b/entry/src/main/resources/base/media/avatar1.png index 61ba41df3bab9a90a73128c82d496b23e3a3a506..7a9c113f0e2bd9abbd8486b00e98ca0cb7ecfd7e 100644 Binary files a/entry/src/main/resources/base/media/avatar1.png and b/entry/src/main/resources/base/media/avatar1.png differ diff --git a/entry/src/main/resources/base/media/avatar2.png b/entry/src/main/resources/base/media/avatar2.png index c26f0fb4e0b0be02658ae246134a21b1daf1ddb7..fda3f9e3a981da697452e1113d06e083dab1235b 100644 Binary files a/entry/src/main/resources/base/media/avatar2.png and b/entry/src/main/resources/base/media/avatar2.png differ diff --git a/entry/src/main/resources/base/media/avatar3.png b/entry/src/main/resources/base/media/avatar3.png index 3f9bf62c2373736f08a3371815bbce18f76bfe9c..bdeff131b58b26f09b533acb1720e0fdf0bf927f 100644 Binary files a/entry/src/main/resources/base/media/avatar3.png and b/entry/src/main/resources/base/media/avatar3.png differ diff --git a/entry/src/main/resources/base/media/avatar4.png b/entry/src/main/resources/base/media/avatar4.png index 74ea621cfdd92b87761d36d115e08cad6d980ccf..01eae70f27ab844ee12ab6be0e33528ba0e16789 100644 Binary files a/entry/src/main/resources/base/media/avatar4.png and b/entry/src/main/resources/base/media/avatar4.png differ diff --git a/entry/src/main/resources/base/media/avatar5.png b/entry/src/main/resources/base/media/avatar5.png index 3ec750199a2346c3b1892a51ec90df49416bfc07..efd4ea97f6972340adfb4caba167d000fd994666 100644 Binary files a/entry/src/main/resources/base/media/avatar5.png and b/entry/src/main/resources/base/media/avatar5.png differ diff --git a/entry/src/main/resources/base/media/homePage.png b/entry/src/main/resources/base/media/homePage.png index 06e45b2211d63ebbea1a173e652ce25119aa31fe..a9c7176250f68bc581f80515bd682e17f44c167f 100644 Binary files a/entry/src/main/resources/base/media/homePage.png and b/entry/src/main/resources/base/media/homePage.png differ diff --git a/entry/src/main/resources/base/media/mine.png b/entry/src/main/resources/base/media/mine.png index a8aaf43f3f8ae65710bc75d895b6e7df1f57d44f..bfbed2e2898772cdc4ff2dc796f76855e20f7630 100644 Binary files a/entry/src/main/resources/base/media/mine.png and b/entry/src/main/resources/base/media/mine.png differ diff --git a/entry/src/main/resources/base/media/near.png b/entry/src/main/resources/base/media/near.png index 35292cfc3201959a4e8029932db9d86dd74688bd..f7b720bc2d23d3fe5acfae170166b5f95b96bbaf 100644 Binary files a/entry/src/main/resources/base/media/near.png and b/entry/src/main/resources/base/media/near.png differ diff --git a/entry/src/main/resources/base/media/public_right.png b/entry/src/main/resources/base/media/public_right.png index 18d0e79db128402c6aa6b495176303f076e60b8c..1a3185d08b6f6ff92ba2f0d3a61c4653159b9933 100644 Binary files a/entry/src/main/resources/base/media/public_right.png and b/entry/src/main/resources/base/media/public_right.png differ diff --git a/entry/src/main/resources/base/media/share.png b/entry/src/main/resources/base/media/share.png index e289534c297ff782407db3cdfee658cc5af6fb6e..247142128a4b6f7e52910cc09ad2d94dbc1605d6 100644 Binary files a/entry/src/main/resources/base/media/share.png and b/entry/src/main/resources/base/media/share.png differ diff --git a/entry/src/main/resources/base/media/taxi.png b/entry/src/main/resources/base/media/taxi.png index d5202ed8d00534377bc72759d564f6c85e4dc88b..d3b9020a1b1c1dadad7bbff5fb64b6857fcab40a 100644 Binary files a/entry/src/main/resources/base/media/taxi.png and b/entry/src/main/resources/base/media/taxi.png differ diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index fdd5718ff337ca6052d9a1098f65c90edd0cf346..ffe0164fc833fa7bd002b9501438dfff0078d4e7 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -138,7 +138,7 @@ }, { "name": "intelligent_recommendation", - "value": "intelligent recommendation" + "value": "Intelligent" }, { "name": "estimate", @@ -178,7 +178,7 @@ }, { "name": "substitute_driver", - "value": "Sub driver" + "value": "Sub" }, { "name": "train",