diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets b/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets index b08ee7f29fb4726d5daf41c8ed67ec270580f8cc..b97373ab8741e6c8ce60bff7ae08ac985ef2fe5a 100644 --- a/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets +++ b/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets @@ -115,7 +115,7 @@ export class LiveViewUtil { liveView.liveViewData.primary.title = `${this.getStringSync($r('app.string.live_view_primary_title_first') .id)}${params.distance}${this.getStringSync($r('app.string.live_view_primary_title_second').id)}`; - liveView.liveViewData.primary.content = [{ text: this.getResourceStringSync(params.roadName) }]; + liveView.liveViewData.primary.content = [{ text: this.getStringSync(params.roadName.id) }]; liveView.liveViewData.primary.liveViewLockScreenAbilityName = 'LiveViewExtAbility'; liveView.liveViewData.primary.liveViewLockScreenAbilityParameters = { '': '' }; if (params.laneData.laneNum === 1) { @@ -195,15 +195,4 @@ export class LiveViewUtil { } return stringSyn; } - - private getResourceStringSync(resource: Resource): string { - let stringSyn: string = ''; - try { - stringSyn = this.context.resourceManager.getStringSync(resource.id); - } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', - `Get string failed. code: ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); - } - return stringSyn; - } } \ No newline at end of file diff --git a/liveviewlockscreensample/oh-package.json5 b/liveviewlockscreensample/oh-package.json5 index d1077b32ab36f3afdd14d29664f054fc38a8d963..31f77b1531fb8da1874b306535951a870df9036f 100644 --- a/liveviewlockscreensample/oh-package.json5 +++ b/liveviewlockscreensample/oh-package.json5 @@ -6,6 +6,6 @@ "author": "", "license": "", "dependencies": { - "liveviewlockscreenlibrary": "file:../liveviewlockscreenlibrary" + "@ohos_samples/liveviewlockscreenlibrary": "file:../liveviewlockscreenlibrary" } } \ No newline at end of file diff --git a/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets b/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets index defc1761682c41cf4788908b6cd9bfe3380ff9df..5b354c26ceead263fb665662a09feeaf84500d7e 100644 --- a/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets +++ b/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets @@ -16,7 +16,7 @@ import { UIAbility } from '@kit.AbilityKit'; import { window } from '@kit.ArkUI'; import { hilog } from '@kit.PerformanceAnalysisKit'; -import { LiveViewLockScreenController } from 'liveviewlockscreenlibrary'; +import { LiveViewLockScreenController } from '@ohos_samples/liveviewlockscreenlibrary'; const TAG: string = '[EntryAbility]'; diff --git a/liveviewlockscreensample/src/main/ets/liveview/LiveViewExtAbility.ets b/liveviewlockscreensample/src/main/ets/liveview/LiveViewExtAbility.ets index 6b94c0294da5bba303d66de96a31f677a0ded04c..bef9697fcbe930403d9f3d6fbd6bdbf24d93999d 100644 --- a/liveviewlockscreensample/src/main/ets/liveview/LiveViewExtAbility.ets +++ b/liveviewlockscreensample/src/main/ets/liveview/LiveViewExtAbility.ets @@ -17,7 +17,7 @@ import { AbilityConstant, UIExtensionContentSession, Want } from '@kit.AbilityKi import { BusinessError } from '@kit.BasicServicesKit'; import { LiveViewLockScreenExtensionAbility } from '@kit.LiveViewKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; -import { LiveViewLockScreenController } from 'liveviewlockscreenlibrary'; +import { LiveViewLockScreenController } from '@ohos_samples/liveviewlockscreenlibrary'; const TAG: string = '[LiveViewExtAbility]'; diff --git a/liveviewlockscreensample/src/main/ets/pages/Index.ets b/liveviewlockscreensample/src/main/ets/pages/Index.ets index 8292b279b43ea08225d0d262e8fa461901db7c11..893b6c7dc7f5e10ffb2d35f9b64e915045b364a2 100644 --- a/liveviewlockscreensample/src/main/ets/pages/Index.ets +++ b/liveviewlockscreensample/src/main/ets/pages/Index.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { IndexComponent } from 'liveviewlockscreenlibrary' +import { IndexComponent } from '@ohos_samples/liveviewlockscreenlibrary' @Entry @Component diff --git a/liveviewlockscreensample/src/main/ets/pages/LockScreen.ets b/liveviewlockscreensample/src/main/ets/pages/LockScreen.ets index 03314719a745dae760f72138030b9c8dbbceec5c..ce7738be68dd925c9fa5c13892582ed87b7c2843 100644 --- a/liveviewlockscreensample/src/main/ets/pages/LockScreen.ets +++ b/liveviewlockscreensample/src/main/ets/pages/LockScreen.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { LockScreenComponent } from 'liveviewlockscreenlibrary' +import { LockScreenComponent } from '@ohos_samples/liveviewlockscreenlibrary' @Entry struct LockScreen {