diff --git a/build-profile.json5 b/build-profile.json5 index 2a19c0eb4bf48654bc249f2c339c40982210c92c..40e5b86d7982259c0287ac8684cda61b96f04f46 100755 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,7 +5,8 @@ { "name": "default", "signingConfig": "default", - "compatibleSdkVersion": "5.0.0(12)", + "compatibleSdkVersion": "5.0.5(17)", + "targetSdkVersion": "5.0.5(17)", "runtimeOS": "HarmonyOS" } ], diff --git a/features/home/oh-package.json5 b/features/home/oh-package.json5 index c225b1c88d95ae7e9073be1237af6602999b44b7..99e4b507f3251bcce8cc653f2fa45d2ae6ac62a8 100755 --- a/features/home/oh-package.json5 +++ b/features/home/oh-package.json5 @@ -8,7 +8,7 @@ "version": "1.0.0", "dynamicDependencies": {}, "dependencies": { - "@ohos/base": "file:../../common/base", - "@ohos/socialcircle": "file:../socialCircle" + "base": "file:../../common/base", + "socialCircle": "file:../socialCircle" } } diff --git a/features/home/src/main/ets/pages/ContactsDetail.ets b/features/home/src/main/ets/pages/ContactsDetail.ets index abcf3fbc00ef7ba325b5e2921f4eff3a5fccae82..f1bf0da002c8a7d3bc7f4118ff9966b0d23fc64a 100755 --- a/features/home/src/main/ets/pages/ContactsDetail.ets +++ b/features/home/src/main/ets/pages/ContactsDetail.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { Adaptive, BaseConstants, BreakpointConstants, StandardIcon } from '@ohos/base'; +import { Adaptive, BaseConstants, BreakpointConstants, StandardIcon } from 'base'; import { HomeConstants } from '../constants/HomeConstants'; import { SocialCirclePictures } from '../viewmodel/SocialCircleViewModel'; import { deviceInfo } from '@kit.BasicServicesKit'; diff --git a/features/home/src/main/ets/pages/ContactsList.ets b/features/home/src/main/ets/pages/ContactsList.ets index 44ea583b51066ac03972323848c1c15da32238a8..0188cb2e4dd214b1d2d08dfe514eae23332f36c2 100755 --- a/features/home/src/main/ets/pages/ContactsList.ets +++ b/features/home/src/main/ets/pages/ContactsList.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Adaptive, BaseConstants, BreakpointConstants } from '@ohos/base'; +import { Adaptive, BaseConstants, BreakpointConstants } from 'base'; import { Alphabets, ContactsListData, ContactsDataInterface } from '../viewmodel/ConstactsViewModel'; import { ContactsItem } from '../views/Contacts/ContactsItem'; import { HomeConstants } from '../constants/HomeConstants'; diff --git a/features/home/src/main/ets/pages/ConversationDetail.ets b/features/home/src/main/ets/pages/ConversationDetail.ets index 46c31ca025a67284cc27fa394622218a90bccd37..eda9ee347bc73424f35fe71ee7bddfa1ba08f50d 100755 --- a/features/home/src/main/ets/pages/ConversationDetail.ets +++ b/features/home/src/main/ets/pages/ConversationDetail.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Adaptive, BaseConstants, BreakpointConstants } from '@ohos/base'; +import { Adaptive, BaseConstants, BreakpointConstants } from 'base'; import { ConversationDetailBottom } from '../views/Conversation/ConversationDetailBottom'; import ConversationDetailItem from '../views/Conversation/ConversationDetailItem'; import { ConversationDetailTopSearch } from '../views/Conversation/ConversationDetailTopSearch'; diff --git a/features/home/src/main/ets/pages/ConversationList.ets b/features/home/src/main/ets/pages/ConversationList.ets index 89d4b1bf2b8d48180f3e4ea8c4c14a0e2de50207..73aac46587455109c9535555b7d3c64a83d87248 100755 --- a/features/home/src/main/ets/pages/ConversationList.ets +++ b/features/home/src/main/ets/pages/ConversationList.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Adaptive, BaseConstants, BreakpointConstants } from '@ohos/base'; +import { Adaptive } from 'base'; import { ConversationDataInterface, ConversationListData } from '../viewmodel/ConversationViewModel'; import { ConversationItem } from '../views/Conversation/ConversationItem'; import { HomeTopSearch } from '../views/common/HomeTopSearch'; @@ -39,7 +39,7 @@ export struct ConversationList { ListItem() { ConversationItem(item) .onClick(() => { - if (this.pageInfo.size() > 1) { + if (this.pageInfo && this.pageInfo.size() > 1) { this.pageInfo.pop(); } this.pageInfo.pushPath({ name: 'ConversationDetail' }); diff --git a/features/home/src/main/ets/pages/Index.ets b/features/home/src/main/ets/pages/Index.ets index 5d70cb23a9520984c71df67385b473ddd6ad453d..8e2e63f7ed930d2d9eef1196cd18f7d6f05ca4d7 100755 --- a/features/home/src/main/ets/pages/Index.ets +++ b/features/home/src/main/ets/pages/Index.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { Adaptive, BaseConstants, BreakpointConstants, CurrentFeature, CurrentPage } from '@ohos/base'; +import { Adaptive, BaseConstants, BreakpointConstants, CurrentFeature, CurrentPage } from 'base'; import ConversationDetailNone from '../views/Conversation/ConversationDetailNone'; import { ContactsDetail } from './ContactsDetail'; import { ContactsList } from './ContactsList'; @@ -21,10 +21,9 @@ import { ConversationDetail } from './ConversationDetail'; import { ConversationList } from './ConversationList'; import { HomeConstants } from '../constants/HomeConstants'; import { HomeTab } from '../views/HomeTab'; -import { SocialCircle } from '@ohos/SocialCircle'; +import { SocialCircle } from 'socialCircle'; import { deviceInfo } from '@kit.BasicServicesKit'; -@Entry @Component export struct Index { @StorageProp('currentBreakpoint') @Watch('watchCurrentBreakpoint') currentBreakpoint: string = 'sm'; diff --git a/features/home/src/main/ets/viewmodel/BottomTabViewModel.ets b/features/home/src/main/ets/viewmodel/BottomTabViewModel.ets index f415b66eedaa86352a563ef7b47a65f79852b19c..4e58e481a554da66d000752436adbe6d85dbf5df 100755 --- a/features/home/src/main/ets/viewmodel/BottomTabViewModel.ets +++ b/features/home/src/main/ets/viewmodel/BottomTabViewModel.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { TabInfoModel } from '@ohos/base'; +import { TabInfoModel } from 'base'; const ButtonInfo: TabInfoModel[] = [ { diff --git a/features/home/src/main/ets/viewmodel/ConversationViewModel.ets b/features/home/src/main/ets/viewmodel/ConversationViewModel.ets index 730aacfdc945c6447d036526895f7e702e9bae64..e67a316cc425ee3e393f351b1028a416c7d920cd 100755 --- a/features/home/src/main/ets/viewmodel/ConversationViewModel.ets +++ b/features/home/src/main/ets/viewmodel/ConversationViewModel.ets @@ -16,7 +16,7 @@ import { Want, common } from '@kit.AbilityKit'; import { BusinessError } from '@kit.BasicServicesKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; -import { Logger } from '@ohos/base'; +import { Logger } from 'base'; interface ConversationDataInterface { name: Resource diff --git a/features/home/src/main/ets/views/Contacts/ContactsItem.ets b/features/home/src/main/ets/views/Contacts/ContactsItem.ets index de3b104560524f32bbdf7de555e68b501ad9858e..daa40aa2915fa0d286ac91bed3cf057d50958cd8 100755 --- a/features/home/src/main/ets/views/Contacts/ContactsItem.ets +++ b/features/home/src/main/ets/views/Contacts/ContactsItem.ets @@ -13,13 +13,13 @@ * limitations under the License. */ -import { BaseConstants, BreakpointConstants } from '@ohos/base'; +import { BaseConstants, BreakpointConstants } from 'base'; @Component export struct ContactsItem { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; - private name?: Resource; - private icon?: Resource; + name?: Resource; + icon?: Resource; build() { Flex({ alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) { diff --git a/features/home/src/main/ets/views/Conversation/ConversationDetailBottom.ets b/features/home/src/main/ets/views/Conversation/ConversationDetailBottom.ets index 0ba5dc1173d3afedd9199ae51df37ae2468ddb53..29dab73ecd060155f41a5da670fb152486bfb90c 100755 --- a/features/home/src/main/ets/views/Conversation/ConversationDetailBottom.ets +++ b/features/home/src/main/ets/views/Conversation/ConversationDetailBottom.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { BaseConstants } from '@ohos/base/src/main/ets/constants/BaseConstants'; -import { StandardIcon } from '@ohos/base/src/main/ets/views/image/StandardIcon'; +import { BaseConstants } from 'base/src/main/ets/constants/BaseConstants'; +import { StandardIcon } from 'base/src/main/ets/views/image/StandardIcon'; import { HomeConstants } from '../../constants/HomeConstants'; @Component diff --git a/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets b/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets index 2bb697af1c89fe6b8bad4d1d6f07a21c5a9b9985..d46f2f01b335eaf1276010261636c8a9b192e176 100755 --- a/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets +++ b/features/home/src/main/ets/views/Conversation/ConversationDetailItem.ets @@ -20,10 +20,10 @@ import { MessageBubble } from '../MessageBubble'; export default struct ConversationDetailItem { @Link currentFeatureIndex: number; @Link receivedName: string; - private isReceived: boolean = !HomeConstants.IS_RECEIVED; - private content: ResourceStr = ''; - private isAppletMsg?: boolean; - private isDocumentMsg?: boolean; + isReceived: boolean = !HomeConstants.IS_RECEIVED; + content: ResourceStr = ''; + isAppletMsg?: boolean; + isDocumentMsg?: boolean; build() { Flex({ justifyContent: FlexAlign.End, alignItems: ItemAlign.End }) { diff --git a/features/home/src/main/ets/views/Conversation/ConversationDetailNone.ets b/features/home/src/main/ets/views/Conversation/ConversationDetailNone.ets index 975034bb043ee8e323d7259bc13472162468b3d5..f8c0bec2efc851ce9bda962a4af5d7f69ba1f626 100755 --- a/features/home/src/main/ets/views/Conversation/ConversationDetailNone.ets +++ b/features/home/src/main/ets/views/Conversation/ConversationDetailNone.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { BaseConstants } from '@ohos/base/src/main/ets/constants/BaseConstants'; +import { BaseConstants } from 'base/src/main/ets/constants/BaseConstants'; import { deviceInfo } from '@kit.BasicServicesKit'; @Component diff --git a/features/home/src/main/ets/views/Conversation/ConversationDetailTopSearch.ets b/features/home/src/main/ets/views/Conversation/ConversationDetailTopSearch.ets index ad3d72a2fb74080cfd71691577b5a973a102e729..a971d280636968d3b662cf228b33629f4d482a91 100755 --- a/features/home/src/main/ets/views/Conversation/ConversationDetailTopSearch.ets +++ b/features/home/src/main/ets/views/Conversation/ConversationDetailTopSearch.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { BaseConstants, BreakpointConstants, StandardIcon } from '@ohos/base'; +import { BaseConstants, BreakpointConstants, StandardIcon } from 'base'; import { HomeConstants } from '../../constants/HomeConstants'; import { deviceInfo } from '@kit.BasicServicesKit'; diff --git a/features/home/src/main/ets/views/Conversation/ConversationItem.ets b/features/home/src/main/ets/views/Conversation/ConversationItem.ets index 8ecb5438ff9bf93024d943fc9a4b22b6497c73b7..38a3fef257c9f89031723bcbbba8e812fe968092 100755 --- a/features/home/src/main/ets/views/Conversation/ConversationItem.ets +++ b/features/home/src/main/ets/views/Conversation/ConversationItem.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { BaseConstants, BreakpointConstants } from '@ohos/base'; +import { BaseConstants, BreakpointConstants } from 'base'; import { HomeConstants } from '../../constants/HomeConstants'; @Component diff --git a/features/home/src/main/ets/views/HomeTab.ets b/features/home/src/main/ets/views/HomeTab.ets index 2a94b776dc3e0baad1368ac08b56cc9582b22b2c..869bd3099aeabfb3b9fc4e289e7f3ebd71a84b16 100755 --- a/features/home/src/main/ets/views/HomeTab.ets +++ b/features/home/src/main/ets/views/HomeTab.ets @@ -13,9 +13,8 @@ * limitations under the License. */ -import { BaseConstants, BreakpointConstants } from '@ohos/base'; +import { BaseConstants, BreakpointConstants, TabInfoModel } from 'base'; import { ButtonInfo } from '../viewmodel/BottomTabViewModel'; -import { TabInfoModel } from '@ohos/base'; import { HomeConstants } from '../constants/HomeConstants'; @Component diff --git a/features/home/src/main/ets/views/MessageBubble.ets b/features/home/src/main/ets/views/MessageBubble.ets index 5e4c77d67b289473843f20825958a5f00f549b91..65f6aa72635e08e988581ceee101104e12976917 100755 --- a/features/home/src/main/ets/views/MessageBubble.ets +++ b/features/home/src/main/ets/views/MessageBubble.ets @@ -13,19 +13,19 @@ * limitations under the License. */ -import { BaseConstants, BreakpointConstants, IntroduceText, NormalText } from '@ohos/base' +import { BaseConstants, BreakpointConstants, IntroduceText, NormalText } from 'base' import { HomeConstants } from '../constants/HomeConstants'; -import { ConversationDataInterface, ConversationListData } from '../viewmodel/ConversationViewModel'; +import { ConversationListData } from '../viewmodel/ConversationViewModel'; @Component export struct MessageBubble { @StorageProp('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; @Link receivedName: Resource; @Link currentFeatureIndex: number; - private isReceived: boolean = !HomeConstants.IS_RECEIVED; - private content: ResourceStr = ""; - private isAppletMsg?: boolean; - private isDocumentMsg?: boolean; + isReceived: boolean = !HomeConstants.IS_RECEIVED; + content: ResourceStr = ""; + isAppletMsg?: boolean; + isDocumentMsg?: boolean; avatar1: Resource = $r('app.media.avatar1'); avatar2: Resource = $r('app.media.avatar7'); diff --git a/features/home/src/main/ets/views/common/HomeTopSearch.ets b/features/home/src/main/ets/views/common/HomeTopSearch.ets index 9f7f8293f50a1818b35b35dd757cf56e05d7e651..2fe1d6568f691a0a23881da12570099acc7f0cab 100755 --- a/features/home/src/main/ets/views/common/HomeTopSearch.ets +++ b/features/home/src/main/ets/views/common/HomeTopSearch.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { BaseConstants, BreakpointConstants, StandardIcon } from '@ohos/base'; +import { BaseConstants, BreakpointConstants, StandardIcon } from 'base'; import { HomeConstants } from '../../constants/HomeConstants'; import { deviceInfo } from '@kit.BasicServicesKit'; diff --git a/features/home/src/main/resources/base/element/string.json b/features/home/src/main/resources/base/element/string.json index ff3f96e115489a2f26626dc7e05d561533b2d030..6779a26430fd85b3a8ff3859ddbc157eb0f74336 100755 --- a/features/home/src/main/resources/base/element/string.json +++ b/features/home/src/main/resources/base/element/string.json @@ -172,6 +172,10 @@ "name": "sport_club", "value": "运动俱乐部" }, + { + "name": "FF_take_tea", + "value": "芬芬邀请你喝奶茶" + }, { "name": "happy_thing", "value": "哈哈,今天有什么喜事说来听听" diff --git a/features/home/src/main/resources/zh_CN/element/string.json b/features/home/src/main/resources/zh_CN/element/string.json index 0351e1c2f60bd4e98ad1af17ec116c5f33565195..74ad5ff7b9ce0dd894ee2b6673d9feef780dc743 100644 --- a/features/home/src/main/resources/zh_CN/element/string.json +++ b/features/home/src/main/resources/zh_CN/element/string.json @@ -172,6 +172,10 @@ "name": "sport_club", "value": "运动俱乐部" }, + { + "name": "FF_take_tea", + "value": "芬芬邀请你喝奶茶" + }, { "name": "happy_thing", "value": "哈哈,今天有什么喜事说来听听" diff --git a/features/socialCircle/oh-package.json5 b/features/socialCircle/oh-package.json5 index 1f9349c7376462d959d34b59b14dc2f010077be9..ba8f6ffa6c6a6bf09f4642ef9c832d14fd48a26e 100755 --- a/features/socialCircle/oh-package.json5 +++ b/features/socialCircle/oh-package.json5 @@ -8,6 +8,6 @@ "version": "1.0.0", "dynamicDependencies": {}, "dependencies": { - "@ohos/base": "file:../../common/base" + "base": "file:../../common/base" } } diff --git a/features/socialCircle/src/main/ets/pages/Index.ets b/features/socialCircle/src/main/ets/pages/Index.ets index d09626b1b4d683b69bc83d66c61922530d50a2ac..847557667bbdbca3de0efb895daefec322b5c7c1 100755 --- a/features/socialCircle/src/main/ets/pages/Index.ets +++ b/features/socialCircle/src/main/ets/pages/Index.ets @@ -13,12 +13,11 @@ * limitations under the License. */ -import { BreakpointConstants, BaseConstants } from '@ohos/base'; +import { BreakpointConstants, BaseConstants } from 'base'; import getSocialCircleList, { PictureConstants } from '../constants/PictureConstants'; import { PictureArrayInterface, PictureInterface } from '../viewmodel/CommonViewModel'; import { deviceInfo } from '@kit.BasicServicesKit'; -@Entry @Component export struct SocialCircle { @StorageLink('currentBreakpoint') currentBreakpoint: string = BreakpointConstants.BREAKPOINT_SM; diff --git a/products/phone/oh-package.json5 b/products/phone/oh-package.json5 index 9a65aaf201b4c5bea6567737c5ed9654dd1dd63c..1f824dbf8eee4293a7b4acf8a4ee90e16e52612d 100755 --- a/products/phone/oh-package.json5 +++ b/products/phone/oh-package.json5 @@ -8,7 +8,7 @@ "version": "1.0.0", "dynamicDependencies": {}, "dependencies": { - "@ohos/base": "file:../../common/base", - "@ohos/home": "file:../../features/home" + "base": "file:../../common/base", + "home": "file:../../features/home" } } diff --git a/products/phone/src/main/ets/entryability/EntryAbility.ets b/products/phone/src/main/ets/entryability/EntryAbility.ets index c65dc56bce0e0d6246a55d8312ddd9d4ed3f7612..818263ac2f9b4e4e2b79cbd8219ecce156503df0 100755 --- a/products/phone/src/main/ets/entryability/EntryAbility.ets +++ b/products/phone/src/main/ets/entryability/EntryAbility.ets @@ -17,7 +17,7 @@ import { UIAbility } from '@kit.AbilityKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; import { display, KeyboardAvoidMode, window } from '@kit.ArkUI'; import { BusinessError } from '@kit.BasicServicesKit'; -import { BaseConstants, BreakpointConstants } from '@ohos/base/Index'; +import { BaseConstants, BreakpointConstants } from 'base/Index'; import { deviceInfo } from '@kit.BasicServicesKit'; export default class EntryAbility extends UIAbility { @@ -61,7 +61,14 @@ export default class EntryAbility extends UIAbility { } private updateBreakpoint(windowWidth: number): void { - let windowWidthVp = windowWidth / display.getDefaultDisplaySync().densityPixels; + let windowWidthVp = 0; + try { + windowWidthVp = windowWidth / display.getDefaultDisplaySync().densityPixels; + } catch (error) { + let err = error as BusinessError; + hilog.error(0x0000, 'EntryAbility', `getDefaultDisplaySync failed. code=${err.code}, message=${err.message}`); + return; + } let curBp: string = ''; if (windowWidthVp < BreakpointConstants.BREAKPOINT_SCOPE[2]) { curBp = BreakpointConstants.BREAKPOINT_SM; diff --git a/products/phone/src/main/ets/pages/Index.ets b/products/phone/src/main/ets/pages/Index.ets index bc56001f2e22f490d472d06a26ace93ac873afc7..4c735f983a00425fe611397a276c20ca2b8731f3 100755 --- a/products/phone/src/main/ets/pages/Index.ets +++ b/products/phone/src/main/ets/pages/Index.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { Home } from '@ohos/home'; -import { BaseConstants, BreakpointConstants } from '@ohos/base'; +import { Home } from 'home'; +import { BaseConstants, BreakpointConstants } from 'base'; @Entry @Component