From e0c455b2587e95c3b191cfe4869f1f5d2089f39c Mon Sep 17 00:00:00 2001
From: TFStudy <3202410880@qq.com>
Date: Wed, 30 Jun 2021 11:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/config.json                      |  5 -----
 ...emoActivity.java => DemoAbilitySlice.java} |  4 ++--
 .../java/com/varunest/sample/MainAbility.java |  2 +-
 .../resources/base/graphic/button_shape.xml   | 20 +++++++++----------
 app/src/ohosTest/config.json                  |  5 -----
 sparkbutton/src/main/config.json              |  5 -----
 6 files changed, 12 insertions(+), 29 deletions(-)
 rename app/src/main/java/com/varunest/sample/{DemoActivity.java => DemoAbilitySlice.java} (98%)

diff --git a/app/src/main/config.json b/app/src/main/config.json
index 8eb28b6..b15e88b 100644
--- a/app/src/main/config.json
+++ b/app/src/main/config.json
@@ -5,11 +5,6 @@
     "version": {
       "code": 1000000,
       "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 5,
-      "target": 5,
-      "releaseType": "Release"
     }
   },
   "deviceConfig": {},
diff --git a/app/src/main/java/com/varunest/sample/DemoActivity.java b/app/src/main/java/com/varunest/sample/DemoAbilitySlice.java
similarity index 98%
rename from app/src/main/java/com/varunest/sample/DemoActivity.java
rename to app/src/main/java/com/varunest/sample/DemoAbilitySlice.java
index 7fd2ea3..3fb55a5 100644
--- a/app/src/main/java/com/varunest/sample/DemoActivity.java
+++ b/app/src/main/java/com/varunest/sample/DemoAbilitySlice.java
@@ -11,9 +11,9 @@ import java.io.IOException;
 import java.util.ArrayList;
 
 /**
- * DemoActivity
+ * DemoAbilitySlice
  */
-public class DemoActivity extends AbilitySlice implements TabList.TabSelectedListener {
+public class DemoAbilitySlice extends AbilitySlice implements TabList.TabSelectedListener {
     private PageSlider showcasePageSlide;
     private PageSliderProvider pageSliderProvider;
     private TabList tabList;
diff --git a/app/src/main/java/com/varunest/sample/MainAbility.java b/app/src/main/java/com/varunest/sample/MainAbility.java
index 88b0a23..a6d8712 100644
--- a/app/src/main/java/com/varunest/sample/MainAbility.java
+++ b/app/src/main/java/com/varunest/sample/MainAbility.java
@@ -15,6 +15,6 @@ public class MainAbility extends Ability {
     @Override
     public void onStart(Intent intent) {
         super.onStart(intent);
-        super.setMainRoute(DemoActivity.class.getName());
+        super.setMainRoute(DemoAbilitySlice.class.getName());
     }
 }
diff --git a/app/src/main/resources/base/graphic/button_shape.xml b/app/src/main/resources/base/graphic/button_shape.xml
index 7038d83..c25e17c 100644
--- a/app/src/main/resources/base/graphic/button_shape.xml
+++ b/app/src/main/resources/base/graphic/button_shape.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+<shape
+    xmlns:ohos="http://schemas.huawei.com/res/ohos"
+    ohos:shape="rectangle">
+
     <corners
-        android:radius="4dp"
+        ohos:radius="4vp"
         />
 
-    <padding
-        android:left="0dp"
-        android:top="0dp"
-        android:right="0dp"
-        android:bottom="0dp"
-        />
     <stroke
-        android:width="1dp"
-        android:color="#ffc6c6c6"
+        ohos:width="1vp"
+        ohos:color="#ffc6c6c6"
         />
+
     <solid
-        android:color="#dfdfdf"
+        ohos:color="#dfdfdf"
         />
 </shape>
\ No newline at end of file
diff --git a/app/src/ohosTest/config.json b/app/src/ohosTest/config.json
index 336a841..8ec66c5 100644
--- a/app/src/ohosTest/config.json
+++ b/app/src/ohosTest/config.json
@@ -5,11 +5,6 @@
     "version": {
       "code": 1000000,
       "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 5,
-      "target": 5,
-      "releaseType": "Release"
     }
   },
   "deviceConfig": {},
diff --git a/sparkbutton/src/main/config.json b/sparkbutton/src/main/config.json
index f2f8d63..23e983e 100644
--- a/sparkbutton/src/main/config.json
+++ b/sparkbutton/src/main/config.json
@@ -5,11 +5,6 @@
     "version": {
       "code": 1000000,
       "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 6,
-      "target": 6,
-      "releaseType": "Release"
     }
   },
   "deviceConfig": {
-- 
Gitee