diff --git a/UI/Animation/entry/src/main/resources/base/element/string.json b/UI/Animation/entry/src/main/resources/base/element/string.json index b5e8958496164fcd9c1f37a517451e02b7203ed1..7d08838acfc11f932ec9a117e3c63cae8ee387b0 100644 --- a/UI/Animation/entry/src/main/resources/base/element/string.json +++ b/UI/Animation/entry/src/main/resources/base/element/string.json @@ -7,6 +7,78 @@ { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "start", + "value": "Start" + }, + { + "name": "serially_animator_group", + "value": "Serially Animator Group" + }, + { + "name": "parallel_animator_group", + "value": "Parallel Animator Group" + }, + { + "name": "animator_group_builder", + "value": "Animator Group Builder" + }, + { + "name": "scale", + "value": "Scale" + }, + { + "name": "rotate", + "value": "Rotate" + }, + { + "name": "alpha", + "value": "Alpha" + }, + { + "name": "translate", + "value": "Translate" + }, + { + "name": "spring", + "value": "Spring" + }, + { + "name": "anticipate", + "value": "Anticipate" + }, + { + "name": "cycle", + "value": "Cycle" + }, + { + "name": "Overshoot", + "value": "Overshoot" + }, + { + "name": "smooth_step", + "value": "Smooth Step" + }, + { + "name": "cubic_hermit", + "value": "Cubic Hermit" + }, + { + "name": "animator_framet", + "value": "Animator Frame" + }, + { + "name": "animator_value", + "value": "Animator Value" + }, + { + "name": "animator_property", + "value": "Animator Property" + }, + { + "name": "animator_group", + "value": "Animator Group" } ] } \ No newline at end of file diff --git a/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml b/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml index dd912434579959831be6c2785f97ca7fa955380f..7d0b29853a5d20f91de7a89650c8265a15dfd8d7 100644 --- a/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml +++ b/UI/Animation/entry/src/main/resources/base/layout/animator_frame_slice_layout.xml @@ -24,7 +24,7 @@ ohos:top_margin="20vp" ohos:height="match_content" ohos:id="$+id:frame_container" - ohos:background_element="$media:01" + ohos:background_element="$graphic:animation_element" ohos:width="match_content"/> - + + \ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js index fb99408e0da9786f7391c7e8018f57677719f73a..e6fc0affd2efccbd805620f9021e13a9e24143d2 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/fixed/index.js @@ -13,12 +13,11 @@ * limitations under the License. */ -export default{ +export default { data: { "height": "300px", - "width": "300px" + "width": "300px" }, - onClickReturn() { this.height = "300px" this.width = "300px" diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css index b2570de7d95c04bfe319ff439b6353a5022d9a2a..a2b192ede28358fc0230dbbb4ac36a1052ab14b2 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.css @@ -13,26 +13,8 @@ * limitations under the License. */ -.container { - width: 100%; - height: 100%; - align-items: center; - flex-direction: column; - justify-content: center; -} -.box { - width: 100%; - align-items: center; - flex-direction: column; - background-color: bisque; -} -.btn { - width: 60%; - height: 100px; - font-size: 40px; - margin-top: 20px; - color: #ff00ff7f; -} +@import "../../common/common.css"; + .aquamarine-box { width: 50%; height: 150px; @@ -40,6 +22,7 @@ text-align: center; background-color: #DAF7A6; } + .yellow-box { width: 50%; height: 150px; @@ -47,10 +30,11 @@ text-align: center; background-color: #FFC300; } + .red-box { width: 50%; height: 150px; display-index: 1; text-align: center; - background-color: #FF5733; + background-color: #FF5733; } \ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml index 9bc84b19cc70102bfd4dd4a224df3d6d4e4ab0c6..fcefc81dd09c7910506657b89404d78e18021680 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.hml @@ -14,11 +14,11 @@ -->
-
+
A B C
- - + +
\ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js index 42ea8ec7220978a5abdb1edc9354e737ede30967..ae6c0da943b8d2f56bfc5f92d78e6d1fe6f3dc02 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/hide/index.js @@ -13,11 +13,10 @@ * limitations under the License. */ -export default{ +export default { data: { - height:"200px", + height: "200px", }, - onClickReturn() { this.height = "200px" }, diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css index 46472a3f6aa8bda7c3194b11a31eb25f64088af5..169b7190ad7079ad681b7bac152441d590b3620b 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.css @@ -13,17 +13,5 @@ * limitations under the License. */ -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.btn { - width: 60%; - height: 100px; - font-size: 40px; - margin-top: 20px; - color: #ff00ff7f; -} +@import "../../common/common.css"; diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml index 784ee2d7b37fd0ed8b65ed86e246b4fbcca36c4f..a9aeeee806d459a69d4a472d13cafba55163f362 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.hml @@ -14,7 +14,7 @@ -->
- - - + + +
\ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js index ef24408bd749c01803d429ba17b960e5eed0fa77..4b69bc8c8246292d7c0653cb8e906104d2d3597c 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/index/index.js @@ -14,24 +14,12 @@ */ import router from '@system.router'; -export default { - data: { - }, - onClickHidecapabilities() { - router.push({ - uri: "pages/hide/index" - }) - }, - onClickPercentage() { - router.push({ - uri: "pages/percentage/index" - }) - }, - - onClickFixedscale() { +export default { + data: {}, + onchange(type) { router.push({ - uri: "pages/fixed/index" + uri: "pages/" + type + "/index" }) } } diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css index 6f94aa17987b6a7bd15a3b72bc49a82b7f804aaa..e48fccdc888db4c1aff647ca12f98214e4d29320 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.css @@ -13,26 +13,8 @@ * limitations under the License. */ -.container { - width: 100%; - height: 100%; - align-items: center; - justify-content: center; - flex-direction: column; -} -.box { - width: 100%; - align-items: center; - flex-direction: column; - background-color: bisque; -} -.btn { - width: 60%; - height: 100px; - font-size: 40px; - margin-top: 20px; - color: #ff00ff7f; -} +@import "../../common/common.css"; + .aquamarine-box { width: 50%; height: 10%; @@ -40,6 +22,7 @@ text-align: center; background-color: #DAF7A6; } + .yellow-box { width: 50%; height: 10%; @@ -47,10 +30,11 @@ text-align: center; background-color: #FFC300; } + .red-box { width: 50%; height: 10%; flex-weight: 2; text-align: center; - background-color: #FF5733; + background-color: #FF5733; } \ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml index ac54669c2568bebac89af6a30277401d9fb3dd3b..fcefc81dd09c7910506657b89404d78e18021680 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.hml @@ -14,11 +14,11 @@ -->
-
+
A B C
- - + +
\ No newline at end of file diff --git a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js index 51dea13a46634496abdb35fb12f8b5238656dfe6..6b22dfdbd7a981b14dd0e46287e27e93ac1c564f 100644 --- a/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js +++ b/UI/AtomicLayout/entry/src/main/js/default/pages/percentage/index.js @@ -13,11 +13,10 @@ * limitations under the License. */ -export default{ +export default { data: { - height:"200px", + height: "200px", }, - onClickReturn() { this.height = "200px" }, diff --git a/UI/Badge/entry/src/main/js/default/pages/index/index.css b/UI/Badge/entry/src/main/js/default/pages/index/index.css index 3c45d11f3d8cdc3ae58d84082ebe41a9100c0930..e682dbff69bd21c14923eec012ba12c24b2319d2 100644 --- a/UI/Badge/entry/src/main/js/default/pages/index/index.css +++ b/UI/Badge/entry/src/main/js/default/pages/index/index.css @@ -19,16 +19,18 @@ align-items: center; background-color: #F2F3F5; } + .item { height: 72px; width: 100%; display: flex; - align-items:center; + align-items: center; margin-right: 12px; margin-left: 12px; margin-bottom: 2px; background-color: white; } + .img { height: 40px; width: 40px; @@ -36,6 +38,7 @@ margin-right: 12px; border-radius: 20px; } + .content { display: flex; flex-direction: column; @@ -43,6 +46,7 @@ justify-content: space-between; align-content: flex-start; } + .badge { position: absolute; height: 100%; @@ -50,6 +54,7 @@ left: 70%; margin-right: 10px; } + .title { font-size: 16px; color: #e6000000; @@ -57,6 +62,7 @@ margin-top: 8px; margin-bottom: 1px; } + .text { font-size: 14px; color: #99000000; diff --git a/UI/Badge/entry/src/main/js/default/pages/index/index.hml b/UI/Badge/entry/src/main/js/default/pages/index/index.hml index 868b98e36bd03af9b7ce62ed4b2625de28e96827..98351e793932a156d082a156404cc9d85b27978d 100644 --- a/UI/Badge/entry/src/main/js/default/pages/index/index.hml +++ b/UI/Badge/entry/src/main/js/default/pages/index/index.hml @@ -14,32 +14,14 @@ -->
-
- +
+
- {{$t('strings.contacts')}} - {{ $t('strings.message') }} - - - -
-
-
- -
- {{$t('strings.contacts')}} - {{ $t('strings.message') }} - - - -
-
-
- -
- {{$t('strings.contacts')}} - {{$t('strings.message') }} - + {{ $item.contacts }} + {{ $item.message }} +
diff --git a/UI/Badge/entry/src/main/js/default/pages/index/index.js b/UI/Badge/entry/src/main/js/default/pages/index/index.js index 1f4b0091ad134cb245b83c36563005350240443d..10257b51b2ad34ed61d3d12b8cfb56e1ce19549a 100644 --- a/UI/Badge/entry/src/main/js/default/pages/index/index.js +++ b/UI/Badge/entry/src/main/js/default/pages/index/index.js @@ -15,26 +15,48 @@ export default { data: { - badgeConfig:{ - badgeColor:"#FFFF0F0F", - textColor:"#ffffff", - }, - badgeConfigDigital:{ - badgeSize: "8px", - badgeColor:"#FFFF0F0F", - textColor:"#ffffff", - }, - visibility:"visible", - visibilityText:"visible", - visibilityDigital: "visible" + array: [ + { + imgPath: '/common/images/Image1.jpg', + contacts: "", + message: "", + visibility: "", + count: "", + maxCount: "" + }, + { + imgPath: '/common/images/Image2.jpg', + contacts: '', + message: '', + visibility: "", + count: "100", + maxCount: "99" + }, + { + imgPath: '/common/images/Image3.jpg', + contacts: '', + message: '', + visibility: "", + count: "35", + maxCount: "99" + } + ], + badgeConfig: { + badgeColor: "#FFFF0F0F", + textColor: "#ffffff", + } }, - badgeInvalidationDigital:function() { - this.visibilityDigital = "hidden"; - }, - badgeInvalidation:function() { - this.visibility = "hidden"; - }, - badgeInvalidationText:function() { - this.visibilityText = "hidden"; + onInit() { + for (var arr in this.array) { + this.array[arr].contacts = this.$t('strings.contacts'); + this.array[arr].message = this.$t('strings.message'); + this.array[arr].visibility = "visible" + } }, + badgeInvalidation(id) { + var idx = JSON.stringify(id) + console.log(idx) + this.array[idx].visibility = "hidden"; + console.log(this.array[idx].visibility) + } } \ No newline at end of file diff --git a/UI/CommonLayout/entry/src/main/resources/base/element/string.json b/UI/CommonLayout/entry/src/main/resources/base/element/string.json index 11dc7e455e2deede110fdccd39478ce9938a2bdd..ace19dcb9abc2e738397d074be45508b873b32e6 100644 --- a/UI/CommonLayout/entry/src/main/resources/base/element/string.json +++ b/UI/CommonLayout/entry/src/main/resources/base/element/string.json @@ -7,6 +7,66 @@ { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "title", + "value": "Title" + }, + { + "name": "catalog", + "value": "Catalog" + }, + { + "name": "serif", + "value": "serif" + }, + { + "name": "content", + "value": "Content" + }, + { + "name": "previous", + "value": "Previous" + }, + { + "name": "Next", + "value": "next" + }, + { + "name": "vertical", + "value": "vertical" + }, + { + "name": "btn_1", + "value": "Button 1" + }, + { + "name": "btn_2", + "value": "Button 2" + }, + { + "name": "btn_3", + "value": "Button 3" + }, + { + "name": "horizontal", + "value": "horizontal" + }, + { + "name": "alignment", + "value": "alignment" + }, + { + "name": "weight", + "value": "weight" + }, + { + "name": "directional", + "value": "DirectionalLayout" + }, + { + "name": "dependent", + "value": "DependentLayout" } ] } \ No newline at end of file diff --git a/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml b/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml index cd4857aa4d3f60438e93b02c5fe72cc22faa9962..487dfc59bde4d03c98611fdd97a29ad8774d3907 100644 --- a/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml +++ b/UI/CommonLayout/entry/src/main/resources/base/layout/dependentlayout_ability_slice.xml @@ -27,7 +27,7 @@ ohos:background_element="$graphic:color_gray_element" ohos:left_margin="15vp" ohos:right_margin="15vp" - ohos:text="Title" + ohos:text="$string:title" ohos:text_alignment="horizontal_center" ohos:text_size="25fp" ohos:text_weight="1000" @@ -44,9 +44,9 @@ ohos:left_margin="15vp" ohos:multiple_lines="true" ohos:right_margin="15vp" - ohos:text="Catalog" + ohos:text="$string:catalog" ohos:text_alignment="center" - ohos:text_font="serif" + ohos:text_font="$string:serif" ohos:text_size="10vp" ohos:top_margin="15vp"/> @@ -59,9 +59,9 @@ ohos:bottom_margin="15vp" ohos:end_of="$id:catalog_text" ohos:right_margin="15vp" - ohos:text="Content" + ohos:text="$string:content" ohos:text_alignment="center" - ohos:text_font="serif" + ohos:text_font="$string:serif" ohos:text_size="25fp" ohos:top_margin="15vp"/> @@ -75,8 +75,8 @@ ohos:italic="false" ohos:left_of="$id:next_button" ohos:right_margin="15vp" - ohos:text="Previous" - ohos:text_font="serif" + ohos:text="$string:previous" + ohos:text_font="$string:serif" ohos:text_size="15fp" ohos:text_weight="5"/> @@ -90,8 +90,8 @@ ohos:bottom_margin="15vp" ohos:italic="false" ohos:right_margin="15vp" - ohos:text="Next" - ohos:text_font="serif" + ohos:text="$string:Next" + ohos:text_font="$string:serif" ohos:text_size="15fp" ohos:text_weight="5"/> \ No newline at end of file diff --git a/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml b/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml index b8afb394ec4a1fdfb6fc12a941358eafbbcab47e..d839df851fbbc5f3dac987393c2d16c8bba74403 100644 --- a/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml +++ b/UI/CommonLayout/entry/src/main/resources/base/layout/directionalLayout_ability_slice.xml @@ -28,7 +28,7 @@ ohos:layout_alignment="horizontal_center" ohos:left_margin="15vp" ohos:right_margin="15vp" - ohos:text="vertical" + ohos:text="$string:vertical" ohos:text_size="16fp" ohos:top_margin="10vp"/> @@ -43,7 +43,7 @@ ohos:background_element="$graphic:color_light_gray_element" ohos:bottom_margin="3vp" ohos:left_margin="15vp" - ohos:text="Button 1" + ohos:text="$string:btn_1" ohos:text_size="16fp"/> +
{{$t('Strings.batterySubscribeEvent')}}
- +
{{$t('Strings.batteryUnSubscribeEvent')}}
- +
\ No newline at end of file diff --git a/UI/JsCallJava/entry/src/main/js/default/pages/index/index.js b/UI/JsCallJava/entry/src/main/js/default/pages/index/index.js index e005934bc9cadc3a9c6bd96865b42bce3f343514..deb81eeb83e56cc89463131ba183c3ce655d1ffb 100644 --- a/UI/JsCallJava/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsCallJava/entry/src/main/js/default/pages/index/index.js @@ -14,9 +14,6 @@ */ import prompt from '@system.prompt' -const injectRef = Object.getPrototypeOf(global) || global - -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') export default { batteryLevel: function () { this.getBatteryLevel(); diff --git a/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.hml b/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.hml index 257bed33e5967ba3f5e30498d9de795814739808..564dac3e90211b76ff438e74d6059867a7bc1edd 100644 --- a/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.hml +++ b/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.hml @@ -19,7 +19,7 @@ Click here to view hidden text - - hello world + + hello worldshow
\ No newline at end of file diff --git a/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.js b/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.js index dd7efc0dded61b821f853435595e787c47ffb72f..65c31d2eb558016ab984478d3bdbf423291cb1a5 100644 --- a/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.js +++ b/UI/JsComponents/entry/src/main/js/default/pages/comp/comp.js @@ -22,7 +22,7 @@ export default { }, data() { return { - show: this.showObject, + display: this.showObject, }; }, childClicked() { diff --git a/UI/JsGallery/entry/src/main/js/default/pages/index/index.js b/UI/JsGallery/entry/src/main/js/default/pages/index/index.js index cdc525cb5119d5a848b7091c9608acc3ca9fd4b6..67b51d4d5b04b504fd1c62cedbec56af03aea856 100644 --- a/UI/JsGallery/entry/src/main/js/default/pages/index/index.js +++ b/UI/JsGallery/entry/src/main/js/default/pages/index/index.js @@ -48,10 +48,10 @@ export default { }) } } else { - for (var i = 1;i <= 200; i++) { + for (var j = 1;j <= 200; j++) { this.imgsrc.push({ - SourceFile: '/common/image/LOADPIC_' + ('0000' + i).slice(-4) + '.png', - order: i + SourceFile: '/common/image/LOADPIC_' + ('0000' + j).slice(-4) + '.png', + order: j }) } } diff --git a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.hml b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.hml index dfc9534767e95ca3547618a3055225e7f19269e8..1449ba12336b3108cd815bed2cad43f25ffa658c 100644 --- a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.hml +++ b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.hml @@ -82,7 +82,7 @@
- + 发货
diff --git a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.js b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.js index 9bc0950b939fc91fb3a250d9a8db03eabca6cca3..d84073b886a7bf373304f8284365b5e28983cb27 100644 --- a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.js +++ b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/deliveryInfo/deliveryInfo.js @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import prompt from '@system.prompt'; import router from '@system.router'; export default { diff --git a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.hml b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.hml index 1b03317625199a38d97cdfc27d25dd5f38b95284..77f24efac237ec78474090c306d3391461cf96c5 100644 --- a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.hml +++ b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.hml @@ -96,7 +96,7 @@
-
+
X关闭 diff --git a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.js b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.js index 1ab3838ba6b33d7ce3b6dbed49f8b6d8c55323d7..1357d6d10d560fa960af08cd07c54257ce26c1af 100644 --- a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.js +++ b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/detail/detail.js @@ -24,7 +24,7 @@ export default { tempList: [], beginIndex: 0, endIndex: 0, - show: false, + display: false, playBar: false, smallVideoTime: 0, bigVideoTime: 0, diff --git a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/recommend/recommend.js b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/recommend/recommend.js index 094dfe28948a40e80c4b0ce3866427c74636657f..a88b5d9a4be70be37f53b29bb716746d2ad6db3d 100644 --- a/UI/JsShopping/entry/src/main/js/default/pages/detailPage/recommend/recommend.js +++ b/UI/JsShopping/entry/src/main/js/default/pages/detailPage/recommend/recommend.js @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from '@system.router'; export default { props: [ diff --git a/UI/JsShopping/entry/src/main/js/default/pages/homePage/coreModule/coreModule.js b/UI/JsShopping/entry/src/main/js/default/pages/homePage/coreModule/coreModule.js index 5d71b58fa15c8c081703c9d3562f444b940b88d8..13b68caf26c4a2edf38a1c6165533505eee51349 100644 --- a/UI/JsShopping/entry/src/main/js/default/pages/homePage/coreModule/coreModule.js +++ b/UI/JsShopping/entry/src/main/js/default/pages/homePage/coreModule/coreModule.js @@ -12,7 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import router from '@system.router' export default { props: ['coredata'], diff --git a/UI/JsStartMode/screenshots/device/NormalFullscreenMode.jpg b/UI/JsStartMode/screenshots/device/NormalFullscreenMode.jpg new file mode 100644 index 0000000000000000000000000000000000000000..846075fbcbd0df210af05e6138693ae2879dd889 Binary files /dev/null and b/UI/JsStartMode/screenshots/device/NormalFullscreenMode.jpg differ diff --git a/UI/JsStartMode/screenshots/device/NormalFullscreenMode.png b/UI/JsStartMode/screenshots/device/NormalFullscreenMode.png deleted file mode 100644 index 418852af5d6a2741691d4066b064017df0ad4e0f..0000000000000000000000000000000000000000 Binary files a/UI/JsStartMode/screenshots/device/NormalFullscreenMode.png and /dev/null differ diff --git a/UI/JsStartMode/screenshots/device/PopupWindowMode.jpg b/UI/JsStartMode/screenshots/device/PopupWindowMode.jpg new file mode 100644 index 0000000000000000000000000000000000000000..3b9620f5c7b022f400bc9eb29cc52769f4f38305 Binary files /dev/null and b/UI/JsStartMode/screenshots/device/PopupWindowMode.jpg differ diff --git a/UI/JsStartMode/screenshots/device/PopupWindowMode.png b/UI/JsStartMode/screenshots/device/PopupWindowMode.png deleted file mode 100644 index 66e6203d32699b4b25310770359750a2745d8cc0..0000000000000000000000000000000000000000 Binary files a/UI/JsStartMode/screenshots/device/PopupWindowMode.png and /dev/null differ diff --git a/UI/JsStartMode/screenshots/device/SemimodePopupWindow.jpg b/UI/JsStartMode/screenshots/device/SemimodePopupWindow.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2e0e6c55d410d146e293f7c0229918c9295f9ed1 Binary files /dev/null and b/UI/JsStartMode/screenshots/device/SemimodePopupWindow.jpg differ diff --git a/UI/JsStartMode/screenshots/device/SemimodePopupWindow.png b/UI/JsStartMode/screenshots/device/SemimodePopupWindow.png deleted file mode 100644 index a56da77e742a67e16c7b9c00e76ed0158d6004f2..0000000000000000000000000000000000000000 Binary files a/UI/JsStartMode/screenshots/device/SemimodePopupWindow.png and /dev/null differ diff --git a/UI/JsStartMode/screenshots/device/main.jpg b/UI/JsStartMode/screenshots/device/main.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a9135a7c9f4d93c3190161948cc6dfd7ee3b13fa Binary files /dev/null and b/UI/JsStartMode/screenshots/device/main.jpg differ diff --git a/UI/List/entry/src/main/java/ohos/samples/listcontainer/provider/ContactItemProvider.java b/UI/List/entry/src/main/java/ohos/samples/listcontainer/provider/ContactItemProvider.java index f6adcf57bde09961cf31a02fc2223dee90d3ac16..7460ae8b6428c59e27bf78d4953d81bff1fa4416 100644 --- a/UI/List/entry/src/main/java/ohos/samples/listcontainer/provider/ContactItemProvider.java +++ b/UI/List/entry/src/main/java/ohos/samples/listcontainer/provider/ContactItemProvider.java @@ -22,7 +22,7 @@ import ohos.agp.components.Button; import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; import ohos.agp.components.LayoutScatter; -import ohos.agp.components.RecycleItemProvider; +import ohos.agp.components.BaseItemProvider; import ohos.agp.components.Text; import ohos.agp.components.TextField; import ohos.agp.window.dialog.CommonDialog; @@ -33,7 +33,7 @@ import java.util.List; /** * contactItemProvider */ -public class ContactItemProvider extends RecycleItemProvider { +public class ContactItemProvider extends BaseItemProvider { private static final int DIALOG_WIDTH = 900; private static final int DIALOG_HEIGHT = 600; @@ -44,7 +44,7 @@ public class ContactItemProvider extends RecycleItemProvider { private List contactData; - private Context context; + private final Context context; public ContactItemProvider(Context context, List contactData) { this.contactData = contactData; @@ -68,13 +68,11 @@ public class ContactItemProvider extends RecycleItemProvider { @Override public Component getComponent(int position, Component component, ComponentContainer componentContainer) { - Component container = getItemComponent(position); - return container; + return getItemComponent(position); } private Component getItemComponent(int position) { - Component container = getComponent(position); - return container; + return getComponent(position); } private Component getComponent(int position) { diff --git a/UI/List/entry/src/main/resources/base/element/string.json b/UI/List/entry/src/main/resources/base/element/string.json index 11c98db125ddf5cc52362f57217a29ef29c63a2e..cefed0a6d8a5062aaffc42205e30b37622934a12 100644 --- a/UI/List/entry/src/main/resources/base/element/string.json +++ b/UI/List/entry/src/main/resources/base/element/string.json @@ -7,6 +7,22 @@ { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "contact_edit", + "value": "Contact Edit" + }, + { + "name": "save", + "value": "Save" + }, + { + "name": "edit", + "value": "Edit" + }, + { + "name": "add", + "value": "+" } ] } \ No newline at end of file diff --git a/UI/List/entry/src/main/resources/base/layout/dialog_layout.xml b/UI/List/entry/src/main/resources/base/layout/dialog_layout.xml index 9c2147ef571bd293a32d1513954fd420e31de36f..9899c41785b944775497ed9e99942067bf19d470 100644 --- a/UI/List/entry/src/main/resources/base/layout/dialog_layout.xml +++ b/UI/List/entry/src/main/resources/base/layout/dialog_layout.xml @@ -25,7 +25,7 @@ ohos:width="match_content" ohos:top_margin="5vp" ohos:height="match_content" - ohos:text="Contact Edit" + ohos:text="$string:contact_edit" ohos:text_size="20fp" ohos:text_color="#000000"/> @@ -80,7 +80,7 @@ ohos:width="match_parent" ohos:bottom_margin="10vp" ohos:height="match_content" - ohos:text="Save" + ohos:text="$string:save" ohos:text_size="20fp" ohos:text_color="#000000"/> \ No newline at end of file diff --git a/UI/List/entry/src/main/resources/base/layout/list_item.xml b/UI/List/entry/src/main/resources/base/layout/list_item.xml index 01fbea37b1f106892829bfd664a2e912524b329f..1a059c58c1cb03403c97029330a00217b8025052 100644 --- a/UI/List/entry/src/main/resources/base/layout/list_item.xml +++ b/UI/List/entry/src/main/resources/base/layout/list_item.xml @@ -32,7 +32,7 @@ diff --git a/UI/Localization/entry/src/main/java/ohos/samples/timezone/slice/MainAbilitySlice.java b/UI/Localization/entry/src/main/java/ohos/samples/timezone/slice/MainAbilitySlice.java index 2ec12a2ac544457480968eacb10f7d66b86c48f2..df42eb66fe3633752bc91b7014db8ffd1c526778 100644 --- a/UI/Localization/entry/src/main/java/ohos/samples/timezone/slice/MainAbilitySlice.java +++ b/UI/Localization/entry/src/main/java/ohos/samples/timezone/slice/MainAbilitySlice.java @@ -29,8 +29,6 @@ import java.util.Locale; * MainAbilitySlice */ public class MainAbilitySlice extends AbilitySlice { - private static final String TAG = MainAbilitySlice.class.getSimpleName(); - private Text countryText; private Text timeDateText; diff --git a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/KeyEventAbilitySlice.java b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/KeyEventAbilitySlice.java index e2e028c217616debd717cdbdeb99bc314e057aa1..b6889a88f7d56101a3d6a64efff1d32027e339d0 100644 --- a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/KeyEventAbilitySlice.java +++ b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/KeyEventAbilitySlice.java @@ -45,15 +45,13 @@ public class KeyEventAbilitySlice extends AbilitySlice { */ private static final int BACK_KEY_CODE = 2; - private Component componentKey; - - private Utils utils = Utils.getInstance(); + private final Utils utils = Utils.getInstance(); @Override protected void onStart(Intent intent) { super.onStart(intent); setUIContent(ResourceTable.Layout_key_main_ability_slice); - componentKey = findComponentById(ResourceTable.Id_key_event_text); + Component componentKey = findComponentById(ResourceTable.Id_key_event_text); HiLog.info(LABEL_LOG, "setKeyEventListener"); componentKey.setKeyEventListener(onKeyEvent); componentKey.setTouchFocusable(true); @@ -74,18 +72,15 @@ public class KeyEventAbilitySlice extends AbilitySlice { utils.showDialogBox(items, referenceContext.get()); } - private Component.KeyEventListener onKeyEvent = new Component.KeyEventListener() { - @Override - public boolean onKeyEvent(Component component, KeyEvent keyEvent) { - HiLog.info(LABEL_LOG, "onKeyEvent"); - if (keyEvent.isKeyDown()) { - int keyCode = keyEvent.getKeyCode(); - if (keyCode != BACK_KEY_CODE) { - showKeyEvent(keyEvent); - } + private final Component.KeyEventListener onKeyEvent = (component, keyEvent) -> { + HiLog.info(LABEL_LOG, "onKeyEvent"); + if (keyEvent.isKeyDown()) { + int keyCode = keyEvent.getKeyCode(); + if (keyCode != BACK_KEY_CODE) { + showKeyEvent(keyEvent); } - return false; } + return false; }; @Override diff --git a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/MouseEventSlice.java b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/MouseEventSlice.java index 4ed86c1009b4f15f47f92363b31faa32fc362981..13f7014485866721dbfa0f162fcbd1bf143b80b1 100644 --- a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/MouseEventSlice.java +++ b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/MouseEventSlice.java @@ -42,7 +42,7 @@ public class MouseEventSlice extends AbilitySlice { private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG); - private Utils utils = Utils.getInstance(); + private final Utils utils = Utils.getInstance(); @Override protected void onStart(Intent intent) { @@ -51,7 +51,7 @@ public class MouseEventSlice extends AbilitySlice { MultimodalEventHandle.registerStandardizedEventHandle(getAbility(), touchEvent); } - private TouchEventHandle touchEvent = event -> { + private final TouchEventHandle touchEvent = event -> { HiLog.info(LABEL_LOG, "mouseEvent"); if (event.getMultimodalEvent() instanceof MouseEvent) { MouseEvent mouseEvent = (MouseEvent) event.getMultimodalEvent(); diff --git a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/SpeechAbilitySlice.java b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/SpeechAbilitySlice.java index 697407f797e2d0403f63eb5339ce6f26d9d24b19..3ddbd5f6994516f773575feb532ddb8f28078625 100644 --- a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/SpeechAbilitySlice.java +++ b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/SpeechAbilitySlice.java @@ -21,7 +21,6 @@ import ohos.agp.components.Component; import ohos.app.Context; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; -import ohos.multimodalinput.event.SpeechEvent; import ohos.samples.multimodeinput.ResourceTable; import ohos.samples.multimodeinput.utils.Utils; @@ -42,28 +41,23 @@ public class SpeechAbilitySlice extends AbilitySlice { private static final String VOICE_EVENT_KEY = "MOVE"; - private Component componentSpeech; - - private Utils utils = Utils.getInstance(); + private final Utils utils = Utils.getInstance(); @Override protected void onStart(Intent intent) { super.onStart(intent); super.setUIContent(ResourceTable.Layout_second_main_ability_slice); - componentSpeech = findComponentById(ResourceTable.Id_speech_event_button); + Component componentSpeech = findComponentById(ResourceTable.Id_speech_event_button); componentSpeech.subscribeVoiceEvents(new Component.VoiceEvent(VOICE_EVENT_KEY)); componentSpeech.setSpeechEventListener(onSpeechEvent); } - private Component.SpeechEventListener onSpeechEvent = new Component.SpeechEventListener() { - @Override - public boolean onSpeechEvent(Component component, SpeechEvent speechEvent) { - HiLog.info(LABEL_LOG, "onSpeechEvent"); - if (speechEvent.getActionProperty() == VOICE_EVENT_KEY) { - showSpeechEvent(); - } - return false; + private final Component.SpeechEventListener onSpeechEvent = (component, speechEvent) -> { + HiLog.info(LABEL_LOG, "onSpeechEvent"); + if (speechEvent.getActionProperty().equals(VOICE_EVENT_KEY)) { + showSpeechEvent(); } + return false; }; private void showSpeechEvent() { diff --git a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/TouchAbilitySlice.java b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/TouchAbilitySlice.java index bbe6791fb7e5b270fd50ba0fb1f8a23e303c6efa..2201ebc3e9f656efdbb56bc76ba02bfefdce676b 100644 --- a/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/TouchAbilitySlice.java +++ b/UI/MultiModeInput/entry/src/main/java/ohos/samples/multimodeinput/slice/TouchAbilitySlice.java @@ -40,16 +40,14 @@ public class TouchAbilitySlice extends AbilitySlice { private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG); - private Component componentTouch; - - private Utils utils = Utils.getInstance(); + private final Utils utils = Utils.getInstance(); @Override protected void onStart(Intent intent) { super.onStart(intent); setUIContent(ResourceTable.Layout_first_main_ability_slice); - componentTouch = findComponentById(ResourceTable.Id_touch_event_button); + Component componentTouch = findComponentById(ResourceTable.Id_touch_event_button); HiLog.info(LABEL_LOG, "setTouchEventListener"); componentTouch.setTouchEventListener(onTouchEvent); } @@ -68,13 +66,10 @@ public class TouchAbilitySlice extends AbilitySlice { utils.showDialogBox(items, referenceContext.get()); } - private Component.TouchEventListener onTouchEvent = new Component.TouchEventListener() { - @Override - public boolean onTouchEvent(Component component, TouchEvent touchEvent) { - HiLog.info(LABEL_LOG, "onTouchEvent"); - showTouchEvent(touchEvent); - return true; - } + private final Component.TouchEventListener onTouchEvent = (component, touchEvent) -> { + HiLog.info(LABEL_LOG, "onTouchEvent"); + showTouchEvent(touchEvent); + return true; }; @Override diff --git a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/CommonEventAbilitySlice.java b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/CommonEventAbilitySlice.java index 09578c434895ce842476b9524a7dc06cc80ac20a..7c71afff8db91421776202dca1c1195383a2d0e6 100644 --- a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/CommonEventAbilitySlice.java +++ b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/CommonEventAbilitySlice.java @@ -38,11 +38,9 @@ public class CommonEventAbilitySlice extends AbilitySlice { private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG); - private String message = "This is CommonEvent"; + private final Utils utils = Utils.getInstance(); - private Utils utils = Utils.getInstance(); - - private CommonEventHandle commonEventHandle = new CommonEventHandle() { + private final CommonEventHandle commonEventHandle = new CommonEventHandle() { @Override public boolean onShowMenu(MultimodalEvent multimodalEvent) { return false; @@ -135,6 +133,7 @@ public class CommonEventAbilitySlice extends AbilitySlice { private void showCommonEvent() { WeakReference referenceContext = new WeakReference<>(getContext()); + String message = "This is CommonEvent"; utils.showDialogBox(message, referenceContext.get()); } diff --git a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/KeyEventAbilitySclice.java b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/KeyEventAbilitySclice.java index 1c970029cdcbc0e80c3185b7b007cad7e2d14b97..192b16cb6b9b6b00b43b9f048aae4aaad6215069 100644 --- a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/KeyEventAbilitySclice.java +++ b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/KeyEventAbilitySclice.java @@ -42,11 +42,9 @@ public class KeyEventAbilitySclice extends AbilitySlice { */ private static final int BACK_KEY_CODE = 2; - private String message = "This is keyEvent"; + private final Utils utils = Utils.getInstance(); - private Utils utils = Utils.getInstance(); - - private KeyEventHandle keyEventHandle = keyEvent -> { + private final KeyEventHandle keyEventHandle = keyEvent -> { HiLog.info(LABEL_LOG, "keyEvent"); if (keyEvent != null && keyEvent.isKeyDown()) { int keyCode = keyEvent.getKeyCode(); @@ -66,6 +64,7 @@ public class KeyEventAbilitySclice extends AbilitySlice { private void showKeyEvent() { WeakReference referenceContext = new WeakReference<>(getContext()); + String message = "This is keyEvent"; utils.showDialogBox(message, referenceContext.get()); } diff --git a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/MediaEventAbilitySlice.java b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/MediaEventAbilitySlice.java index e1a3004181109f319859004e04b6233c9ddabffb..f0c4a0cfc2fd51097e898001610fe651516b35e1 100644 --- a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/MediaEventAbilitySlice.java +++ b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/MediaEventAbilitySlice.java @@ -38,11 +38,9 @@ public class MediaEventAbilitySlice extends AbilitySlice { private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG); - private String message = "This is mediaEvent"; + private final Utils utils = Utils.getInstance(); - private Utils utils = Utils.getInstance(); - - private MediaEventHandle mediaEventHandle = new MediaEventHandle() { + private final MediaEventHandle mediaEventHandle = new MediaEventHandle() { @Override public boolean onPlay(MultimodalEvent multimodalEvent) { HiLog.info(LABEL_LOG, "onPlay"); @@ -74,6 +72,7 @@ public class MediaEventAbilitySlice extends AbilitySlice { private void showMediaEvent() { WeakReference referenceContext = new WeakReference<>(getContext()); + String message = "This is mediaEvent"; utils.showDialogBox(message, referenceContext.get()); } diff --git a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/SystemEventAbilitySlice.java b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/SystemEventAbilitySlice.java index 6a3e1885070966baae954994b34997962449ed93..43b024ee7e1e46156bb06ff43a5b19f5a52dcdac 100644 --- a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/SystemEventAbilitySlice.java +++ b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/SystemEventAbilitySlice.java @@ -38,11 +38,9 @@ public class SystemEventAbilitySlice extends AbilitySlice { private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG); - private String message = "Page closed"; + private final Utils utils = Utils.getInstance(); - private Utils utils = Utils.getInstance(); - - private SystemEventHandle systemEventHandle = new SystemEventHandle() { + private final SystemEventHandle systemEventHandle = new SystemEventHandle() { @Override public boolean onMute(MultimodalEvent multimodalEvent) { return false; @@ -67,6 +65,7 @@ public class SystemEventAbilitySlice extends AbilitySlice { private void showSystemEvent() { WeakReference referenceContext = new WeakReference<>(getContext()); + String message = "Page closed"; utils.showDialogBox(message, referenceContext.get()); } diff --git a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TelephoneEventAbilitySlice.java b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TelephoneEventAbilitySlice.java index 59da82a34b90d866a994112964a4c998018cc4a2..0191534d9003e208b1bacc6d6268a42772d17eaf 100644 --- a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TelephoneEventAbilitySlice.java +++ b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TelephoneEventAbilitySlice.java @@ -38,11 +38,9 @@ public class TelephoneEventAbilitySlice extends AbilitySlice { private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD000F00, TAG); - private String message = "This is showTelephoneEvent"; + private final Utils utils = Utils.getInstance(); - private Utils utils = Utils.getInstance(); - - private TelephoneEventHandle telephoneEventHandle = new TelephoneEventHandle() { + private final TelephoneEventHandle telephoneEventHandle = new TelephoneEventHandle() { @Override public boolean onAnswer(MultimodalEvent multimodalEvent) { return false; @@ -70,6 +68,7 @@ public class TelephoneEventAbilitySlice extends AbilitySlice { private void showTelphoneEvent() { WeakReference referenceContext = new WeakReference<>(getContext()); + String message = "This is showTelephoneEvent"; utils.showDialogBox(message, referenceContext.get()); } diff --git a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TouchEventAbilitySlice.java b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TouchEventAbilitySlice.java index c1ab7a2483ea0d9bc4143e210568e56328a923b5..5ad3e1579315b6e3413ef553f849bf2cff09db65 100644 --- a/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TouchEventAbilitySlice.java +++ b/UI/MultimodalEvent/entry/src/main/java/ohos/samples/multimodalevent/slice/TouchEventAbilitySlice.java @@ -39,11 +39,9 @@ public class TouchEventAbilitySlice extends AbilitySlice { private static int count = 0; - private String message = "This is touchEvent"; + private final Utils utils = Utils.getInstance(); - private Utils utils = Utils.getInstance(); - - private TouchEventHandle touchEventHandle = touchEvent -> { + private final TouchEventHandle touchEventHandle = touchEvent -> { HiLog.info(LABEL_LOG, "ontouch touchevent2"); if (touchEvent != null) { if (count > 0) { @@ -57,6 +55,7 @@ public class TouchEventAbilitySlice extends AbilitySlice { private void showTouchEvent() { WeakReference referenceContext = new WeakReference<>(getContext()); + String message = "This is touchEvent"; utils.showDialogBox(message, referenceContext.get()); } diff --git a/UI/MultimodalEvent/entry/src/main/resources/base/element/string.json b/UI/MultimodalEvent/entry/src/main/resources/base/element/string.json index f198b9d448f2c42c5d0420dfb2d49d68d3a36735..8cc1258013db6d61897300c8ab5d792172ce2a3a 100644 --- a/UI/MultimodalEvent/entry/src/main/resources/base/element/string.json +++ b/UI/MultimodalEvent/entry/src/main/resources/base/element/string.json @@ -59,6 +59,58 @@ { "name": "touch_event", "value": "TouchEvent" + }, + { + "name": "one", + "value": "1" + }, + { + "name": "two", + "value": "2" + }, + { + "name": "three", + "value": "3" + }, + { + "name": "four", + "value": "4" + }, + { + "name": "five", + "value": "5" + }, + { + "name": "six", + "value": "6" + }, + { + "name": "seven", + "value": "7" + }, + { + "name": "eight", + "value": "8" + }, + { + "name": "nine", + "value": "9" + }, + { + "name": "zero", + "value": "0" + }, + { + "name": "p", + "value": "*" + }, + { + "name": "w", + "value": "#" + }, + { + "name": "call", + "value": "CALL" } ] } \ No newline at end of file diff --git a/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml b/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml index 21c602e50e226784de6da4ed123ff21f18cef403..67ee57cd22c5ef24457738849820bff87afe4e48 100644 --- a/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml +++ b/UI/MultimodalEvent/entry/src/main/resources/base/layout/tel_event_ability_slice.xml @@ -34,7 +34,7 @@ ohos:height="60vp" ohos:text_size="20fp" ohos:background_element="$graphic:button_bg" - ohos:text="1" + ohos:text="$string:one" ohos:text_alignment="center"/>
@@ -161,17 +161,17 @@ {{$t('Strings.getBatteryLevelEvent')}}
- +
{{$t('Strings.batterySubscribeEvent')}}
- +
{{$t('Strings.batteryUnSubscribeEvent')}}
- +
diff --git a/UI/UiComponents/entry/src/main/js/default/pages/index/index.js b/UI/UiComponents/entry/src/main/js/default/pages/index/index.js index 06d7f706d4b56d66c0997594cd048216775cd70f..f4a7a3f1e7e7442aed6e500e1512dd8f676352e0 100644 --- a/UI/UiComponents/entry/src/main/js/default/pages/index/index.js +++ b/UI/UiComponents/entry/src/main/js/default/pages/index/index.js @@ -15,10 +15,6 @@ import prompt from '@system.prompt' -const injectRef = Object.getPrototypeOf(global) || global - -injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') - export default { data: { ii18n: {}, @@ -57,7 +53,7 @@ export default { onSelectChanged: function (e) { this.showToast(e.newValue); }, - showMessageFromTextArea: function (e) { + showMessageFromTextArea: function () { var text = this.textAreaContent; if (!text || 0 === text.length) { text = "Text Area is empty" diff --git a/UI/UserRegistration/entry/package.json b/UI/UserRegistration/entry/package.json deleted file mode 100644 index 0967ef424bce6791893e9a57bb952f80fd536e93..0000000000000000000000000000000000000000 --- a/UI/UserRegistration/entry/package.json +++ /dev/null @@ -1 +0,0 @@ -{}