diff --git a/README.en.md b/README.en.md new file mode 100644 index 0000000000000000000000000000000000000000..643b211813ee39cb3c41251311cf50c706ac9d9c --- /dev/null +++ b/README.en.md @@ -0,0 +1,45 @@ +# Community Comments + +### Introduction + +Based on the adaptive and responsive layout, implement community comment pages with one-time development for multi-device deployment. + +The figure shows the effect on the mobile phone: + +![](screenshots/device/phone.en.png) + +The figure shows the effect on the foldable phone: + +![](screenshots/device/foldable.en.png) + +The figure shows the effect on the tablet: + +![](screenshots/device/pad.en.png) + +### Concepts + +- One-time development for multi-device deployment: It enables you to develop and release one set of project code for deployment on multiple devices as demanded. This feature enables you to efficiently develop applications that are compatible with multiple devices while providing distributed user experiences for cross-device transferring, migration, and collaboration. +- Adaptive layout: When the size of an external container changes, elements can automatically change based on the relative relationship to adapt to the external container. Relative relationships include the proportion, fixed aspect ratio, and display priority. +- Responsive layout: When the size of an external container changes, elements can automatically change based on the breakpoints, grids, or specific features (such as the screen direction and window width and height) to adapt to the external container. +- GridRow: It is a container that is used in a grid layout, together with its child component ****. +- GridCol: It is a container that must be used as a child component of the **** container. + +### Permissions + +N/A. + +### How to Use + +1. Install and open an app on a mobile phone, foldable phone, or tablet. The responsive layout and adaptive layout are used to display different effects on the app pages over different devices. +2. Tap home, hot topics, message, or mine tab at the bottom to switch to the corresponding tab page. By default, the message tab page is displayed. +3. Tap a category of hot searches to switch to the corresponding list. +4. Tap the button for viewing complete rankings. The hot search rankings page is displayed. You can swipe up, down, left, or right on the hot search rankings page and tap the back button to return to the hot topics page. +5. Tap an image on the hot topics page to go to the image details page. Only images are displayed on mobile phones, while the content and comments are displayed with images on foldable phones and tablets. Tap the image or the back button to return to the hot topics page. +6. Tap the widget body on the hot topics page to go to the details page. The text area on the details page can be zoomed in or out with two fingers. You can tap the button in the upper right corner of the foldable phone to switch between the left-right layout and top-down layout. Tap the back button to return to the hot topics page. + +### Constraints + +1. The sample app is supported only on Huawei phones running the standard system. +2. HarmonyOS: HarmonyOS NEXT Developer Beta 1 or later +3. DevEco Studio: DevEco Studio NEXT Developer Beta 1 or later +4. HarmonyOS SDK: HarmonyOS NEXT Developer Beta 1 SDK or later diff --git a/build-profile.json5 b/build-profile.json5 index 6ac8dea98076f3316fc795fa2adc44bd52772eae..d55e553f66c8efd3a7b8c1f2c23f80b6e82817ee 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -1,7 +1,6 @@ { "app": { - "signingConfigs": [ - ], + "signingConfigs": [], "products": [ { "name": "default", diff --git a/commons/base/BuildProfile.ets b/commons/base/BuildProfile.ets deleted file mode 100644 index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..0000000000000000000000000000000000000000 --- a/commons/base/BuildProfile.ets +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Use these variables when you tailor your ArkTS code. They must be of the const type. - */ -export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; -export const TARGET_NAME = 'default'; - -/** - * BuildProfile Class is used only for compatibility purposes. - */ -export default class BuildProfile { - static readonly HAR_VERSION = HAR_VERSION; - static readonly BUILD_MODE_NAME = BUILD_MODE_NAME; - static readonly DEBUG = DEBUG; - static readonly TARGET_NAME = TARGET_NAME; -} \ No newline at end of file diff --git a/commons/base/obfuscation-rules.txt b/commons/base/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/commons/base/obfuscation-rules.txt +++ b/commons/base/obfuscation-rules.txt @@ -15,4 +15,8 @@ # Keep options: # -keep-property-name: specifies property names that you want to keep -# -keep-global-name: specifies names that you want to keep in the global scope \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/commons/base/src/main/ets/constants/CommonConstants.ets b/commons/base/src/main/ets/constants/CommonConstants.ets index 643aa362f44728a3002eb22475a061107c191949..bfeef1603b31ca78bbf497da6d469bd55e9bb57f 100644 --- a/commons/base/src/main/ets/constants/CommonConstants.ets +++ b/commons/base/src/main/ets/constants/CommonConstants.ets @@ -40,7 +40,9 @@ export class CommonConstants { /** * Rank title List. */ - static readonly RANK_TITLE_LIST: string[] = ['今日热搜', '要闻热搜', '同城热搜', '娱乐热搜', '美食热搜']; + static readonly RANK_TITLE_LIST: ResourceStr[] = + [$r('app.string.today_hot_search'), $r('app.string.news_hot_search'), $r('app.string.same_city_hot_search'), + $r('app.string.entertainment_hot_search'), $r('app.string.food_hot_search')]; /** * Device 2in1. diff --git a/commons/base/src/main/ets/model/CardListModel.ets b/commons/base/src/main/ets/model/CardListModel.ets index de35f11d3ac93193bfa3a81250a5495314fc7270..d5a0114cfce8d6fb99beede76fe5c7ff00eb981d 100644 --- a/commons/base/src/main/ets/model/CardListModel.ets +++ b/commons/base/src/main/ets/model/CardListModel.ets @@ -23,85 +23,68 @@ export interface CardItemInterface { export const CARD_LIST: CardItemInterface[] = [ { icon: $r('app.media.ic_icon_1'), - name: '小鱼儿', - authorType: '环保领域作者', - content: '亲近大海,领悟海,体会到了海的心声,海自然与你共鸣,无需可以强求,也无需费力搜寻,海,始终都会以潮声与你相亲,已其海色伴你舒适。' + - '亲近大海,领悟海,体会到了海的心声,海自然与你共鸣,无需可以强求,也无需费力搜寻,海,始终都会以潮声与你相亲,已其海色伴你舒适。' + name: $r('app.string.name_1'), + authorType: $r('app.string.author_type_1'), + content: $r('app.string.content_1') }, { icon: $r('app.media.ic_icon_2'), - name: '熊猫大人', - authorType: '环保领域作者', - content: '野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。' + - '野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。' + name: $r('app.string.name_2'), + authorType: $r('app.string.author_type_1'), + content: $r('app.string.content_2') }, { icon: $r('app.media.ic_icon_2'), - name: '熊猫大人', - authorType: '环保领域作者', - content: '君不见,黄河之水天上来,奔流到海不复回。君不见,高堂明镜悲白发,朝如青丝暮成雪。人生得意须尽欢,莫使金樽空对月。' + - '天生我材必有用,千金散尽还复来。烹羊宰牛且为乐,会须一饮三百杯。岑夫子,丹丘生,将进酒,杯莫停。与君歌一曲,请君为我倾耳听。' + - '钟鼓馔玉不足贵,但愿长醉不愿醒。古来圣贤皆寂寞,惟有饮者留其名。陈王昔时宴平乐,斗酒十千恣欢谑。主人何为言少钱,径须沽取对君酌。' + - '五花马,千金裘,呼儿将出换美酒,与尔同销万古愁。' + name: $r('app.string.name_2'), + authorType: $r('app.string.author_type_1'), + content: $r('app.string.content_3') }, { icon: $r('app.media.ic_icon_3'), - name: '飞行日记', - authorType: '科技领域作者', - content: '群鸟,仿佛从大地的心窝飞起的音符。旋风似的从田野腾空而起。小鸟的头部两侧镶嵌着一双宝石般的小眼睛,嘴巴长长的,上面是它的小鼻子。' + - '群鸟,仿佛从大地的心窝飞起的音符。旋风似的从田野腾空而起。小鸟的头部两侧镶嵌着一双宝石般的小眼睛,嘴巴长长的,上面是它的小鼻子。' + name: $r('app.string.name_3'), + authorType: $r('app.string.author_type_2'), + content: $r('app.string.content_4') }, { icon: $r('app.media.ic_icon_4'), - name: '江湖旅客', - authorType: '旅行领域作者', - content: '伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。' + - '伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。' + name: $r('app.string.name_4'), + authorType: $r('app.string.author_type_3'), + content: $r('app.string.content_5') }, { icon: $r('app.media.ic_icon_2'), - name: '摄影D叔', - authorType: '风景摄影领域作者', - content: '九如山的山,山山相连,连绵起伏。山腰盘旋的那曲折险峻的实木栈道,如缕缕飘带缠绕在绿水青山之中,成为一道独特的亮丽风景;' + - '幽深的小谷之中,升腾着鬼神莫测的云雾。' + - '九如山的山,山山相连,连绵起伏。山腰盘旋的那曲折险峻的实木栈道,如缕缕飘带缠绕在绿水青山之中,成为一道独特的亮丽风景;' + - '幽深的小谷之中,升腾着鬼神莫测的云雾。' + name: $r('app.string.name_5'), + authorType: $r('app.string.author_type_4'), + content: $r('app.string.content_6') }, { icon: $r('app.media.ic_icon_1'), - name: '小鱼儿', - authorType: '环保领域作者', - content: '亲近大海,领悟海,体会到了海的心声,海自然与你共鸣,无需可以强求,也无需费力搜寻,海,始终都会以潮声与你相亲,已其海色伴你舒适。' + - '亲近大海,领悟海,体会到了海的心声,海自然与你共鸣,无需可以强求,也无需费力搜寻,海,始终都会以潮声与你相亲,已其海色伴你舒适。' + name: $r('app.string.name_1'), + authorType: $r('app.string.author_type_1'), + content: $r('app.string.content_1') }, { icon: $r('app.media.ic_icon_2'), - name: '熊猫大人', - authorType: '环保领域作者', - content: '野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。' + - '野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。' + name: $r('app.string.name_2'), + authorType: $r('app.string.author_type_1'), + content: $r('app.string.content_2') }, { icon: $r('app.media.ic_icon_3'), - name: '飞行日记', - authorType: '科技领域作者', - content: '群鸟,仿佛从大地的心窝飞起的音符。旋风似的从田野腾空而起。小鸟的头部两侧镶嵌着一双宝石般的小眼睛,嘴巴长长的,上面是它的小鼻子。' + - '群鸟,仿佛从大地的心窝飞起的音符。旋风似的从田野腾空而起。小鸟的头部两侧镶嵌着一双宝石般的小眼睛,嘴巴长长的,上面是它的小鼻子。' + name: $r('app.string.name_3'), + authorType: $r('app.string.author_type_2'), + content: $r('app.string.content_4') }, { icon: $r('app.media.ic_icon_4'), - name: '江湖旅客', - authorType: '旅行领域作者', - content: '伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。' + - '伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。' + name: $r('app.string.name_4'), + authorType: $r('app.string.author_type_3'), + content: $r('app.string.content_5') }, { icon: $r('app.media.ic_icon_2'), - name: '摄影D叔', - authorType: '风景摄影领域作者', - content: '九如山的山,山山相连,连绵起伏。山腰盘旋的那曲折险峻的实木栈道,如缕缕飘带缠绕在绿水青山之中,成为一道独特的亮丽风景;' + - '幽深的小谷之中,升腾着鬼神莫测的云雾。' + - '九如山的山,山山相连,连绵起伏。山腰盘旋的那曲折险峻的实木栈道,如缕缕飘带缠绕在绿水青山之中,成为一道独特的亮丽风景;' + - '幽深的小谷之中,升腾着鬼神莫测的云雾。' - }, + name: $r('app.string.name_5'), + authorType: $r('app.string.author_type_4'), + content: $r('app.string.content_6') + } ] \ No newline at end of file diff --git a/commons/base/src/main/ets/model/CommentModel.ets b/commons/base/src/main/ets/model/CommentModel.ets index c64899f2b28b83bcf1536d78ec68ddf5aaeaa022..0b654e2c03ff995f28b38062cd5f5b9bdf131d49 100644 --- a/commons/base/src/main/ets/model/CommentModel.ets +++ b/commons/base/src/main/ets/model/CommentModel.ets @@ -18,55 +18,55 @@ import { CommentItemInterface } from '../viewmodel/CommentViewModel'; export const COMMENT_LIST: CommentItemInterface[] = [ { icon: $r('app.media.ic_comment_1'), - name: '柯基可可', + name: $r('app.string.name_6'), favorCount: 41, - content: '拍的很好啊!赞', - timePosition: '10分钟前·来自上海', + content: $r('app.string.content_7'), + timePosition: $r('app.string.time_position_1'), reviewCnt: 123, - subContent: '长江:对了//@森林:是佳能拍出的效果啊,太赞了' + subContent: $r('app.string.sub_content_1') }, { icon: $r('app.media.ic_comment_2'), - name: '会飞的鱼儿', + name: $r('app.string.name_7'), favorCount: 36, - content: '滚滚长江东逝水,浪花淘尽英雄。', - timePosition: '10-23·来自上海', + content: $r('app.string.content_8'), + timePosition: $r('app.string.time_position_2'), reviewCnt: 12, - subContent: '长江:对了//@森林:是佳能拍出的效果啊,太赞了' + subContent: $r('app.string.sub_content_1') }, { icon : $r('app.media.ic_comment_3'), - name : '摄影学家王教授', + name: $r('app.string.name_8'), favorCount: 432, - content : '这组图片饱含了国风风格', - timePosition : '10-22·来自上海' + content: $r('app.string.content_9'), + timePosition: $r('app.string.time_position_3') }, { icon : $r('app.media.ic_icon_2'), - name : '摄影D叔', + name : $r('app.string.name_5'), favorCount: 33, - content : '会当凌绝顶!', - timePosition : '10-22·来自上海' + content : $r('app.string.content_10'), + timePosition: $r('app.string.time_position_3') }, { icon : $r('app.media.ic_comment_1'), - name : '雪中小镇', + name : $r('app.string.name_9'), favorCount: 6, - content : '拍的真好!爱了爱了', - timePosition : '10-21·来自上海' + content : $r('app.string.content_11'), + timePosition: $r('app.string.time_position_4') }, { icon : $r('app.media.ic_comment_2'), - name : '江湖游客', + name : $r('app.string.name_10'), favorCount: 5, - content : '千古江湖图一醉', - timePosition : '10-19·来自上海' + content : $r('app.string.content_12'), + timePosition: $r('app.string.time_position_5') }, { icon : $r('app.media.ic_comment_3'), - name : '吕家寨子', + name : $r('app.string.name_11'), favorCount: 33, - content : '好看,期待更新', - timePosition : '10-13·来自上海' + content : $r('app.string.content_13'), + timePosition: $r('app.string.time_position_6') } ] \ No newline at end of file diff --git a/commons/base/src/main/ets/model/HotModel.ets b/commons/base/src/main/ets/model/HotModel.ets index 9cf0df51470a48f6cd5838b98b787a6fb50ce8e1..d2981d0e36b3a51b3cff1f5186322bbe0b5eca19 100644 --- a/commons/base/src/main/ets/model/HotModel.ets +++ b/commons/base/src/main/ets/model/HotModel.ets @@ -28,8 +28,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 1, icon: $r('app.media.ic_today_rank_1'), - title: '野生动物保护', - content: '规范野生动植物管理', + title: $r('app.string.title_1'), + content: $r('app.string.content_14'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 666, upDownIcon: $r('app.media.ic_up') @@ -37,8 +37,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 2, icon: $r('app.media.ic_today_rank_2'), - title: '世界有名建筑', - content: '人类建筑史上的奇迹', + title: $r('app.string.title_2'), + content: $r('app.string.content_15'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 651, upDownIcon: $r('app.media.ic_up') @@ -46,8 +46,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 3, icon: $r('app.media.ic_today_rank_3'), - title: '茶叶的神奇功效', - content: '雾绕青山枝叶绿', + title: $r('app.string.title_3'), + content: $r('app.string.content_16'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 576, upDownIcon: $r('app.media.ic_up') @@ -55,8 +55,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 4, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 556, upDownIcon: $r('app.media.ic_down') @@ -64,8 +64,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 5, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 532, upDownIcon: $r('app.media.ic_up') @@ -73,8 +73,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 6, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 501, upDownIcon: $r('app.media.ic_down') @@ -82,8 +82,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 7, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 489, upDownIcon: $r('app.media.ic_down') @@ -91,8 +91,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 8, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 473, upDownIcon: $r('app.media.ic_up') @@ -100,8 +100,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 9, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 421, upDownIcon: $r('app.media.ic_up') @@ -109,8 +109,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 10, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 389, upDownIcon: $r('app.media.ic_down') @@ -118,8 +118,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 11, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 365, upDownIcon: $r('app.media.ic_down') @@ -127,8 +127,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 12, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 349, upDownIcon: $r('app.media.ic_down') @@ -136,8 +136,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 13, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 311, upDownIcon: $r('app.media.ic_up') @@ -145,8 +145,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 14, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 278, upDownIcon: $r('app.media.ic_down') @@ -154,8 +154,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 15, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 257, upDownIcon: $r('app.media.ic_up') @@ -165,8 +165,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 1, icon: $r('app.media.ic_news_rank_1'), - title: '艺术之美', - content: '艺术如同一首悠扬的乐曲', + title: $r('app.string.title_9'), + content: $r('app.string.content_22'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 666, upDownIcon: $r('app.media.ic_up') @@ -174,8 +174,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 2, icon: $r('app.media.ic_news_rank_2'), - title: '太空高清图片', - content: '浩瀚宇宙有边际吗', + title: $r('app.string.title_10'), + content: $r('app.string.content_23'), stateIcon: $r('app.media.ic_state_new'), clickCount: 651, upDownIcon: $r('app.media.ic_up') @@ -183,8 +183,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 3, icon: $r('app.media.ic_news_rank_3'), - title: '心灵的修行', - content: '人的精神世界的总和', + title: $r('app.string.title_11'), + content: $r('app.string.content_24'), stateIcon: $r('app.media.ic_state_new'), clickCount: 576, upDownIcon: $r('app.media.ic_up') @@ -192,8 +192,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 4, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 556, upDownIcon: $r('app.media.ic_down') @@ -201,8 +201,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 5, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 532, upDownIcon: $r('app.media.ic_up') @@ -210,8 +210,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 6, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 501, upDownIcon: $r('app.media.ic_down') @@ -219,8 +219,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 7, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 489, upDownIcon: $r('app.media.ic_down') @@ -228,8 +228,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 8, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 473, upDownIcon: $r('app.media.ic_up') @@ -237,8 +237,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 9, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 421, upDownIcon: $r('app.media.ic_up') @@ -246,8 +246,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 10, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 389, upDownIcon: $r('app.media.ic_down') @@ -255,8 +255,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 11, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 365, upDownIcon: $r('app.media.ic_down') @@ -264,8 +264,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 12, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 349, upDownIcon: $r('app.media.ic_down') @@ -273,8 +273,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 13, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 311, upDownIcon: $r('app.media.ic_up') @@ -282,8 +282,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 14, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 278, upDownIcon: $r('app.media.ic_down') @@ -291,8 +291,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 15, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 257, upDownIcon: $r('app.media.ic_up') @@ -302,8 +302,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 1, icon: $r('app.media.ic_city_rank_1'), - title: '夏天来了', - content: '夏天的气息扑面而来', + title: $r('app.string.title_12'), + content: $r('app.string.content_25'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 666, upDownIcon: $r('app.media.ic_up') @@ -311,8 +311,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 2, icon: $r('app.media.ic_city_rank_2'), - title: '新的打卡景点', - content: '这里的花开了', + title: $r('app.string.title_13'), + content: $r('app.string.content_26'), stateIcon: $r('app.media.ic_state_new'), clickCount: 651, upDownIcon: $r('app.media.ic_up') @@ -320,8 +320,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 3, icon: $r('app.media.ic_city_rank_3'), - title: '带宠物去旅行', - content: '旅行是种什么体验', + title: $r('app.string.title_14'), + content: $r('app.string.content_27'), stateIcon: $r('app.media.ic_state_new'), clickCount: 576, upDownIcon: $r('app.media.ic_up') @@ -329,8 +329,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 4, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 556, upDownIcon: $r('app.media.ic_down') @@ -338,8 +338,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 5, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 532, upDownIcon: $r('app.media.ic_up') @@ -347,8 +347,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 6, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 501, upDownIcon: $r('app.media.ic_down') @@ -356,8 +356,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 7, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 489, upDownIcon: $r('app.media.ic_down') @@ -365,8 +365,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 8, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 473, upDownIcon: $r('app.media.ic_up') @@ -374,8 +374,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 9, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 421, upDownIcon: $r('app.media.ic_up') @@ -383,8 +383,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 10, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 389, upDownIcon: $r('app.media.ic_down') @@ -392,8 +392,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 11, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 365, upDownIcon: $r('app.media.ic_down') @@ -401,8 +401,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 12, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 349, upDownIcon: $r('app.media.ic_down') @@ -410,8 +410,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 13, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 311, upDownIcon: $r('app.media.ic_up') @@ -419,8 +419,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 14, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 278, upDownIcon: $r('app.media.ic_down') @@ -428,8 +428,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 15, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 257, upDownIcon: $r('app.media.ic_up') @@ -439,8 +439,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 1, icon: $r('app.media.ic_fun_rank_1'), - title: '吉他之声', - content: '吉他有许多不同的音色', + title: $r('app.string.title_15'), + content: $r('app.string.content_28'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 666, upDownIcon: $r('app.media.ic_up') @@ -448,8 +448,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 2, icon: $r('app.media.ic_fun_rank_2'), - title: '聆听美妙的声音', - content: '轻轻地拂过我的耳畔', + title: $r('app.string.title_16'), + content: $r('app.string.content_29'), stateIcon: $r('app.media.ic_state_new'), clickCount: 651, upDownIcon: $r('app.media.ic_up') @@ -457,8 +457,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 3, icon: $r('app.media.ic_fun_rank_3'), - title: '安静的工作', - content: '静下来做事是难得的品质', + title: $r('app.string.title_17'), + content: $r('app.string.content_30'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 576, upDownIcon: $r('app.media.ic_up') @@ -466,8 +466,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 4, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 556, upDownIcon: $r('app.media.ic_down') @@ -475,8 +475,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 5, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 532, upDownIcon: $r('app.media.ic_up') @@ -484,8 +484,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 6, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 501, upDownIcon: $r('app.media.ic_down') @@ -493,8 +493,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 7, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 489, upDownIcon: $r('app.media.ic_down') @@ -502,8 +502,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 8, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 473, upDownIcon: $r('app.media.ic_up') @@ -511,8 +511,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 9, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 421, upDownIcon: $r('app.media.ic_up') @@ -520,8 +520,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 10, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 389, upDownIcon: $r('app.media.ic_down') @@ -529,8 +529,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 11, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 365, upDownIcon: $r('app.media.ic_down') @@ -538,8 +538,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 12, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 349, upDownIcon: $r('app.media.ic_down') @@ -547,8 +547,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 13, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 311, upDownIcon: $r('app.media.ic_up') @@ -556,8 +556,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 14, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 278, upDownIcon: $r('app.media.ic_down') @@ -565,8 +565,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 15, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 257, upDownIcon: $r('app.media.ic_up') @@ -576,8 +576,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 1, icon: $r('app.media.ic_food_rank_1'), - title: '超市的果子', - content: '红彤彤的苹果像小灯笼', + title: $r('app.string.title_18'), + content: $r('app.string.content_31'), stateIcon: $r('app.media.ic_state_new'), clickCount: 666, upDownIcon: $r('app.media.ic_up') @@ -585,8 +585,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 2, icon: $r('app.media.ic_food_rank_2'), - title: '蔬菜种植', - content: '带你去吃健康的蔬菜', + title: $r('app.string.title_19'), + content: $r('app.string.content_32'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 651, upDownIcon: $r('app.media.ic_up') @@ -594,8 +594,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 3, icon: $r('app.media.ic_food_rank_3'), - title: '儿时的味道', - content: '儿时香甜的味道', + title: $r('app.string.title_20'), + content: $r('app.string.content_33'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 576, upDownIcon: $r('app.media.ic_up') @@ -603,8 +603,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 4, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 556, upDownIcon: $r('app.media.ic_down') @@ -612,8 +612,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 5, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 532, upDownIcon: $r('app.media.ic_up') @@ -621,8 +621,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 6, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 501, upDownIcon: $r('app.media.ic_down') @@ -630,8 +630,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 7, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 489, upDownIcon: $r('app.media.ic_down') @@ -639,8 +639,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 8, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 473, upDownIcon: $r('app.media.ic_up') @@ -648,8 +648,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 9, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 421, upDownIcon: $r('app.media.ic_up') @@ -657,8 +657,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 10, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 389, upDownIcon: $r('app.media.ic_down') @@ -666,8 +666,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 11, icon: $r('app.media.ic_rank_item_1'), - title: '建筑人文', - content: '欧洲建筑的历史责任在对欧洲...', + title: $r('app.string.title_6'), + content: $r('app.string.content_19'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 365, upDownIcon: $r('app.media.ic_down') @@ -675,8 +675,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 12, icon: $r('app.media.ic_rank_item_2'), - title: '世界十大神奇建筑', - content: '世界十大神奇建筑指的是建筑造型...', + title: $r('app.string.title_7'), + content: $r('app.string.content_20'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 349, upDownIcon: $r('app.media.ic_down') @@ -684,8 +684,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 13, icon: $r('app.media.ic_rank_item_3'), - title: '生命之谜语', - content: '小小世界的生存智慧是非常...', + title: $r('app.string.title_8'), + content: $r('app.string.content_21'), stateIcon: $r('app.media.ic_state_favor'), clickCount: 311, upDownIcon: $r('app.media.ic_up') @@ -693,8 +693,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 14, icon: $r('app.media.ic_rank_item_4'), - title: '舞动者们', - content: '舞者们台下十年练习之路', + title: $r('app.string.title_4'), + content: $r('app.string.content_17'), stateIcon: $r('app.media.ic_state_new'), clickCount: 278, upDownIcon: $r('app.media.ic_down') @@ -702,8 +702,8 @@ export const HOST_LIST_ARRAY: Array = [ { index: 15, icon: $r('app.media.ic_rank_item_5'), - title: '宇宙最遥远的样子', - content: '揭秘宇宙的奥秘', + title: $r('app.string.title_5'), + content: $r('app.string.content_18'), stateIcon: $r('app.media.ic_state_fire'), clickCount: 257, upDownIcon: $r('app.media.ic_up') diff --git a/commons/base/src/main/resources/base/element/string.json b/commons/base/src/main/resources/base/element/string.json index 98e1d8a84b3d8539ea33e79fe2ac593a05d23bb4..2b247e4be56b2d2d35336e061cf75bb3a463a8dd 100644 --- a/commons/base/src/main/resources/base/element/string.json +++ b/commons/base/src/main/resources/base/element/string.json @@ -3,6 +3,326 @@ { "name": "shared_desc", "value": "description" + }, + { + "name": "today_hot_search", + "value": "今日热搜" + }, + { + "name": "news_hot_search", + "value": "要闻热搜" + }, + { + "name": "same_city_hot_search", + "value": "同城热搜" + }, + { + "name": "entertainment_hot_search", + "value": "娱乐热搜" + }, + { + "name": "food_hot_search", + "value": "美食热搜" + }, + { + "name": "name_1", + "value": "小鱼儿" + }, + { + "name": "name_2", + "value": "熊猫大人" + }, + { + "name": "name_3", + "value": "飞行日记" + }, + { + "name": "name_4", + "value": "江湖旅客" + }, + { + "name": "name_5", + "value": "摄影D叔" + }, + { + "name": "name_6", + "value": "柯基可可" + }, + { + "name": "name_7", + "value": "会飞的鱼儿" + }, + { + "name": "name_8", + "value": "摄影学家王教授" + }, + { + "name": "name_9", + "value": "雪中小镇" + }, + { + "name": "name_10", + "value": "江湖游客" + }, + { + "name": "name_11", + "value": "吕家寨子" + }, + { + "name": "author_type_1", + "value": "环保领域作者" + }, + { + "name": "author_type_2", + "value": "科技领域作者" + }, + { + "name": "author_type_3", + "value": "旅行领域作者" + }, + { + "name": "author_type_4", + "value": "风景摄影领域作者" + }, + { + "name": "content_1", + "value": "亲近大海,领悟海,体会到了海的心声,海自然与你共鸣,无需可以强求,也无需费力搜寻,海,始终都会以潮声与你相亲,已其海色伴你舒适。亲近大海,领悟海,体会到了海的心声,海自然与你共鸣,无需可以强求,也无需费力搜寻,海,始终都会以潮声与你相亲,已其海色伴你舒适。" + }, + { + "name": "content_2", + "value": "野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。野生动物与宠物动物,可爱的动物人人都喜欢。" + }, + { + "name": "content_3", + "value": "君不见,黄河之水天上来,奔流到海不复回。君不见,高堂明镜悲白发,朝如青丝暮成雪。人生得意须尽欢,莫使金樽空对月。天生我材必有用,千金散尽还复来。烹羊宰牛且为乐,会须一饮三百杯。岑夫子,丹丘生,将进酒,杯莫停。与君歌一曲,请君为我倾耳听。钟鼓馔玉不足贵,但愿长醉不愿醒。古来圣贤皆寂寞,惟有饮者留其名。陈王昔时宴平乐,斗酒十千恣欢谑。主人何为言少钱,径须沽取对君酌。五花马,千金裘,呼儿将出换美酒,与尔同销万古愁。" + }, + { + "name": "content_4", + "value": "群鸟,仿佛从大地的心窝飞起的音符。旋风似的从田野腾空而起。小鸟的头部两侧镶嵌着一双宝石般的小眼睛,嘴巴长长的,上面是它的小鼻子。群鸟,仿佛从大地的心窝飞起的音符。旋风似的从田野腾空而起。小鸟的头部两侧镶嵌着一双宝石般的小眼睛,嘴巴长长的,上面是它的小鼻子。" + }, + { + "name": "content_5", + "value": "伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。伫立于河流两岸的山峦,如同沉默无言的僧侣,眺望着远方。" + }, + { + "name": "content_6", + "value": "九如山的山,山山相连,连绵起伏。山腰盘旋的那曲折险峻的实木栈道,如缕缕飘带缠绕在绿水青山之中,成为一道独特的亮丽风景;幽深的小谷之中,升腾着鬼神莫测的云雾。九如山的山,山山相连,连绵起伏。山腰盘旋的那曲折险峻的实木栈道,如缕缕飘带缠绕在绿水青山之中,成为一道独特的亮丽风景;幽深的小谷之中,升腾着鬼神莫测的云雾。" + }, + { + "name": "content_7", + "value": "拍的很好啊!赞" + }, + { + "name": "content_8", + "value": "滚滚长江东逝水,浪花淘尽英雄。" + }, + { + "name": "content_9", + "value": "这组图片饱含了国风风格" + }, + { + "name": "content_10", + "value": "会当凌绝顶!" + }, + { + "name": "content_11", + "value": "拍的真好!爱了爱了!" + }, + { + "name": "content_12", + "value": "千古江湖图一醉" + }, + { + "name": "content_13", + "value": "好看,期待更新" + }, + { + "name": "content_14", + "value": "规范野生动植物管理" + }, + { + "name": "content_15", + "value": "人类建筑史上的奇迹" + }, + { + "name": "content_16", + "value": "雾绕青山枝叶绿" + }, + { + "name": "content_17", + "value": "舞者们台下十年练习之路" + }, + { + "name": "content_18", + "value": "揭秘宇宙的奥秘" + }, + { + "name": "content_19", + "value": "欧洲建筑的历史责任在对欧洲..." + }, + { + "name": "content_20", + "value": "世界十大神奇建筑指的是建筑造型..." + }, + { + "name": "content_21", + "value": "小小世界的生存智慧是非常..." + }, + { + "name": "content_22", + "value": "艺术如同一首悠扬的乐曲" + }, + { + "name": "content_23", + "value": "浩瀚宇宙有边际吗" + }, + { + "name": "content_24", + "value": "人的精神世界的总和" + }, + { + "name": "content_25", + "value": "夏天的气息扑面而来" + }, + { + "name": "content_26", + "value": "这里的花开了" + }, + { + "name": "content_27", + "value": "旅行是种什么体验" + }, + { + "name": "content_28", + "value": "吉他有许多不同的音色" + }, + { + "name": "content_29", + "value": "轻轻地拂过我的耳畔" + }, + { + "name": "content_30", + "value": "静下来做事是难得的品质" + }, + { + "name": "content_31", + "value": "红彤彤的苹果像小灯笼" + }, + { + "name": "content_32", + "value": "带你去吃健康的蔬菜" + }, + { + "name": "content_33", + "value": "儿时香甜的味道" + }, + { + "name": "time_position_1", + "value": "10分钟前·来自上海" + }, + { + "name": "time_position_2", + "value": "10-23·来自上海" + }, + { + "name": "time_position_3", + "value": "10-22·来自上海" + }, + { + "name": "time_position_4", + "value": "10-21·来自上海" + }, + { + "name": "time_position_5", + "value": "10-19·来自上海" + }, + { + "name": "time_position_6", + "value": "10-13·来自上海" + }, + { + "name": "sub_content_1", + "value": "长江:对了//@森林:是佳能拍出的效果啊,太赞了" + }, + { + "name": "title_1", + "value": "野生动物保护" + }, + { + "name": "title_2", + "value": "世界有名建筑" + }, + { + "name": "title_3", + "value": "茶叶的神奇功效" + }, + { + "name": "title_4", + "value": "舞动者们" + }, + { + "name": "title_5", + "value": "宇宙最遥远的样子" + }, + { + "name": "title_6", + "value": "建筑人文" + }, + { + "name": "title_7", + "value": "世界十大神奇建筑" + }, + { + "name": "title_8", + "value": "生命之谜语" + }, + { + "name": "title_9", + "value": "艺术之美" + }, + { + "name": "title_10", + "value": "太空高清图片" + }, + { + "name": "title_11", + "value": "心灵的修行" + }, + { + "name": "title_12", + "value": "夏天来了" + }, + { + "name": "title_13", + "value": "新的打卡景点" + }, + { + "name": "title_14", + "value": "带宠物去旅行" + }, + { + "name": "title_15", + "value": "吉他之声" + }, + { + "name": "title_16", + "value": "聆听美妙的声音" + }, + { + "name": "title_17", + "value": "安静的工作" + }, + { + "name": "title_18", + "value": "超市的果子" + }, + { + "name": "title_19", + "value": "蔬菜种植" + }, + { + "name": "title_20", + "value": "儿时的味道" } ] } \ No newline at end of file diff --git a/features/detail/BuildProfile.ets b/features/detail/BuildProfile.ets deleted file mode 100644 index 3a501e5ddee8ea6d28961648fc7dd314a5304bd4..0000000000000000000000000000000000000000 --- a/features/detail/BuildProfile.ets +++ /dev/null @@ -1,17 +0,0 @@ -/** - * Use these variables when you tailor your ArkTS code. They must be of the const type. - */ -export const HAR_VERSION = '1.0.0'; -export const BUILD_MODE_NAME = 'debug'; -export const DEBUG = true; -export const TARGET_NAME = 'default'; - -/** - * BuildProfile Class is used only for compatibility purposes. - */ -export default class BuildProfile { - static readonly HAR_VERSION = HAR_VERSION; - static readonly BUILD_MODE_NAME = BUILD_MODE_NAME; - static readonly DEBUG = DEBUG; - static readonly TARGET_NAME = TARGET_NAME; -} \ No newline at end of file diff --git a/features/detail/obfuscation-rules.txt b/features/detail/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/detail/obfuscation-rules.txt +++ b/features/detail/obfuscation-rules.txt @@ -15,4 +15,8 @@ # Keep options: # -keep-property-name: specifies property names that you want to keep -# -keep-global-name: specifies names that you want to keep in the global scope \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/hot/obfuscation-rules.txt b/features/hot/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/hot/obfuscation-rules.txt +++ b/features/hot/obfuscation-rules.txt @@ -15,4 +15,8 @@ # Keep options: # -keep-property-name: specifies property names that you want to keep -# -keep-global-name: specifies names that you want to keep in the global scope \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/hot/src/main/ets/constants/CommonConstants.ets b/features/hot/src/main/ets/constants/CommonConstants.ets index 7af41648842a08cce6e77f80ace288481f50602f..71819aa7582f462742691a5f78bd8246604b6979 100644 --- a/features/hot/src/main/ets/constants/CommonConstants.ets +++ b/features/hot/src/main/ets/constants/CommonConstants.ets @@ -163,9 +163,4 @@ export class CommonConstants { * Follow title space. */ static readonly FOLLOW_TITLE_SPACE: string = '24vp'; - - /** - * Follow title content. - */ - static readonly FOLLOW_TITLE_CONTENT: string = '的动态'; } \ No newline at end of file diff --git a/features/hot/src/main/ets/model/FollowModel.ets b/features/hot/src/main/ets/model/FollowModel.ets index 20e3786b158de270bba8e7f94d8e956b8b49db29..ef66c63e03bbaabb3923f4c7fccd741272ec033a 100644 --- a/features/hot/src/main/ets/model/FollowModel.ets +++ b/features/hot/src/main/ets/model/FollowModel.ets @@ -14,13 +14,13 @@ */ export interface FollowItemInterface { - name: string; + name: ResourceStr; icon: Resource; - date: string; + date: ResourceStr; picture: Resource; - type: string; - subType: string; - content: string; + type: ResourceStr; + subType: ResourceStr; + content: ResourceStr; shareCount: number; viewCount: number; favourCount: number; @@ -28,121 +28,121 @@ export interface FollowItemInterface { export const FOLLOW_LIST: FollowItemInterface[] = [ { - name: '摄影视觉', + name: $r("app.string.follow_list_name_1"), icon: $r('app.media.ic_follow_icon1'), - date: '2小时前·发布了动态', + date: $r('app.string.follow_list_date_1'), picture: $r('app.media.ic_follow_picture1'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 1557, viewCount: 57, favourCount: 1557 }, { - name: '大自然的风采', + name: $r('app.string.follow_list_name_2'), icon: $r('app.media.ic_follow_icon2'), - date: '11小时前·发布了动态', + date: $r('app.string.follow_list_date_2'), picture: $r('app.media.ic_follow_picture2'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 154, viewCount: 34, favourCount: 127 }, { - name: '山水', + name: $r('app.string.follow_list_name_3'), icon: $r('app.media.ic_follow_icon3'), - date: '3小时前·发布了动态', + date: $r('app.string.follow_list_date_3'), picture: $r('app.media.ic_follow_picture3'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 134, viewCount: 35, favourCount: 357 }, { - name: '最科技评测', + name: $r('app.string.follow_list_name_4'), icon: $r('app.media.ic_follow_icon4'), - date: '刚刚', + date: $r('app.string.follow_list_date_4'), picture: $r('app.media.ic_follow_picture4'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 154, viewCount: 54, favourCount: 145 }, { - name: '故宫画家', + name: $r('app.string.follow_list_name_5'), icon: $r('app.media.ic_follow_icon5'), - date: '2小时前·发布了动态', + date: $r('app.string.follow_list_date_1'), picture: $r('app.media.ic_follow_picture5'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 1257, viewCount: 573, favourCount: 1357 }, { - name: '国学展览', + name: $r('app.string.follow_list_name_6'), icon: $r('app.media.ic_follow_icon6'), - date: '8小时前·发布了动态', + date: $r('app.string.follow_list_date_6'), picture: $r('app.media.ic_follow_picture6'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 187, viewCount: 56, favourCount: 127 }, { - name: '自然社区', + name: $r('app.string.follow_list_name_7'), icon: $r('app.media.ic_follow_icon1'), - date: '刚刚', + date: $r('app.string.follow_list_date_4'), picture: $r('app.media.ic_follow_picture7'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 757, viewCount: 17, favourCount: 156 }, { - name: '摄影视效', + name: $r('app.string.follow_list_name_8'), icon: $r('app.media.ic_follow_icon2'), - date: '13小时前·发布了动态', + date: $r('app.string.follow_list_date_8'), picture: $r('app.media.ic_follow_picture8'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 345, viewCount: 56, favourCount: 1366 }, { - name: '国学探究', + name: $r('app.string.follow_list_name_9'), icon: $r('app.media.ic_follow_icon3'), - date: '2小时前·发布了动态', + date: $r('app.string.follow_list_date_1'), picture: $r('app.media.ic_follow_picture9'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 1557, viewCount: 57, favourCount: 1557 }, { - name: '摄影视觉', + name: $r('app.string.follow_list_name_1'), icon: $r('app.media.ic_follow_icon1'), - date: '2小时前·发布了动态', + date: $r('app.string.follow_list_date_1'), picture: $r('app.media.ic_follow_picture1'), - type: '登山', - subType: '旅游', - content: '在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…', + type: $r('app.string.follow_list_type_1'), + subType: $r('app.string.follow_list_subtype_1'), + content: $r('app.string.follow_list_content_1'), shareCount: 1557, viewCount: 57, favourCount: 1557 @@ -150,57 +150,58 @@ export const FOLLOW_LIST: FollowItemInterface[] = [ ]; export interface TitleDetailInterface { - name: string; + name: ResourceStr; icon?: Resource; - content?: string; + content?: ResourceStr; } + export const TITLE_DETAIL_LIST: TitleDetailInterface[] = [ { - name: '全部关注' + name: $r('app.string.follow_detail_name_1') }, { - name: '摄影视觉', + name: $r('app.string.follow_list_name_1'), icon: $r('app.media.ic_follow_icon1'), - content: '摄影/10粉丝' + content: $r('app.string.follow_detail_content_1') }, { - name: '大自然的风采', + name: $r('app.string.follow_detail_name_2'), icon: $r('app.media.ic_follow_icon2'), - content: '摄影/5万粉丝' + content: $r('app.string.follow_detail_content_2') }, { - name: '山水', + name: $r('app.string.follow_list_name_3'), icon: $r('app.media.ic_follow_icon3'), - content: '20万粉丝' + content: $r('app.string.follow_detail_content_3') }, { - name: '科技评测', + name: $r('app.string.follow_detail_name_3'), icon: $r('app.media.ic_follow_icon4'), - content: '快速评测' + content: $r('app.string.follow_detail_content_4') }, { - name: '风景画家', + name: $r('app.string.follow_detail_name_4'), icon: $r('app.media.ic_follow_icon5'), - content: '爱山爱水' + content: $r('app.string.follow_detail_content_5') }, { - name: '国学展览', + name: $r('app.string.follow_list_name_6'), icon: $r('app.media.ic_follow_icon6'), - content: '国学认证' + content: $r('app.string.follow_detail_content_6') }, { - name: '自然社区', + name: $r('app.string.follow_detail_name_5'), icon: $r('app.media.ic_follow_icon1'), - content: '3万粉丝' + content: $r('app.string.follow_detail_content_7') }, { - name: '摄影视效', + name: $r('app.string.follow_list_name_8'), icon: $r('app.media.ic_follow_icon2'), - content: '2小时前发布了...' + content: $r('app.string.follow_detail_content_8') }, { - name: '国学探究', + name: $r('app.string.follow_detail_name_6'), icon: $r('app.media.ic_follow_icon3'), - content: '摄影/10粉丝' + content: $r('app.string.follow_detail_content_1') } ]; \ No newline at end of file diff --git a/features/hot/src/main/ets/view/FollowView.ets b/features/hot/src/main/ets/view/FollowView.ets index e732692ffd04d56f0562c13aa427cbb09f1ec197..ec771b38d2a4853ec30846349abb09519cc695b9 100644 --- a/features/hot/src/main/ets/view/FollowView.ets +++ b/features/hot/src/main/ets/view/FollowView.ets @@ -85,14 +85,14 @@ export struct FollowView { .aspectRatio(1) .borderRadius($r('app.float.follow_title_icon_br')) .borderWidth(index === this.indexTitleSelected ? $r('app.float.follow_title_icon_bw') : - $r('app.float.zero')) + $r('app.float.zero')) .borderColor($r('app.color.follow_title_icon_bc')) Text(item.name) .width($r('app.float.follow_title_text_width')) .fontSize($r('app.float.follow_title_text_font_size')) .fontColor(index === this.indexTitleSelected ? $r('app.color.follow_title_select') : - $r('app.color.follow_title_normal')) + $r('app.color.follow_title_normal')) .textAlign(TextAlign.Center) .margin({ top: $r('app.float.follow_title_text_mt') @@ -101,7 +101,7 @@ export struct FollowView { .margin({ left: index === 0 ? $r('app.float.follow_title_margin_left') : $r('app.float.zero'), right: index === this.iconTitleList.length - 1 ? $r('app.float.follow_title_margin_left') : - $r('app.float.zero') + $r('app.float.zero') }) } .onClick(() => { @@ -124,10 +124,13 @@ export struct FollowView { if (this.indexTitleSelected !== -1) { Row() { - Text(`${this.iconTitleList[this.indexTitleSelected].name}${Common.FOLLOW_TITLE_CONTENT}`) - .fontSize($r('app.float.follow_title_content_fs')) - .fontWeight(BaseCommon.FONT_WEIGHT_500) - .fontColor($r('app.color.follow_title_content_fc')) + Text() { + Span(this.iconTitleList[this.indexTitleSelected].name) + Span($r('app.string.follow_title_content')) + } + .fontSize($r('app.float.follow_title_content_fs')) + .fontWeight(BaseCommon.FONT_WEIGHT_500) + .fontColor($r('app.color.follow_title_content_fc')) Image($r('app.media.ic_public_cancel')) .width($r('app.float.follow_title_cancel')) diff --git a/features/hot/src/main/ets/view/FoundView.ets b/features/hot/src/main/ets/view/FoundView.ets index 782c43ffd2afd0bfcbfc74cdfabbddc4a08983b1..a520bfa1c8702af36a2ca4b1b71e16f3d212fec3 100644 --- a/features/hot/src/main/ets/view/FoundView.ets +++ b/features/hot/src/main/ets/view/FoundView.ets @@ -38,7 +38,7 @@ export struct FoundView { space: new BreakpointType(Common.WINDOW_PADDING_SM, Common.WINDOW_PADDING_MD, Common.WINDOW_PADDING_LG).getValue(this.currentBreakpoint) }) { - ForEach(BaseCommon.RANK_TITLE_LIST, (item: string, index: number) => { + ForEach(BaseCommon.RANK_TITLE_LIST, (item: ResourceStr, index: number) => { ListItem() { Text(item) .fontSize($r('app.float.rank_name_fs')) @@ -73,7 +73,7 @@ export struct FoundView { this.TitleBarBuilder() Tabs({ index: this.tabIndexSelected, barPosition: BarPosition.Start }) { - ForEach(BaseCommon.RANK_TITLE_LIST, (item: string) => { + ForEach(BaseCommon.RANK_TITLE_LIST, (item: ResourceStr) => { TabContent() { HotColumnView({ tab_index: this.tabIndexSelected diff --git a/features/hot/src/main/resources/base/element/string.json b/features/hot/src/main/resources/base/element/string.json index 8895906eb1c3259f2d7d72e67d57dfedd3de7112..9bb2580a874b20e96b9692f9b097a76b5ae2cd55 100644 --- a/features/hot/src/main/resources/base/element/string.json +++ b/features/hot/src/main/resources/base/element/string.json @@ -27,6 +27,138 @@ { "name": "more", "value": "更多" + }, + { + "name": "follow_list_name_1", + "value": "摄影视觉" + }, + { + "name": "follow_list_date_1", + "value": "2小时前·发布了动态" + }, + { + "name": "follow_list_type_1", + "value": "登山" + }, + { + "name": "follow_list_subtype_1", + "value": "旅游" + }, + { + "name": "follow_list_content_1", + "value": "在山顶,你会觉得山再巍峨,人也能把它征服,而此时的…" + }, + { + "name": "follow_list_name_2", + "value": "大自然的风采" + }, + { + "name": "follow_list_date_2", + "value": "11小时前·发布了动态" + }, + { + "name": "follow_list_name_3", + "value": "山水" + }, + { + "name": "follow_list_date_3", + "value": "3小时前·发布了动态" + }, + { + "name": "follow_list_name_4", + "value": "最科技评测" + }, + { + "name": "follow_list_date_4", + "value": "刚刚" + }, + { + "name": "follow_list_name_5", + "value": "故宫画家" + }, + { + "name": "follow_list_name_6", + "value": "国学展览" + }, + { + "name": "follow_list_date_6", + "value": "8小时前·发布了动态" + }, + { + "name": "follow_list_name_7", + "value": "自然社区" + }, + { + "name": "follow_list_name_8", + "value": "摄影视效" + }, + { + "name": "follow_list_date_8", + "value": "13小时前·发布了动态" + }, + { + "name": "follow_list_name_9", + "value": "国学探究" + }, + { + "name": "follow_detail_name_1", + "value": "全部关注" + }, + { + "name": "follow_detail_name_2", + "value": "大自然的风采" + }, + { + "name": "follow_detail_name_3", + "value": "科技评测" + }, + { + "name": "follow_detail_name_4", + "value": "风景画家" + }, + { + "name": "follow_detail_name_5", + "value": "自然社区" + }, + { + "name": "follow_detail_name_6", + "value": "自然社区" + }, + { + "name": "follow_detail_content_1", + "value": "摄影/10粉丝" + }, + { + "name": "follow_detail_content_2", + "value": "摄影/5万粉丝" + }, + { + "name": "follow_detail_content_3", + "value": "20万粉丝" + }, + { + "name": "follow_detail_content_4", + "value": "快速评测" + }, + { + "name": "follow_detail_content_5", + "value": "爱山爱水" + }, + { + "name": "follow_detail_content_6", + "value": "国学认证" + }, + { + "name": "follow_detail_content_7", + "value": "3万粉丝" + }, + { + "name": "follow_detail_content_8", + "value": "2小时前发布了..." + }, + { + "name": "follow_title_content", + "value": "的动态" } ] } \ No newline at end of file diff --git a/features/picture/obfuscation-rules.txt b/features/picture/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/picture/obfuscation-rules.txt +++ b/features/picture/obfuscation-rules.txt @@ -15,4 +15,8 @@ # Keep options: # -keep-property-name: specifies property names that you want to keep -# -keep-global-name: specifies names that you want to keep in the global scope \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/rank/obfuscation-rules.txt b/features/rank/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/features/rank/obfuscation-rules.txt +++ b/features/rank/obfuscation-rules.txt @@ -15,4 +15,8 @@ # Keep options: # -keep-property-name: specifies property names that you want to keep -# -keep-global-name: specifies names that you want to keep in the global scope \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/features/rank/src/main/ets/view/HotRankPage.ets b/features/rank/src/main/ets/view/HotRankPage.ets index 5f55a0a5e5f73a2015fd36192c329b775aa02ae7..9e6b83eb3752894fd2dbeeaa307cfd22da9be38f 100644 --- a/features/rank/src/main/ets/view/HotRankPage.ets +++ b/features/rank/src/main/ets/view/HotRankPage.ets @@ -62,7 +62,7 @@ export struct HotRankPage { Scroll() { Swiper() { - ForEach(BaseCommon.RANK_TITLE_LIST, (item: string, index: number) => { + ForEach(BaseCommon.RANK_TITLE_LIST, (item: ResourceStr, index: number) => { HotListView({ groupTitle: item, index: index diff --git a/products/phone/obfuscation-rules.txt b/products/phone/obfuscation-rules.txt index 985b2aeb7658286b17bd26eab8f217c3fe75ea8b..a1dfa0bd175984dc49e641436aa67b1de1b8abeb 100644 --- a/products/phone/obfuscation-rules.txt +++ b/products/phone/obfuscation-rules.txt @@ -15,4 +15,8 @@ # Keep options: # -keep-property-name: specifies property names that you want to keep -# -keep-global-name: specifies names that you want to keep in the global scope \ No newline at end of file +# -keep-global-name: specifies names that you want to keep in the global scope +-enable-property-obfuscation +-enable-toplevel-obfuscation +-enable-filename-obfuscation +-enable-export-obfuscation \ No newline at end of file diff --git a/products/phone/src/main/ets/entryability/EntryAbility.ets b/products/phone/src/main/ets/entryability/EntryAbility.ets index 97610d8227043ad9bc9fe5d4095d88048abe0619..eb6a8811a9e8a67e44b33977a25e5c97a1ca5128 100644 --- a/products/phone/src/main/ets/entryability/EntryAbility.ets +++ b/products/phone/src/main/ets/entryability/EntryAbility.ets @@ -41,9 +41,7 @@ export default class EntryAbility extends UIAbility { if (deviceInfo.deviceType !== BaseCommon.DEVICE_2IN1) { data.setWindowLayoutFullScreen(true); } - // 获取当前窗口尺寸对应断点 this.updateBreakpoint(data.getWindowProperties().windowRect.width); - // 监听窗口尺寸变化,改变断点 data.on('windowSizeChange', (windowSize: window.Size) => { this.updateBreakpoint(windowSize.width); }) diff --git a/screenshots/device/foldable.en.png b/screenshots/device/foldable.en.png new file mode 100644 index 0000000000000000000000000000000000000000..f8821edb46a1adc8bf9180e00feed2e9f428eaaf Binary files /dev/null and b/screenshots/device/foldable.en.png differ diff --git a/screenshots/device/foldable.png b/screenshots/device/foldable.png index 28c912901976f2008ae0f1caf959f4add54a64fc..2c39bdfc05d2a828a710a6ee3e8851a86aa3d631 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 new file mode 100644 index 0000000000000000000000000000000000000000..4344d9f87a228805af4325602c59b07684903781 Binary files /dev/null and b/screenshots/device/pad.en.png differ diff --git a/screenshots/device/pad.png b/screenshots/device/pad.png index f82bb0212adbf0c23b2d7393638bb2fa87d85d14..b56984c00f6664c9cf44821a8535553dc31439d8 100644 Binary files a/screenshots/device/pad.png and b/screenshots/device/pad.png differ diff --git a/screenshots/device/phone.en.png b/screenshots/device/phone.en.png new file mode 100644 index 0000000000000000000000000000000000000000..f9b4b6e98e8ef2a29d3b452fde326b2e9d7809fe Binary files /dev/null and b/screenshots/device/phone.en.png differ diff --git a/screenshots/device/phone.png b/screenshots/device/phone.png index 994752637ca2e132867326628ec26950ebb7423a..856563dc0760f92188a244366729c9cb6310cc3a 100644 Binary files a/screenshots/device/phone.png and b/screenshots/device/phone.png differ