From 89909a01b3b5d879254bf5fea9b02ad5b2770133 Mon Sep 17 00:00:00 2001 From: 258767-shengyu <1qaz2wsx> Date: Mon, 7 Jun 2021 18:07:22 +0800 Subject: [PATCH 1/4] init --- entry/src/main/config.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/entry/src/main/config.json b/entry/src/main/config.json index d861770..4e231d0 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -44,6 +44,16 @@ "launchType": "standard" }, { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], "name": "com.zhw.cmcm.FeatureAbility", "icon": "$media:icon", "description": "$string:mainability_description", -- Gitee From c98a37dd819f3185631db88244d58214a1d49735 Mon Sep 17 00:00:00 2001 From: 258767-shengyu <1qaz2wsx> Date: Mon, 7 Jun 2021 18:45:42 +0800 Subject: [PATCH 2/4] init --- entry/src/main/config.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 4e231d0..af1443a 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -26,16 +26,6 @@ }, "abilities": [ { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], "name": "com.zhw.cmcm.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", -- Gitee From 248ae3719074bde6eecb07635e70f8bac5513579 Mon Sep 17 00:00:00 2001 From: 258767-shengyu <1qaz2wsx> Date: Tue, 8 Jun 2021 10:28:39 +0800 Subject: [PATCH 3/4] init --- entry/src/main/js/default/common/comp/colorText.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/entry/src/main/js/default/common/comp/colorText.css b/entry/src/main/js/default/common/comp/colorText.css index 32c6fb5..85e64b5 100644 --- a/entry/src/main/js/default/common/comp/colorText.css +++ b/entry/src/main/js/default/common/comp/colorText.css @@ -9,11 +9,6 @@ .title { font-size: 26px; - padding: 0% 3px; + padding: 0 3px; color: gray; } - -.clear{ - margin-top: 30px; - padding: 10px 20px; -} \ No newline at end of file -- Gitee From 2d54c39691a0fea49e90208962fb69e15be0ad4e Mon Sep 17 00:00:00 2001 From: 258767-shengyu <1qaz2wsx> Date: Tue, 8 Jun 2021 10:34:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/config.json | 8 --- .../main/java/com/zhw/cmcm/MainAbility.java | 64 ------------------- .../resources/base/layout/ability_main.xml | 61 ------------------ 3 files changed, 133 deletions(-) delete mode 100644 entry/src/main/java/com/zhw/cmcm/MainAbility.java delete mode 100644 entry/src/main/resources/base/layout/ability_main.xml diff --git a/entry/src/main/config.json b/entry/src/main/config.json index af1443a..c8fa894 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -25,14 +25,6 @@ "moduleType": "entry" }, "abilities": [ - { - "name": "com.zhw.cmcm.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard" - }, { "skills": [ { diff --git a/entry/src/main/java/com/zhw/cmcm/MainAbility.java b/entry/src/main/java/com/zhw/cmcm/MainAbility.java deleted file mode 100644 index 1f4663f..0000000 --- a/entry/src/main/java/com/zhw/cmcm/MainAbility.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * - * Copyright (C) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain an copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package com.zhw.cmcm; - -import ohos.aafwk.ability.Ability; -import ohos.aafwk.content.Intent; -import ohos.aafwk.content.Operation; - -/** - * MainAbility - * - * @author:username - * @since 2021-05-31 - */ -public class MainAbility extends Ability { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - super.setUIContent(ResourceTable.Layout_ability_main); - startAbility(this, FeatureAbility.class.getName()); - } - - @Override - protected void onActive() { - super.onActive(); - } - - @Override - public void onStop() { - super.onStop(); - } - - /** - * 启动activity - * - * @param ability - * @param name - */ - public void startAbility(Ability ability, String name) { - Intent intent = new Intent(); - Operation operation = new Intent.OperationBuilder() - .withDeviceId("") - .withBundleName(ability.getBundleName()) - .withAbilityName(name) - .build(); - intent.setOperation(operation); - ability.startAbility(intent); - } -} diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/entry/src/main/resources/base/layout/ability_main.xml deleted file mode 100644 index 1fe40a5..0000000 --- a/entry/src/main/resources/base/layout/ability_main.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - -