From 6bbc170c30013ad65bad41ae210a5a7bfd375109 Mon Sep 17 00:00:00 2001
From: 17351781990 <827990754@qq.com>
Date: Thu, 16 Sep 2021 15:19:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9]?=
 =?UTF-8?q?=EF=BC=9A1=E3=80=81=E4=BF=AE=E6=94=B9sdk=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=9B2=E3=80=81=E6=B7=BB=E5=8A=A0=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E9=98=B4=E5=BD=B1=E6=95=88=E6=9E=9C=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 .../rwidgethelper/component/ShadowAbilty.java |  5 +++
 .../base/layout/ability_shadow_abilty.xml     | 37 ++++++++++++-------
 build.gradle                                  |  4 +-
 library/build.gradle                          |  2 +-
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bf05958..fdfed32 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.huawei.ohos.hap'
 apply plugin: 'com.huawei.ohos.decctest'
 ohos {
-    compileSdkVersion 6
+    compileSdkVersion 5
     defaultConfig {
         compatibleSdkVersion 5
     }
diff --git a/app/src/main/java/com/example/rwidgethelper/component/ShadowAbilty.java b/app/src/main/java/com/example/rwidgethelper/component/ShadowAbilty.java
index 8787202..e474a87 100644
--- a/app/src/main/java/com/example/rwidgethelper/component/ShadowAbilty.java
+++ b/app/src/main/java/com/example/rwidgethelper/component/ShadowAbilty.java
@@ -3,9 +3,11 @@ package com.example.rwidgethelper.component;
 import com.example.rwidgethelper.ResourceTable;
 import com.ruffian.library.widget.component.RDependentLayout;
 import com.ruffian.library.widget.component.RDirectionLayout;
+import com.ruffian.library.widget.component.RText;
 import com.ruffian.library.widget.utils.ShadowDrawable;
 import ohos.aafwk.ability.Ability;
 import ohos.aafwk.content.Intent;
+import ohos.agp.components.DirectionalLayout;
 import ohos.agp.utils.Color;
 import ohos.agp.window.service.DisplayManager;
 
@@ -20,6 +22,9 @@ public class ShadowAbilty extends Ability {
         RDirectionLayout mRDirectionLayout = (RDirectionLayout) findComponentById(ResourceTable.Id_linear_shadow);
         ShadowDrawable.setShadowDrawable(mRDirectionLayout, Color.getIntColor("#ffffff"), dpToPx(8),
                 Color.getIntColor("#DF23DF"), dpToPx(10), 15, 15);
+        DirectionalLayout rText = (DirectionalLayout) findComponentById(ResourceTable.Id_text_directional);
+        ShadowDrawable.setShadowDrawable(rText, Color.getIntColor("#ffffff"), dpToPx(6),
+                Color.getIntColor("#666666"), dpToPx(10), 15, 15);
     }
 
     private int dpToPx(int dp) {
diff --git a/app/src/main/resources/base/layout/ability_shadow_abilty.xml b/app/src/main/resources/base/layout/ability_shadow_abilty.xml
index e8b77b5..248875b 100644
--- a/app/src/main/resources/base/layout/ability_shadow_abilty.xml
+++ b/app/src/main/resources/base/layout/ability_shadow_abilty.xml
@@ -41,21 +41,30 @@
             />
     </com.ruffian.library.widget.component.RDirectionLayout>
 
-    <com.ruffian.library.widget.component.RText
-        ohos:id="$+id:text_btn"
-        ohos:height="45vp"
+    <DirectionalLayout
+        ohos:id="$+id:text_directional"
+        ohos:height="65vp"
         ohos:width="match_parent"
-        ohos:clickable="true"
-        ohos:margin="15vp"
-        ohos:text="RText"
-        ohos:text_alignment="center"
-        ohos:text_color="#FF5F5D5D"
-        ohos:text_size="13fp"
-        app:background_normal="#00cc80"
-        app:background_pressed="#00A366"
-        app:bgType="color"
-        app:corner_radius="6"
-        />
+        ohos:margin="15vp">
+        <com.ruffian.library.widget.component.RText
+            ohos:id="$+id:text_btn"
+            ohos:height="45vp"
+            ohos:width="match_parent"
+            ohos:clickable="true"
+            ohos:text="RText"
+            ohos:top_margin="5vp"
+            ohos:left_margin="5vp"
+            ohos:bottom_margin="5vp"
+            ohos:right_margin="10vp"
+            ohos:text_alignment="center"
+            ohos:text_color="#FF5F5D5D"
+            ohos:text_size="13fp"
+            app:background_normal="#00cc80"
+            app:background_pressed="#00A366"
+            app:bgType="color"
+            app:corner_radius="6"
+            />
+    </DirectionalLayout>
 
     <com.ruffian.library.widget.component.RDependentLayout
         ohos:id="$+id:layout_ll"
diff --git a/build.gradle b/build.gradle
index f0c73f7..bf2f8c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,8 +19,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.huawei.ohos:hap:2.4.5.0'
-        classpath 'com.huawei.ohos:decctest:1.2.4.1'
+        classpath 'com.huawei.ohos:hap:2.4.5.5'
+        classpath 'com.huawei.ohos:decctest:1.2.5.1'
     }
 }
 
diff --git a/library/build.gradle b/library/build.gradle
index c690950..ae3efac 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.huawei.ohos.library'
 
 ohos {
-    compileSdkVersion 6
+    compileSdkVersion 5
     defaultConfig {
         compatibleSdkVersion 5
     }
-- 
Gitee


From d7ec8cb43e95e30800b54cea1aacc6e2e8ff614e Mon Sep 17 00:00:00 2001
From: 17351781990 <827990754@qq.com>
Date: Thu, 16 Sep 2021 15:21:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9]?=
 =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E6=94=B9sdk=E7=89=88=E6=9C=AC=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bf2f8c1..6f1579c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 apply plugin: 'com.huawei.ohos.app'
 
 ohos {
-    compileSdkVersion 6
+    compileSdkVersion 5
     defaultConfig {
         compatibleSdkVersion 5
     }
-- 
Gitee