diff --git a/README.en.md b/README.en.md index a61a50bbe854889d6c2ce88c7cbdb11d9723bd1a..714c463eddc88dc684e1e2372e9125021018e02f 100644 --- a/README.en.md +++ b/README.en.md @@ -14,7 +14,7 @@ The figure shows the effect on the foldable phone: The figure shows the effect on the tablet: -![](screenshots/device/pad.en.png) +![](screenshots/device/tablet.en.png) ## Concepts @@ -40,7 +40,7 @@ N/A. ## Constraints -1. The sample app is supported only on Huawei phones running the standard system. +1. The sample app is supported only on Huawei phones, tablets, PC/2in1 running the standard system. 2. HarmonyOS: HarmonyOS 5.0.5 Release or later -3. DevEco Studio: DevEco Studio 5.0.5 Release or later -4. HarmonyOS SDK: HarmonyOS 5.0.5 Release SDK or later +3. DevEco Studio: DevEco Studio 6.0.0 Release or later +4. HarmonyOS SDK: HarmonyOS 6.0.0 Release SDK or later diff --git a/README.md b/README.md index fc65430fc96823dcc80d5332bb61e216a358fa38..aec8629582ab0db1200d2ec073e1a243caa59a01 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ 平板运行效果图如下： -![](screenshots/device/pad.png) +![](screenshots/device/tablet.png) ## 相关概念 @@ -39,7 +39,7 @@ ## 约束与限制 -1. 本示例仅支持标准系统上运行，支持设备：华为手机。 +1. 本示例仅支持标准系统上运行，支持设备：华为手机、平板、PC/2in1。 2. HarmonyOS系统：HarmonyOS 5.0.5 Release及以上。 -3. DevEco Studio版本：DevEco Studio 5.0.5 Release及以上。 -4. HarmonyOS SDK版本：HarmonyOS 5.0.5 Release SDK及以上。 +3. DevEco Studio版本：DevEco Studio 6.0.0 Release及以上。 +4. HarmonyOS SDK版本：HarmonyOS 6.0.0 Release SDK及以上。 diff --git a/build-profile.json5 b/build-profile.json5 index 8b0e8335e03385165a968162136ce72797999a41..463291176976f41240b3428247d40b8a48d0b142 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -6,7 +6,7 @@ "name": "default", "signingConfig": "default", "compatibleSdkVersion": "5.0.5(17)", - "targetSdkVersion": "5.0.5(17)", + "targetSdkVersion": "6.0.0(20)", "runtimeOS": "HarmonyOS", "buildOption": { "strictMode": { diff --git a/commons/base/src/main/resources/en_US/element/string.json b/commons/base/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..bd5f320783d1fc0ce9ef74bd4dfaceba4551ab73 --- /dev/null +++ b/commons/base/src/main/resources/en_US/element/string.json @@ -0,0 +1,328 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "today_hot_search", + "value": "Today" + }, + { + "name": "news_hot_search", + "value": "Important news" + }, + { + "name": "same_city_hot_search", + "value": "City" + }, + { + "name": "entertainment_hot_search", + "value": "Entertainment" + }, + { + "name": "food_hot_search", + "value": "Food" + }, + { + "name": "name_1", + "value": "Mike" + }, + { + "name": "name_2", + "value": "John" + }, + { + "name": "name_3", + "value": "Flying" + }, + { + "name": "name_4", + "value": "Lake" + }, + { + "name": "name_5", + "value": "Uncle D" + }, + { + "name": "name_6", + "value": "CoCo" + }, + { + "name": "name_7", + "value": "Fly Fish" + }, + { + "name": "name_8", + "value": "Master Wang" + }, + { + "name": "name_9", + "value": "Snow Town" + }, + { + "name": "name_10", + "value": "Traveler" + }, + { + "name": "name_11", + "value": "Lv Town" + }, + { + "name": "author_type_1", + "value": "environment" + }, + { + "name": "author_type_2", + "value": "technology" + }, + { + "name": "author_type_3", + "value": "travel" + }, + { + "name": "author_type_4", + "value": "photography" + }, + { + "name": "content_1", + "value": "Getting close to the sea, understanding the sea, and experiencing the voice of the sea, the sea naturally resonates with you. There is no need to force or search hard. " + }, + { + "name": "content_2", + "value": "Wild animals and pet animals, cute animals are loved by everyone. Wild animals and pet animals, cute animals are loved by everyone. Wild animals and pet animals, cute animals are loved by everyone." + }, + { + "name": "content_3", + "value": "In the morning, the sun shines on the earth, creating a warm atmosphere. In the morning, the sun shines on the earth, creating a warm atmosphere. In the morning, the sun shines on the earth, creating a warm atmosphere. In the morning, the sun shines on the earth, creating a warm atmosphere. In the morning, the sun shines on the earth, creating a warm atmosphere." + }, + { + "name": "content_4", + "value": "Birds, like notes flying from the heart of the earth. A whirlwind rose from the fields. The bird has a pair of gem like small eyes embedded on both sides of its head, a long mouth, and a small nose above it." + }, + { + "name": "content_5", + "value": "The mountains standing on both sides of the river, like silent monks, gaze into the distance. The mountains standing on both sides of the river, like silent monks, gaze into the distance." + }, + { + "name": "content_6", + "value": "Nine mountains are like mountains, connected and undulating. The winding and steep solid wood boardwalk on the mountainside, like strands of ribbons wrapped around green mountains and rivers, becomes a unique and beautiful scenery; In the deep valley, mysterious clouds and mist rise." + }, + { + "name": "content_7", + "value": "The photo is taken very well! like" + }, + { + "name": "content_8", + "value": "Great, I've learned." + }, + { + "name": "content_9", + "value": "This set of pictures is full of Chinese style" + }, + { + "name": "content_10", + "value": "Great！" + }, + { + "name": "content_11", + "value": "Great shot! I love it!" + }, + { + "name": "content_12", + "value": "The beautiful scenery is intoxicating." + }, + { + "name": "content_13", + "value": "Looks good, looking forward to updates" + }, + { + "name": "content_14", + "value": "wildlife" + }, + { + "name": "content_15", + "value": "architectural history" + }, + { + "name": "content_16", + "value": "fog surrounds the green mountains" + }, + { + "name": "content_17", + "value": "dancer" + }, + { + "name": "content_18", + "value": "universe" + }, + { + "name": "content_19", + "value": "european architecture..." + }, + { + "name": "content_20", + "value": "magical architecture..." + }, + { + "name": "content_21", + "value": "small World..." + }, + { + "name": "content_22", + "value": "melodious music" + }, + { + "name": "content_23", + "value": "vast universe" + }, + { + "name": "content_24", + "value": "spiritual world" + }, + { + "name": "content_25", + "value": "breath of summer " + }, + { + "name": "content_26", + "value": "the flowers bloomed." + }, + { + "name": "content_27", + "value": "experience of travel" + }, + { + "name": "content_28", + "value": "guitar" + }, + { + "name": "content_29", + "value": "riverside breeze" + }, + { + "name": "content_30", + "value": "calm down" + }, + { + "name": "content_31", + "value": "red apples" + }, + { + "name": "content_32", + "value": "healthy vegetables" + }, + { + "name": "content_33", + "value": "sweet taste" + }, + { + "name": "time_position_1", + "value": "10 minutes·from Shanghai" + }, + { + "name": "time_position_2", + "value": "10-23·from Shanghai" + }, + { + "name": "time_position_3", + "value": "10-22·from Shanghai" + }, + { + "name": "time_position_4", + "value": "10-21·from Shanghai" + }, + { + "name": "time_position_5", + "value": "10-19·from Shanghai" + }, + { + "name": "time_position_6", + "value": "10-13·from Shanghai" + }, + { + "name": "sub_content_1", + "value": "river：great//@forest：love it" + }, + { + "name": "title_1", + "value": "wildlife" + }, + { + "name": "title_2", + "value": "building" + }, + { + "name": "title_3", + "value": "tea" + }, + { + "name": "title_4", + "value": "dancers" + }, + { + "name": "title_5", + "value": "universe" + }, + { + "name": "title_6", + "value": "humanities" + }, + { + "name": "title_7", + "value": "magical architecture" + }, + { + "name": "title_8", + "value": "the mystery of life" + }, + { + "name": "title_9", + "value": "the beauty of art" + }, + { + "name": "title_10", + "value": "space" + }, + { + "name": "title_11", + "value": "cultivation" + }, + { + "name": "title_12", + "value": "summer " + }, + { + "name": "title_13", + "value": "attraction" + }, + { + "name": "title_14", + "value": "pets" + }, + { + "name": "title_15", + "value": "guitar" + }, + { + "name": "title_16", + "value": "sounds" + }, + { + "name": "title_17", + "value": "work" + }, + { + "name": "title_18", + "value": "supermarket" + }, + { + "name": "title_19", + "value": "vegetable " + }, + { + "name": "title_20", + "value": "childhood" + } + ] +} \ No newline at end of file diff --git a/commons/base/src/main/resources/en_US/media/ic_state_favor.png b/commons/base/src/main/resources/en_US/media/ic_state_favor.png new file mode 100644 index 0000000000000000000000000000000000000000..caa487f045026f20b968771aa9edbdda660b88c3 Binary files /dev/null and b/commons/base/src/main/resources/en_US/media/ic_state_favor.png differ diff --git a/commons/base/src/main/resources/en_US/media/ic_state_fire.png b/commons/base/src/main/resources/en_US/media/ic_state_fire.png new file mode 100644 index 0000000000000000000000000000000000000000..c99c32128969aa560f60acb83e5754b038ae432e Binary files /dev/null and b/commons/base/src/main/resources/en_US/media/ic_state_fire.png differ diff --git a/commons/base/src/main/resources/en_US/media/ic_state_new.png b/commons/base/src/main/resources/en_US/media/ic_state_new.png new file mode 100644 index 0000000000000000000000000000000000000000..7da976596284c6839762a5ccf29e3e29cedfff72 Binary files /dev/null and b/commons/base/src/main/resources/en_US/media/ic_state_new.png differ diff --git a/features/detail/src/main/ets/view/CommentBarView.ets b/features/detail/src/main/ets/view/CommentBarView.ets index 8e336717f7a377df599d6100a87c03b22a83ee2f..be404bccafbe105b45978b613797b5ca01165a96 100644 --- a/features/detail/src/main/ets/view/CommentBarView.ets +++ b/features/detail/src/main/ets/view/CommentBarView.ets @@ -35,7 +35,7 @@ export struct CommentBarView { Row() { if (!this.isMouseClick) { Row() { - Text('写评论') + Text('comments') // [StartExclude comment_bar_view] .fontSize($r('app.float.comment_context_fs')) .fontWeight(FontWeight.Normal) @@ -86,7 +86,7 @@ export struct CommentBarView { // [EndExclude comment_bar_view] } else { Row() { - TextArea({ placeholder: '写评论', text: this.content }) + TextArea({ placeholder: 'comments', text: this.content }) // [StartExclude comment_bar_view] .fontColor(this.isDarkMode ? $r('app.color.font_color_dark') : $r('app.color.font_color_normal')) .backgroundColor(this.isDarkMode ? $r('app.color.comment_context_bgc_dark') : diff --git a/features/detail/src/main/resources/en_US/element/string.json b/features/detail/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..a594eccc9ca71b169288f838f2974760ded2babe --- /dev/null +++ b/features/detail/src/main/resources/en_US/element/string.json @@ -0,0 +1,36 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "detail_write_comment", + "value": "write a comment" + }, + { + "name": "comment_list_title", + "value": "comment" + }, + { + "name": "card_detail_title", + "value": "detail" + }, + { + "name": "blog_follow", + "value": "follow" + }, + { + "name": "author_type_name", + "value": "original poster" + }, + { + "name": "replay", + "value": "replay" + }, + { + "name": "read_all_replay", + "value": "view all replies" + } + ] +} \ No newline at end of file diff --git a/features/hot/src/main/ets/view/FoundView.ets b/features/hot/src/main/ets/view/FoundView.ets index e900a8862cc296c11a2a6afaf4d1d40b0595d976..7518b678c1354a77151c981b030b70926a4c0d09 100644 --- a/features/hot/src/main/ets/view/FoundView.ets +++ b/features/hot/src/main/ets/view/FoundView.ets @@ -141,7 +141,6 @@ export struct FoundView { .borderRadius(this.currentBreakpoint === 'lg' ? '8vp' : '0vp') .backgroundColor('#FFFFFF') .margin(this.currentBreakpoint === 'lg' ? '6vp' : '0vp') - // [EndExclude foundView] } }, (item: CardItem, index: number) => index + JSON.stringify(item)) diff --git a/features/hot/src/main/resources/base/element/string.json b/features/hot/src/main/resources/base/element/string.json index 9bb2580a874b20e96b9692f9b097a76b5ae2cd55..c482f647861bf9ec6e1129c744b6be84879d1e08 100644 --- a/features/hot/src/main/resources/base/element/string.json +++ b/features/hot/src/main/resources/base/element/string.json @@ -6,159 +6,159 @@ }, { "name": "placeholder", - "value": "搜索或输入网址" + "value": "search" }, { "name": "read_total_rank", - "value": "查看完整榜单" + "value": "View the complete list" }, { "name": "follow", - "value": "关注" + "value": "Follow" }, { "name": "found", - "value": "发现" + "value": "Found" }, { "name": "read_total", - "value": "查看全部" + "value": "Total" }, { "name": "more", - "value": "更多" + "value": "More" }, { "name": "follow_list_name_1", - "value": "摄影视觉" + "value": "photo" }, { "name": "follow_list_date_1", - "value": "2小时前·发布了动态" + "value": "2 hours·public" }, { "name": "follow_list_type_1", - "value": "登山" + "value": "mountaineering" }, { "name": "follow_list_subtype_1", - "value": "旅游" + "value": "travel" }, { "name": "follow_list_content_1", - "value": "在山顶，你会觉得山再巍峨，人也能把它征服，而此时的…" + "value": "The mountain is very high" }, { "name": "follow_list_name_2", - "value": "大自然的风采" + "value": "The charm of nature" }, { "name": "follow_list_date_2", - "value": "11小时前·发布了动态" + "value": "11 hours·public" }, { "name": "follow_list_name_3", - "value": "山水" + "value": "water" }, { "name": "follow_list_date_3", - "value": "3小时前·发布了动态" + "value": "3 hours·public" }, { "name": "follow_list_name_4", - "value": "最科技评测" + "value": "evaluation" }, { "name": "follow_list_date_4", - "value": "刚刚" + "value": "just now" }, { "name": "follow_list_name_5", - "value": "故宫画家" + "value": "painter" }, { "name": "follow_list_name_6", - "value": "国学展览" + "value": "classics" }, { "name": "follow_list_date_6", - "value": "8小时前·发布了动态" + "value": "8 hours·public" }, { "name": "follow_list_name_7", - "value": "自然社区" + "value": "nature" }, { "name": "follow_list_name_8", - "value": "摄影视效" + "value": "effect" }, { "name": "follow_list_date_8", - "value": "13小时前·发布了动态" + "value": "13 hours·public" }, { "name": "follow_list_name_9", - "value": "国学探究" + "value": "chinese classics" }, { "name": "follow_detail_name_1", - "value": "全部关注" + "value": "total" }, { "name": "follow_detail_name_2", - "value": "大自然的风采" + "value": "nature" }, { "name": "follow_detail_name_3", - "value": "科技评测" + "value": "science" }, { "name": "follow_detail_name_4", - "value": "风景画家" + "value": "scenery" }, { "name": "follow_detail_name_5", - "value": "自然社区" + "value": "society" }, { "name": "follow_detail_name_6", - "value": "自然社区" + "value": "society" }, { "name": "follow_detail_content_1", - "value": "摄影/10粉丝" + "value": "photography/10 followers" }, { "name": "follow_detail_content_2", - "value": "摄影/5万粉丝" + "value": "photography/50000 followers" }, { "name": "follow_detail_content_3", - "value": "20万粉丝" + "value": "200,000 followers" }, { "name": "follow_detail_content_4", - "value": "快速评测" + "value": "evaluation" }, { "name": "follow_detail_content_5", - "value": "爱山爱水" + "value": "mountains" }, { "name": "follow_detail_content_6", - "value": "国学认证" + "value": "chinese classics" }, { "name": "follow_detail_content_7", - "value": "3万粉丝" + "value": "30000 followers" }, { "name": "follow_detail_content_8", - "value": "2小时前发布了..." + "value": "2 hours ago" }, { "name": "follow_title_content", - "value": "的动态" + "value": "public" } ] } \ No newline at end of file diff --git a/features/picture/src/main/resources/en_US/element/string.json b/features/picture/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..ccf10c3a553cf20ecbf3dc83ce2146d5dfa6dff7 --- /dev/null +++ b/features/picture/src/main/resources/en_US/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "above", + "value": "Previous" + }, + { + "name": "next", + "value": "Next" + } + ] +} \ No newline at end of file diff --git a/features/rank/src/main/resources/en_US/element/string.json b/features/rank/src/main/resources/en_US/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..aaf57990711c9de0c89f113bd29d1d920758281b --- /dev/null +++ b/features/rank/src/main/resources/en_US/element/string.json @@ -0,0 +1,16 @@ +{ + "string": [ + { + "name": "shared_desc", + "value": "description" + }, + { + "name": "rank_title", + "value": "Hot Search List" + }, + { + "name": "ran_sub_title", + "value": "The latest and hottest events are all here" + } + ] +} \ No newline at end of file diff --git a/hvigor/hvigor-config.json5 b/hvigor/hvigor-config.json5 index f70ecd4112d94f9aa555adf898d53f18bf58f3e9..03377a956ba7a27d9afab0e284166613e7999fcb 100644 --- a/hvigor/hvigor-config.json5 +++ b/hvigor/hvigor-config.json5 @@ -1,5 +1,5 @@ { - "modelVersion": "5.0.0", + "modelVersion": "6.0.0", "dependencies": { } } \ No newline at end of file diff --git a/oh-package.json5 b/oh-package.json5 index 67579502e26f99f3950665835c6e1cb22a188458..a87f158dab8a8474da736307e29a4b0e99c69e1e 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -1,5 +1,5 @@ { - "modelVersion": "5.0.0", + "modelVersion": "6.0.0", "license": "", "devDependencies": { diff --git a/screenshots/device/foldable.en.png b/screenshots/device/foldable.en.png index f8821edb46a1adc8bf9180e00feed2e9f428eaaf..f54d3e36969834896ca93b6991df8bf7bb0f4bcf 100644 Binary files a/screenshots/device/foldable.en.png and b/screenshots/device/foldable.en.png differ diff --git a/screenshots/device/foldable.png b/screenshots/device/foldable.png index 2c39bdfc05d2a828a710a6ee3e8851a86aa3d631..e9a379a3e5eb8a56b9d48434d0d50439446a7f4c 100644 Binary files a/screenshots/device/foldable.png and b/screenshots/device/foldable.png differ diff --git a/screenshots/device/pad.en.png b/screenshots/device/pad.en.png deleted file mode 100644 index 4344d9f87a228805af4325602c59b07684903781..0000000000000000000000000000000000000000 Binary files a/screenshots/device/pad.en.png and /dev/null differ diff --git a/screenshots/device/pad.png b/screenshots/device/pad.png deleted file mode 100644 index b56984c00f6664c9cf44821a8535553dc31439d8..0000000000000000000000000000000000000000 Binary files a/screenshots/device/pad.png and /dev/null differ diff --git a/screenshots/device/phone.en.png b/screenshots/device/phone.en.png index f9b4b6e98e8ef2a29d3b452fde326b2e9d7809fe..305af7d58c00419a0aa61f1a27e93de82ae80f07 100644 Binary files a/screenshots/device/phone.en.png and b/screenshots/device/phone.en.png differ diff --git a/screenshots/device/phone.png b/screenshots/device/phone.png index 856563dc0760f92188a244366729c9cb6310cc3a..9bd8281c31145874c0a0b6fc6ae343b5038bd0a4 100644 Binary files a/screenshots/device/phone.png and b/screenshots/device/phone.png differ diff --git a/screenshots/device/tablet.en.png b/screenshots/device/tablet.en.png new file mode 100644 index 0000000000000000000000000000000000000000..998597fd7545980a4b3b9f900ebbfb9efa1b8ebe Binary files /dev/null and b/screenshots/device/tablet.en.png differ diff --git a/screenshots/device/tablet.png b/screenshots/device/tablet.png new file mode 100644 index 0000000000000000000000000000000000000000..c68ca93b7b01ea4155eaa86a07f565a073aba1bb Binary files /dev/null and b/screenshots/device/tablet.png differ