diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index cd5af275110c751ab9efd82be620c6bafc6335f4..3eeeb6e1482b0824962668eb6fd1e14d92fad12a 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -19,29 +19,34 @@ import { BusinessError } from '@kit.BasicServicesKit'; import Logger from '../common/utils/Logger'; const TAG = 'waterFlow SampleCode EntryAbility'; + /** * Lift cycle management of Ability. */ export default class EntryAbility extends UIAbility { private windowObj?: window.Window; - private page: string = 'pages/Index'; private curBp: string = ''; private updateBreakpoint(windowWidth: number): void { - let windowWidthVp = windowWidth / display.getDefaultDisplaySync().densityPixels; - let newBp: string = ''; - if (windowWidthVp < 600) { - newBp = 'sm'; - } else if (windowWidthVp < 840) { - newBp = 'md'; - } else { - newBp = 'lg'; - } - if (this.curBp !== newBp) { - this.curBp = newBp; - AppStorage.setOrCreate('currentBreakpoint', this.curBp); + try { + let windowWidthVp = windowWidth / display.getDefaultDisplaySync().densityPixels; + let newBp: string = ''; + if (windowWidthVp < 600) { + newBp = 'sm'; + } else if (windowWidthVp < 840) { + newBp = 'md'; + } else { + newBp = 'lg'; + } + if (this.curBp !== newBp) { + this.curBp = newBp; + AppStorage.setOrCreate('currentBreakpoint', this.curBp); + } + } catch (error) { + Logger.error(TAG, 'updateBreakpoint catch err:', JSON.stringify(error) ?? ''); } } + // Obtain the code value through the onCreate callback in cold launch scenarios. onCreate(want: Want, __: AbilityConstant.LaunchParam): void { AppStorage.setOrCreate('systemColorMode', this.context.config.colorMode); diff --git a/entry/src/main/module.json5 b/entry/src/main/module.json5 index dad9f321325fc1c6ba0cfb8970ebdc1a7e5ce643..b70aeaa6bd5048ac3e4025679f503c62e4c2b6f8 100644 --- a/entry/src/main/module.json5 +++ b/entry/src/main/module.json5 @@ -33,7 +33,7 @@ "label": "$string:EntryAbility_label", "startWindowIcon": "$media:icon", "startWindowBackground": "$color:start_window_background", - "exported": true, + "exported": false, "skills": [ { "entities": [ diff --git a/entry/src/main/resources/base/element/color.json b/entry/src/main/resources/base/element/color.json index 9c6bc20d2f1ecbcd82b77dcc57de4293d556911d..088ff8ac9538f4e31775c40f561a91f45b25764c 100644 --- a/entry/src/main/resources/base/element/color.json +++ b/entry/src/main/resources/base/element/color.json @@ -8,26 +8,10 @@ "name": "indicator_select", "value": "#F74E42" }, - { - "name": "indicator_unselect", - "value": "#F3FFFFFF" - }, { "name": "focus_color", "value": "#E92F4F" }, - { - "name": "text", - "value": "#2c2c2c" - }, - { - "name": "side_background_color", - "value": "#F1F3F5" - }, - { - "name": "home_background_color", - "value": "#F1F3F5" - }, { "name": "flow_image_bg_color", "value": "#eaeaea" @@ -35,42 +19,6 @@ { "name": "flow_press_foreground_color", "value": "#80000000" - }, - { - "name": "tab_normal_color", - "value": "#D8D8D8" - }, - { - "name": "text_color", - "value": "#E6000000" - }, - { - "name": "index_divider_color", - "value": "#0D000000" - }, - { - "name": "index_text_color", - "value": "#99000000" - }, - { - "name": "sections_tab_color_selected", - "value": "#0A59F7" - }, - { - "name": "sections_tab_color_normal", - "value": "#12000000" - }, - { - "name": "sections_back_bg", - "value": "#10000000" - }, - { - "name": "linearGradient_first_color", - "value": "#80000000" - }, - { - "name": "linearGradient_last_color", - "value": "#03000000" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/base/element/float.json b/entry/src/main/resources/base/element/float.json index 602238b00c32250202babbed2e88b5fcd2a51a26..b44d8880cef2e6cb9fb391ed0284245f635deb96 100644 --- a/entry/src/main/resources/base/element/float.json +++ b/entry/src/main/resources/base/element/float.json @@ -12,82 +12,10 @@ "name": "middle_font_size", "value": "16fp" }, - { - "name": "split_line_width", - "value": "1vp" - }, - { - "name": "split_line_height", - "value": "18vp" - }, - { - "name": "more_width", - "value": "16vp" - }, - { - "name": "more_height", - "value": "16vp" - }, - { - "name": "more_margin_left", - "value": "2vp" - }, - { - "name": "more_margin_right", - "value": "2vp" - }, - { - "name": "classify_title_margin", - "value": "12vp" - }, - { - "name": "search_width", - "value": "20vp" - }, - { - "name": "search_height", - "value": "20vp" - }, - { - "name": "search_radius", - "value": "20vp" - }, - { - "name": "search_margin_left", - "value": "12vp" - }, - { - "name": "search_margin_right", - "value": "8vp" - }, - { - "name": "search_swiper_height", - "value": "40vp" - }, - { - "name": "search_margin_top", - "value": "16vp" - }, - { - "name": "swiper_image_height", - "value": "150vp" - }, { "name": "swiper_radius", "value": "16vp" }, - { - "name": "swiper_margin_top", - "value": "12vp" - }, - { - "name": "swiper_margin_bottom", - "value": "12vp" - }, - { - "name": "image_background_height", - "value": "222vp" - }, { "name": "home_margin_left", "value": "12vp" @@ -112,10 +40,6 @@ "name": "product_layout_margin_bottom", "value": "12vp" }, - { - "name": "product_image_size", - "value": "132vp" - }, { "name": "product_name_margin_top", "value": "8vp" @@ -136,18 +60,6 @@ "name": "product_bonus_margin_left", "value": "8vp" }, - { - "name": "water_flow_image_top", - "value": "12vp" - }, - { - "name": "water_flow_image_bottom", - "value": "8vp" - }, - { - "name": "discount_text_bottom", - "value": "4vp" - }, { "name": "piece_line_height", "value": "19vp" @@ -172,22 +84,10 @@ "name": "promotion_padding_right", "value": "4vp" }, - { - "name": "promotion_margin_top", - "value": "6vp" - }, - { - "name": "promotion_margin_right", - "value": "8vp" - }, { "name": "bonus_points_radius_width", "value": "0.5vp" }, - { - "name": "bonus_points_margin_top", - "value": "6vp" - }, { "name": "bonus_points_padding_left", "value": "8vp" @@ -204,18 +104,6 @@ "name": "water_flow_row_gap", "value": "8vp" }, - { - "name": "footer_text_size", - "value": "10vp" - }, - { - "name": "footer_text_height", - "value": "20vp" - }, - { - "name": "refresh_padding_top", - "value": "12vp" - }, { "name": "loadingProgress_width", "value": "30vp" @@ -232,34 +120,10 @@ "name": "flow_press_btn_height", "value": "48" }, - { - "name": "toolbar_font_size", - "value": "13" - }, - { - "name": "toolbar_top_height", - "value": "36" - }, - { - "name": "toolbar_top_width", - "value": "36" - }, - { - "name": "toolbar_padding_top", - "value": "6" - }, - { - "name": "toolbar_padding_bottom", - "value": "4" - }, { "name": "progress_font_size", "value": "11" }, - { - "name": "progress_margin_top", - "value": "5" - }, { "name": "grid_padding_top", "value": "16" @@ -288,14 +152,6 @@ "name": "grid_image_height", "value": "48" }, - { - "name": "grid_image_padding_left", - "value": "14" - }, - { - "name": "grid_image_padding_right", - "value": "14" - }, { "name": "tab_font_size", "value": "14" @@ -324,58 +180,6 @@ "name": "tab_padding_right", "value": "8" }, - { - "name": "tab_more_width", - "value": "40" - }, - { - "name": "tab_more_height", - "value": "40" - }, - { - "name": "tab_more_padding_left", - "value": "8" - }, - { - "name": "title_font_size", - "value": "30fp" - }, - { - "name": "text_size", - "value": "16fp" - }, - { - "name": "padding_index_top", - "value": "84vp" - }, - { - "name": "margin_index_top", - "value": "14vp" - }, - { - "name": "margin_index_bottom", - "value": "18vp" - }, - { - "name": "double_text_size", - "value": "18fp" - }, - { - "name": "index_item_padding_left", - "value": "12" - }, - { - "name": "index_arrow_width", - "value": "24" - }, - { - "name": "index_arrow_height", - "value": "24" - }, - { - "name": "index_item_margin_right", - "value": "12" - }, { "name": "sections_tab_width", "value": "56" @@ -384,42 +188,14 @@ "name": "sections_tab_radius", "value": "21" }, - { - "name": "sections_back_width", - "value": "40" - }, - { - "name": "sections_back_height", - "value": "40" - }, - { - "name": "sections_back_padding", - "value": "8" - }, - { - "name": "sections_back_radius", - "value": "20" - }, { "name": "sections_margin", "value": "8" }, - { - "name": "sections_page_margin_left_right", - "value": "16" - }, - { - "name": "sections_page_margin_top_bottom", - "value": "8" - }, { "name": "sections_item_radius", "value": "8" }, - { - "name": "sections_item_blur_height", - "value": "32" - }, { "name": "sections_item_text_size", "value": "12" @@ -431,18 +207,6 @@ { "name": "sections_item_text_margin_bottom", "value": "4" - }, - { - "name": "sections_item_center_text_margin_bottom", - "value": "8" - }, - { - "name": "sections_sticky_tab_height", - "value": "36" - }, - { - "name": "sections_sticky_select_text_size", - "value": "16" } ] } \ No newline at end of file diff --git a/entry/src/main/resources/base/element/strarray.json b/entry/src/main/resources/base/element/strarray.json deleted file mode 100644 index 7c2438d302a4dcd166db49d3ad251d027b8d2d51..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/element/strarray.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "strarray": [ - { - "name": "tab_titles", - "value": [ - { - "value": "All" - }, - { - "value": "Health" - }, - { - "value": "Town" - }, - { - "value": "Food" - }, - { - "value": "Double" - }, - { - "value": "Firework" - } - ] - } - ] -} \ No newline at end of file diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index a04249d0911035f1e3b68c0897c65ab4740fedee..55f9e68685bcf834e938ebcfe085504cd594f6ac 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -44,118 +44,10 @@ "name": "title_bar_furniture_kitchenware", "value": "Furniture" }, - { - "name": "title_bar_classification", - "value": "Classifieds" - }, - { - "name": "search_text", - "value": "Children's dining chair" - }, - { - "name": "footer_text", - "value": "It's been to the end." - }, - { - "name": "page_show", - "value": "page from package" - }, { "name": "internet_reason", "value": "Used for accessing the Internet to retrieve waterfall feed card data" }, - { - "name": "difficulty", - "value": "Difficulty" - }, - { - "name": "tab_title_data_Native", - "value": "Native" - }, - { - "name": "tab_title_data_arkui", - "value": "UI layout" - }, - { - "name": "tab_title_data_other", - "value": "Other" - }, - { - "name": "tab_title_data_tripartite_library", - "value": "Third Lib" - }, - { - "name": "tab_title_data_dynamic_effect", - "value": "Effect" - }, - { - "name": "main_page_top_borderRadius", - "value": "8" - }, - { - "name": "main_page_list_borderRadius", - "value": "6" - }, - { - "name": "main_page_padding1", - "value": "10" - }, - { - "name": "main_page_padding2", - "value": "12" - }, - { - "name": "main_page_padding3", - "value": "16" - }, - { - "name": "main_page_padding4", - "value": "18" - }, - { - "name": "main_page_padding5", - "value": "8" - }, - { - "name": "main_page_padding_list_bottom", - "value": "350" - }, - { - "name": "main_page_swiper_height", - "value": "200" - }, - { - "name": "main_page_text_height", - "value": "16" - }, - { - "name": "main_page_text_font_size", - "value": "12" - }, - { - "name": "main_page_margin1", - "value": "10" - }, - { - "name": "main_page_margin2", - "value": "12" - }, - { - "name": "main_page_tab_text_underline", - "value": "2" - }, - { - "name": "main_page_water_flow_gap", - "value": "6" - }, - { - "name": "item_gap_half", - "value": "3" - }, - { - "name": "ohos_id_text_size_body1", - "value": "16" - }, { "name": "grid_work", "value": "Work" @@ -204,58 +96,6 @@ "name": "seen_button_text", "value": "Seen" }, - { - "name": "want_to_eat", - "value": "Wanted" - }, - { - "name": "distance", - "value": "Distance" - }, - { - "name": "less_1km", - "value": "<1km" - }, - { - "name": "less_5km", - "value": "<5km" - }, - { - "name": "more_5km", - "value": ">5km" - }, - { - "name": "classify", - "value": "Classify" - }, - { - "name": "food", - "value": "Food" - }, - { - "name": "leisure", - "value": "Leisure" - }, - { - "name": "entertainment", - "value": "Fun" - }, - { - "name": "sort", - "value": "Sort" - }, - { - "name": "one", - "value": "1" - }, - { - "name": "two", - "value": "2" - }, - { - "name": "three", - "value": "3" - }, { "name": "sticky_tab_all", "value": "All" @@ -276,10 +116,6 @@ "name": "sticky_tab_user", "value": "User" }, - { - "name": "sticky_tab_other", - "value": "Other" - }, { "name": "recommend", "value": "Recommend" diff --git a/entry/src/main/resources/base/media/ic_app_background.png b/entry/src/main/resources/base/media/ic_app_background.png deleted file mode 100644 index 86fec16ea0928b2201c9d5d092fac5e2a9cd3749..0000000000000000000000000000000000000000 Binary files a/entry/src/main/resources/base/media/ic_app_background.png and /dev/null differ diff --git a/entry/src/main/resources/base/media/ic_more.svg b/entry/src/main/resources/base/media/ic_more.svg deleted file mode 100644 index 7403c7937d56b7d40373b733c4c2a49559fc2ca2..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_more.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_arrow_left.svg b/entry/src/main/resources/base/media/ic_public_arrow_left.svg deleted file mode 100644 index 8f198f64ac2740c11731375c2ec8bb0de8af2bdb..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_arrow_left.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - Public/ic_public_arrow_left - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_public_arrow_right.svg b/entry/src/main/resources/base/media/ic_public_arrow_right.svg deleted file mode 100644 index 0ddab9a995f5954c12452f90583f1fc572f00b51..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/base/media/ic_public_arrow_right.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - Public/ic_public_arrow_right - Created with Sketch. - - - - - - - - - - \ No newline at end of file diff --git a/entry/src/main/resources/base/media/ic_search.png b/entry/src/main/resources/base/media/ic_search.png deleted file mode 100644 index 8bc3b1eec293469c3dcadc6dd5a39649b6de1bea..0000000000000000000000000000000000000000 Binary files a/entry/src/main/resources/base/media/ic_search.png and /dev/null differ diff --git a/entry/src/main/resources/en_US/element/strarray.json b/entry/src/main/resources/en_US/element/strarray.json deleted file mode 100644 index 7c2438d302a4dcd166db49d3ad251d027b8d2d51..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/en_US/element/strarray.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "strarray": [ - { - "name": "tab_titles", - "value": [ - { - "value": "All" - }, - { - "value": "Health" - }, - { - "value": "Town" - }, - { - "value": "Food" - }, - { - "value": "Double" - }, - { - "value": "Firework" - } - ] - } - ] -} \ No newline at end of file diff --git a/entry/src/main/resources/en_US/element/string.json b/entry/src/main/resources/en_US/element/string.json index 88d666b186eef9d5493d0fb37770e65cbb5e95c8..03d5b4aba1adc133a767c4592e934eef5abdecd6 100644 --- a/entry/src/main/resources/en_US/element/string.json +++ b/entry/src/main/resources/en_US/element/string.json @@ -44,114 +44,6 @@ "name": "title_bar_furniture_kitchenware", "value": "Furniture" }, - { - "name": "title_bar_classification", - "value": "Classifieds" - }, - { - "name": "search_text", - "value": "Children's dining chair" - }, - { - "name": "footer_text", - "value": "It's been to the end." - }, - { - "name": "page_show", - "value": "page from package" - }, - { - "name": "difficulty", - "value": "Difficulty" - }, - { - "name": "tab_title_data_Native", - "value": "Native" - }, - { - "name": "tab_title_data_arkui", - "value": "UI layout" - }, - { - "name": "tab_title_data_other", - "value": "Other" - }, - { - "name": "tab_title_data_tripartite_library", - "value": "Third Lib" - }, - { - "name": "tab_title_data_dynamic_effect", - "value": "Effect" - }, - { - "name": "main_page_top_borderRadius", - "value": "8" - }, - { - "name": "main_page_list_borderRadius", - "value": "6" - }, - { - "name": "main_page_padding1", - "value": "10" - }, - { - "name": "main_page_padding2", - "value": "12" - }, - { - "name": "main_page_padding3", - "value": "16" - }, - { - "name": "main_page_padding4", - "value": "18" - }, - { - "name": "main_page_padding5", - "value": "8" - }, - { - "name": "main_page_padding_list_bottom", - "value": "350" - }, - { - "name": "main_page_swiper_height", - "value": "200" - }, - { - "name": "main_page_text_height", - "value": "16" - }, - { - "name": "main_page_text_font_size", - "value": "12" - }, - { - "name": "main_page_margin1", - "value": "10" - }, - { - "name": "main_page_margin2", - "value": "12" - }, - { - "name": "main_page_tab_text_underline", - "value": "2" - }, - { - "name": "main_page_water_flow_gap", - "value": "6" - }, - { - "name": "item_gap_half", - "value": "3" - }, - { - "name": "ohos_id_text_size_body1", - "value": "16" - }, { "name": "grid_work", "value": "Work" @@ -200,58 +92,6 @@ "name": "seen_button_text", "value": "Seen" }, - { - "name": "want_to_eat", - "value": "Wanted" - }, - { - "name": "distance", - "value": "Distance" - }, - { - "name": "less_1km", - "value": "<1km" - }, - { - "name": "less_5km", - "value": "<5km" - }, - { - "name": "more_5km", - "value": ">5km" - }, - { - "name": "classify", - "value": "Classify" - }, - { - "name": "food", - "value": "Food" - }, - { - "name": "leisure", - "value": "Leisure" - }, - { - "name": "entertainment", - "value": "Fun" - }, - { - "name": "sort", - "value": "Sort" - }, - { - "name": "one", - "value": "1" - }, - { - "name": "two", - "value": "2" - }, - { - "name": "three", - "value": "3" - }, { "name": "sticky_tab_all", "value": "All" @@ -272,10 +112,6 @@ "name": "sticky_tab_user", "value": "User" }, - { - "name": "sticky_tab_other", - "value": "Other" - }, { "name": "recommend", "value": "Recommend" diff --git a/entry/src/main/resources/zh_CN/element/strarray.json b/entry/src/main/resources/zh_CN/element/strarray.json deleted file mode 100644 index bd04fd818eb150e65002c4c8b849a0cad3bb64fc..0000000000000000000000000000000000000000 --- a/entry/src/main/resources/zh_CN/element/strarray.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "strarray": [ - { - "name": "tab_titles", - "value": [ - { - "value": "所有" - }, - { - "value": "健康" - }, - { - "value": "小镇" - }, - { - "value": "美食" - }, - { - "value": "双人" - }, - { - "value": "烟花" - } - ] - } - ] -} \ No newline at end of file diff --git a/entry/src/main/resources/zh_CN/element/string.json b/entry/src/main/resources/zh_CN/element/string.json index 3979faf09edfda0f825e4e3a4fd9aeba276a645a..cc01bf2d2a6d8c25010024066b93558e37c341d6 100644 --- a/entry/src/main/resources/zh_CN/element/string.json +++ b/entry/src/main/resources/zh_CN/element/string.json @@ -16,10 +16,6 @@ "name": "title", "value": "WaterFlow瀑布流实例" }, - { - "name": "page_show", - "value": "page from package" - }, { "name": "title_bar_homepage", "value": "首页" @@ -48,114 +44,10 @@ "name": "title_bar_furniture_kitchenware", "value": "家具厨具" }, - { - "name": "title_bar_classification", - "value": "分类" - }, - { - "name": "search_text", - "value": "儿童餐椅" - }, - { - "name": "footer_text", - "value": "已经到底了" - }, { "name": "internet_reason", "value": "用于获取瀑布流卡片数据使用Internet网络" }, - { - "name": "difficulty", - "value": "难度 " - }, - { - "name": "tab_title_data_Native", - "value": "Native" - }, - { - "name": "tab_title_data_arkui", - "value": "UI布局" - }, - { - "name": "tab_title_data_other", - "value": "其他" - }, - { - "name": "tab_title_data_tripartite_library", - "value": "三方库" - }, - { - "name": "tab_title_data_dynamic_effect", - "value": "动效" - }, - { - "name": "main_page_top_borderRadius", - "value": "8" - }, - { - "name": "main_page_list_borderRadius", - "value": "6" - }, - { - "name": "main_page_padding1", - "value": "10" - }, - { - "name": "main_page_padding2", - "value": "12" - }, - { - "name": "main_page_padding3", - "value": "16" - }, - { - "name": "main_page_padding4", - "value": "18" - }, - { - "name": "main_page_padding5", - "value": "8" - }, - { - "name": "main_page_padding_list_bottom", - "value": "350" - }, - { - "name": "main_page_swiper_height", - "value": "200" - }, - { - "name": "main_page_text_height", - "value": "16" - }, - { - "name": "main_page_text_font_size", - "value": "12" - }, - { - "name": "main_page_margin1", - "value": "10" - }, - { - "name": "main_page_margin2", - "value": "12" - }, - { - "name": "main_page_tab_text_underline", - "value": "2" - }, - { - "name": "main_page_water_flow_gap", - "value": "6" - }, - { - "name": "item_gap_half", - "value": "3" - }, - { - "name": "ohos_id_text_size_body1", - "value": "16" - }, { "name": "grid_work", "value": "智慧办公" @@ -204,58 +96,6 @@ "name": "seen_button_text", "value": "看过了" }, - { - "name": "want_to_eat", - "value": "想吃榜" - }, - { - "name": "distance", - "value": "位置距离" - }, - { - "name": "less_1km", - "value": "<1km" - }, - { - "name": "less_5km", - "value": "<5km" - }, - { - "name": "more_5km", - "value": ">5km" - }, - { - "name": "classify", - "value": "分类" - }, - { - "name": "food", - "value": "餐饮" - }, - { - "name": "leisure", - "value": "休闲" - }, - { - "name": "entertainment", - "value": "娱乐" - }, - { - "name": "sort", - "value": "排序" - }, - { - "name": "one", - "value": "1" - }, - { - "name": "two", - "value": "2" - }, - { - "name": "three", - "value": "3" - }, { "name": "sticky_tab_all", "value": "综合" @@ -276,10 +116,6 @@ "name": "sticky_tab_user", "value": "用户" }, - { - "name": "sticky_tab_other", - "value": "其他" - }, { "name": "recommend", "value": "推荐"