diff --git a/.gitignore b/.gitignore
index 603b14077394cd2294ac6922fe619669630ef3ab..37a4eb8b43d978ea05b2c6e3fb934f9b40dddd4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@
/build
/captures
.externalNativeBuild
+/entry/.preview
.cxx
diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$
deleted file mode 100644
index 96ce66b7bad790e3375595de9557ef041961420d..0000000000000000000000000000000000000000
--- a/.idea/$PRODUCT_WORKSPACE_FILE$
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/$PROJECT_FILE$ b/.idea/$PROJECT_FILE$
new file mode 100644
index 0000000000000000000000000000000000000000..58b7e3e570f8289344d345f6e3634608e74c690d
--- /dev/null
+++ b/.idea/$PROJECT_FILE$
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml
index e2f9acb6094bc3e295ccda1557c24967eb5dd072..6eefe0e18e7f9b22e04bd7ae191213bd65c48515 100644
--- a/.idea/checkstyle-idea.xml
+++ b/.idea/checkstyle-idea.xml
@@ -3,12 +3,10 @@
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 890e81047a4348566b46172a4cacb16ac3e6aec4..4fc39a5d9fa39f8b37bc2ac2eaa677fe95a82c20 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -25,29 +25,8 @@
-
-
-
+
-
-
-
\ No newline at end of file
diff --git a/.idea/previewer/phone/phoneSettingConfig_-979570527.json b/.idea/previewer/phone/phoneSettingConfig_-979570527.json
deleted file mode 100644
index f505e6b9ca3d41faf1f0a39a496db58b117fbd60..0000000000000000000000000000000000000000
--- a/.idea/previewer/phone/phoneSettingConfig_-979570527.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "setting": {
- "1.0.1": {
- "Language": {
- "args": {
- "Language": "zh-CN"
- }
- }
- }
- },
- "frontend": {
- "1.0.0": {
- "Resolution": {
- "args": {
- "Resolution": "360*780"
- }
- },
- "DeviceType": {
- "args": {
- "DeviceType": "phone"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/.idea/previewer/phone/phoneSettingConfig_341013527.json b/.idea/previewer/phone/phoneSettingConfig_341013527.json
deleted file mode 100644
index f505e6b9ca3d41faf1f0a39a496db58b117fbd60..0000000000000000000000000000000000000000
--- a/.idea/previewer/phone/phoneSettingConfig_341013527.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "setting": {
- "1.0.1": {
- "Language": {
- "args": {
- "Language": "zh-CN"
- }
- }
- }
- },
- "frontend": {
- "1.0.0": {
- "Resolution": {
- "args": {
- "Resolution": "360*780"
- }
- },
- "DeviceType": {
- "args": {
- "DeviceType": "phone"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/.idea/previewer/previewConfig.json b/.idea/previewer/previewConfig.json
deleted file mode 100644
index f44f54c3b14252108bf8095dd14fbdde5e7acbed..0000000000000000000000000000000000000000
--- a/.idea/previewer/previewConfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "1.0.0": {
- "LastPreviewDevice": {
- "E:\\WorkSpace\\HM_ShadowLayout_master\\entry": [
- "phone"
- ],
- "E:\\WorkSpace\\HM_ShadowLayout_master\\branches\\entry": [
- "phone"
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/.idea/previewer/tv/tvSettingConfig_341013527.json b/.idea/previewer/tv/tvSettingConfig_341013527.json
deleted file mode 100644
index 735b7846e511202d22504a70bf2c92d8f7aba460..0000000000000000000000000000000000000000
--- a/.idea/previewer/tv/tvSettingConfig_341013527.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "setting": {
- "1.0.1": {
- "Language": {
- "args": {
- "Language": "zh-CN"
- }
- }
- }
- },
- "frontend": {
- "1.0.0": {
- "Resolution": {
- "args": {
- "Resolution": "960*540"
- }
- },
- "DeviceType": {
- "args": {
- "DeviceType": "tv"
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/.idea/qaplug_profiles.xml b/.idea/qaplug_profiles.xml
index d7636d1caa65fc25304f1069f02ae5f3cd2c159e..ddfa82311f47201fcea94973e163ec0234933460 100644
--- a/.idea/qaplug_profiles.xml
+++ b/.idea/qaplug_profiles.xml
@@ -2,15 +2,28 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -35,6 +48,7 @@
+
@@ -49,6 +63,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -114,6 +138,10 @@
+
+
+
+
@@ -143,6 +171,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -156,8 +194,15 @@
+
+
+
+
+
+
+
@@ -168,6 +213,9 @@
+
+
+
@@ -211,14 +259,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -241,6 +320,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -296,19 +394,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -346,6 +472,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -401,6 +538,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -410,6 +559,12 @@
+
+
+
+
+
+
@@ -437,6 +592,14 @@
+
+
+
+
+
+
+
+
@@ -451,11 +614,16 @@
+
+
+
+
+
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f4cb416c083d265558da75d457237d671..35eb1ddfbbc029bcab630581847471d7f238ec53 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b83f1bc32d3ed4d4a953fe453ac4ed860f1d4352..f53d82cbc14c4a26117b5a846256fbb6749751be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,16 +7,16 @@ ohos {
compatibleSdkVersion 4
}
}
-
+
buildscript {
repositories {
maven {
- url 'https://mirrors.huaweicloud.com/repository/maven/'
+ url 'https://repo.huaweicloud.com/repository/maven/'
}
maven {
url 'https://developer.huawei.com/repo/'
}
- jcenter()
+ jcenter()
}
dependencies {
classpath 'com.huawei.ohos:hap:2.4.2.5'
@@ -27,11 +27,14 @@ buildscript {
allprojects {
repositories {
maven {
- url 'https://mirrors.huaweicloud.com/repository/maven/'
+ url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+ }
+ maven {
+ url 'https://repo.huaweicloud.com/repository/maven/'
}
maven {
url 'https://developer.huawei.com/repo/'
}
- jcenter()
+ jcenter()
}
}
diff --git a/entry/build.gradle b/entry/build.gradle
index ab57fbf36a63e6375429ac01d3cfaa341ab190c3..fd908920b51eebd281c4963ac3755c05025c2a60 100644
--- a/entry/build.gradle
+++ b/entry/build.gradle
@@ -1,13 +1,28 @@
apply plugin: 'com.huawei.ohos.hap'
+apply plugin: 'com.huawei.ohos.decctest'
ohos {
compileSdkVersion 5
defaultConfig {
compatibleSdkVersion 4
}
+ buildTypes {
+ release {
+ proguardOpt {
+ proguardEnabled false
+ rulesFiles 'proguard-rules.pro'
+ }
+ }
+ }
+
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testCompile 'junit:junit:4.12'
- compile project(path: ':shadowlayout')
+ testImplementation 'junit:junit:4.13'
+ ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100'
+ compile project(path: ':library')
+ implementation('com.gitee.chinasoft_ohos:ShadowLayout:0.0.1-SNAPSHOT')
+}
+decc {
+ supportType = ['html','xml']
}
diff --git a/entry/proguard-rules.pro b/entry/proguard-rules.pro
new file mode 100644
index 0000000000000000000000000000000000000000..f7666e47561d514b2a76d5a7dfbb43ede86da92a
--- /dev/null
+++ b/entry/proguard-rules.pro
@@ -0,0 +1 @@
+# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/entry/src/main/config.json b/entry/src/main/config.json
index c741a520afcfd47425c8234a39294b8663fd54ed..1e79f99d387dd786d96b58a79e3c62aedb701d89 100644
--- a/entry/src/main/config.json
+++ b/entry/src/main/config.json
@@ -1,7 +1,7 @@
{
"app": {
- "bundleName": "com.example.hm_shadowlayout_master",
- "vendor": "example",
+ "bundleName": "com.lijiankun24.shadowlayoutexample",
+ "vendor": "lijiankun24",
"version": {
"code": 1,
"name": "1.0"
@@ -14,11 +14,10 @@
},
"deviceConfig": {},
"module": {
- "package": "com.example.hm_shadowlayout_master",
+ "package": "com.lijiankun24.shadowlayoutexample",
"name": ".MyApplication",
"deviceType": [
- "phone",
- "tv"
+ "phone"
],
"distro": {
"deliveryWithInstall": true,
@@ -38,10 +37,10 @@
}
],
"orientation": "unspecified",
- "name": "com.example.hm_shadowlayout_master.MainAbility",
+ "name": "com.lijiankun24.shadowlayoutexample.MainAbility",
"icon": "$media:icon",
"description": "$string:mainability_description",
- "label": "HM_ShadowLayout_master",
+ "label": "$string:app_name",
"type": "page",
"launchType": "standard"
}
diff --git a/entry/src/main/java/com/example/hm_shadowlayout_master/MainAbility.java b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/MainAbility.java
similarity index 74%
rename from entry/src/main/java/com/example/hm_shadowlayout_master/MainAbility.java
rename to entry/src/main/java/com/lijiankun24/shadowlayoutexample/MainAbility.java
index 26267d40cb83ccace22f185357a110b3318d32ae..fc7795b1c114748b68e53b7d50ed85fb4b4cfb36 100644
--- a/entry/src/main/java/com/example/hm_shadowlayout_master/MainAbility.java
+++ b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/MainAbility.java
@@ -1,7 +1,6 @@
-package com.example.hm_shadowlayout_master;
-
-import com.example.hm_shadowlayout_master.slice.MainAbilitySlice;
+package com.lijiankun24.shadowlayoutexample;
+import com.lijiankun24.shadowlayoutexample.slice.MainAbilitySlice;
import ohos.aafwk.ability.Ability;
import ohos.aafwk.content.Intent;
diff --git a/entry/src/main/java/com/example/hm_shadowlayout_master/MyApplication.java b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/MyApplication.java
similarity index 84%
rename from entry/src/main/java/com/example/hm_shadowlayout_master/MyApplication.java
rename to entry/src/main/java/com/lijiankun24/shadowlayoutexample/MyApplication.java
index 81b616680735076baa86a70284f8b6e2332faf4f..e550c1417d844479fb0e2b251d851881270c58ab 100644
--- a/entry/src/main/java/com/example/hm_shadowlayout_master/MyApplication.java
+++ b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/MyApplication.java
@@ -1,4 +1,4 @@
-package com.example.hm_shadowlayout_master;
+package com.lijiankun24.shadowlayoutexample;
import ohos.aafwk.ability.AbilityPackage;
diff --git a/entry/src/main/java/com/example/hm_shadowlayout_master/provider/SampleItemProvider.java b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/provider/SampleItemProvider.java
similarity index 93%
rename from entry/src/main/java/com/example/hm_shadowlayout_master/provider/SampleItemProvider.java
rename to entry/src/main/java/com/lijiankun24/shadowlayoutexample/provider/SampleItemProvider.java
index 0d5413798f551436c57895a59495c587553c0f86..119b2b4ee9e62f0d2ceaae97eb64207d810afa48 100644
--- a/entry/src/main/java/com/example/hm_shadowlayout_master/provider/SampleItemProvider.java
+++ b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/provider/SampleItemProvider.java
@@ -1,7 +1,6 @@
-package com.example.hm_shadowlayout_master.provider;
-
-import com.example.hm_shadowlayout_master.ResourceTable;
+package com.lijiankun24.shadowlayoutexample.provider;
+import com.lijiankun24.shadowlayoutexample.ResourceTable;
import ohos.aafwk.ability.AbilitySlice;
import ohos.agp.components.BaseItemProvider;
import ohos.agp.components.Component;
diff --git a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/DynamicChangeAbilitySlice.java b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/DynamicChangeAbilitySlice.java
similarity index 95%
rename from entry/src/main/java/com/example/hm_shadowlayout_master/slice/DynamicChangeAbilitySlice.java
rename to entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/DynamicChangeAbilitySlice.java
index d984361274a35597f1d2acee79adb1798aaebfdf..d51131e5c33190de5e7093a9f95a7177b3341d08 100644
--- a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/DynamicChangeAbilitySlice.java
+++ b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/DynamicChangeAbilitySlice.java
@@ -1,8 +1,7 @@
-package com.example.hm_shadowlayout_master.slice;
+package com.lijiankun24.shadowlayoutexample.slice;
-import com.example.hm_shadowlayout_master.ResourceTable;
import com.lijiankun24.shadowlayout.ShadowLayout;
-
+import com.lijiankun24.shadowlayoutexample.ResourceTable;
import ohos.aafwk.ability.AbilitySlice;
import ohos.aafwk.content.Intent;
import ohos.agp.components.Component;
diff --git a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/ListAbilitySlice.java b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/ListAbilitySlice.java
similarity index 86%
rename from entry/src/main/java/com/example/hm_shadowlayout_master/slice/ListAbilitySlice.java
rename to entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/ListAbilitySlice.java
index ab625b07b66d5066e6bdb9b3588a50f24104ceb4..4a2085fe50517b5be993d4c655cf7ad3ace64463 100644
--- a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/ListAbilitySlice.java
+++ b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/ListAbilitySlice.java
@@ -1,8 +1,7 @@
-package com.example.hm_shadowlayout_master.slice;
-
-import com.example.hm_shadowlayout_master.ResourceTable;
-import com.example.hm_shadowlayout_master.provider.SampleItemProvider;
+package com.lijiankun24.shadowlayoutexample.slice;
+import com.lijiankun24.shadowlayoutexample.ResourceTable;
+import com.lijiankun24.shadowlayoutexample.provider.SampleItemProvider;
import ohos.aafwk.ability.AbilitySlice;
import ohos.aafwk.content.Intent;
import ohos.agp.components.ListContainer;
diff --git a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/MainAbilitySlice.java b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/MainAbilitySlice.java
similarity index 95%
rename from entry/src/main/java/com/example/hm_shadowlayout_master/slice/MainAbilitySlice.java
rename to entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/MainAbilitySlice.java
index be4891c9a9a1b29aff7d2f9da75a3b979c586cf0..461553e0d628a30569769c58a09189539c8ea200 100644
--- a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/MainAbilitySlice.java
+++ b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/MainAbilitySlice.java
@@ -1,7 +1,6 @@
-package com.example.hm_shadowlayout_master.slice;
-
-import com.example.hm_shadowlayout_master.ResourceTable;
+package com.lijiankun24.shadowlayoutexample.slice;
+import com.lijiankun24.shadowlayoutexample.ResourceTable;
import ohos.aafwk.ability.AbilitySlice;
import ohos.aafwk.content.Intent;
import ohos.agp.components.Component;
diff --git a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/ShowAbilitySlice.java b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/ShowAbilitySlice.java
similarity index 84%
rename from entry/src/main/java/com/example/hm_shadowlayout_master/slice/ShowAbilitySlice.java
rename to entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/ShowAbilitySlice.java
index e1778fee1576ef65c9fc0094576bace90cb2e3a2..a4c1f31819de67919734a07be65e6cfee56ac7b9 100644
--- a/entry/src/main/java/com/example/hm_shadowlayout_master/slice/ShowAbilitySlice.java
+++ b/entry/src/main/java/com/lijiankun24/shadowlayoutexample/slice/ShowAbilitySlice.java
@@ -1,7 +1,6 @@
-package com.example.hm_shadowlayout_master.slice;
-
-import com.example.hm_shadowlayout_master.ResourceTable;
+package com.lijiankun24.shadowlayoutexample.slice;
+import com.lijiankun24.shadowlayoutexample.ResourceTable;
import ohos.aafwk.ability.AbilitySlice;
import ohos.aafwk.content.Intent;
diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json
new file mode 100644
index 0000000000000000000000000000000000000000..f23d6c6e66c620c2e76d77bc56963a05731fe557
--- /dev/null
+++ b/entry/src/ohosTest/config.json
@@ -0,0 +1,41 @@
+{
+ "app": {
+ "bundleName": "com.lijiankun24.shadowlayoutexample",
+ "vendor": "lijiankun24",
+ "version": {
+ "code": 1,
+ "name": "1.0"
+ },
+ "apiVersion": {
+ "compatible": 4,
+ "target": 5,
+ "releaseType": "Beta1"
+ }
+ },
+ "deviceConfig": {},
+ "module": {
+ "package": "com.lijiankun24.shadowlayoutexample",
+ "name": "testModule",
+ "deviceType": [
+ "phone"
+ ],
+ "distro": {
+ "deliveryWithInstall": true,
+ "moduleName": "entry_test",
+ "moduleType": "feature",
+ "installationFree": true
+ },
+ "abilities": [
+ {
+ "name": "decc.testkit.runner.EntryAbility",
+ "description": "Test Entry Ability",
+ "icon": "$media:icon",
+ "label": "$string:app_name",
+ "launchType": "standard",
+ "orientation": "landscape",
+ "visible": true,
+ "type": "page"
+ }
+ ]
+ }
+}
\ No newline at end of file
diff --git a/entry/src/ohosTest/java/com/lijiankun24/shadowlayoutexample/ExampleOhosTest.java b/entry/src/ohosTest/java/com/lijiankun24/shadowlayoutexample/ExampleOhosTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..212a568170426f13059e676384bfed0ab99dcc78
--- /dev/null
+++ b/entry/src/ohosTest/java/com/lijiankun24/shadowlayoutexample/ExampleOhosTest.java
@@ -0,0 +1,14 @@
+package com.lijiankun24.shadowlayoutexample;
+
+import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class ExampleOhosTest {
+ @Test
+ public void testBundleName() {
+ final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName();
+ assertEquals("com.lijiankun24.shadowlayoutexample", actualBundleName);
+ }
+}
\ No newline at end of file
diff --git a/entry/src/test/java/com/lijiankun24/shadowlayoutexample/ExampleTest.java b/entry/src/test/java/com/lijiankun24/shadowlayoutexample/ExampleTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..f438ce82981747191b029ab593ee8355f0a8b447
--- /dev/null
+++ b/entry/src/test/java/com/lijiankun24/shadowlayoutexample/ExampleTest.java
@@ -0,0 +1,9 @@
+package com.lijiankun24.shadowlayoutexample;
+
+import org.junit.Test;
+
+public class ExampleTest {
+ @Test
+ public void onStart() {
+ }
+}
diff --git a/shadowlayout/.gitignore b/library/.gitignore
similarity index 100%
rename from shadowlayout/.gitignore
rename to library/.gitignore
diff --git a/shadowlayout/build.gradle b/library/build.gradle
similarity index 49%
rename from shadowlayout/build.gradle
rename to library/build.gradle
index ab88c3009d8c2ddd387481757f1eb81ba8c834fe..e1c0b274a6c5cb35b197a177a17684addf760676 100644
--- a/shadowlayout/build.gradle
+++ b/library/build.gradle
@@ -4,10 +4,18 @@ ohos {
defaultConfig {
compatibleSdkVersion 4
}
+ buildTypes {
+ release {
+ proguardOpt {
+ proguardEnabled false
+ rulesFiles 'proguard-rules.pro'
+ }
+ }
+ }
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- testCompile 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.13'
}
diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro
new file mode 100644
index 0000000000000000000000000000000000000000..f7666e47561d514b2a76d5a7dfbb43ede86da92a
--- /dev/null
+++ b/library/proguard-rules.pro
@@ -0,0 +1 @@
+# config module specific ProGuard rules here.
\ No newline at end of file
diff --git a/shadowlayout/src/main/config.json b/library/src/main/config.json
similarity index 67%
rename from shadowlayout/src/main/config.json
rename to library/src/main/config.json
index 7f8ec255de351a13d8704ff3f3580d73ce5a3617..b568ee0a33a3c90b95ac8ced0252350d6ec3ace2 100644
--- a/shadowlayout/src/main/config.json
+++ b/library/src/main/config.json
@@ -1,6 +1,6 @@
{
"app": {
- "bundleName": "com.example.hm_shadowlayout_master",
+ "bundleName": "com.lijiankun24.shadowlayoutexample",
"vendor": "lijiankun24",
"version": {
"code": 1,
@@ -9,19 +9,19 @@
"apiVersion": {
"compatible": 4,
"target": 5,
- "releaseType": "Beta3"
+ "releaseType": "Beta1"
}
},
- "deviceConfig": {},
+ "deviceConfig": {
+ },
"module": {
"package": "com.lijiankun24.shadowlayout",
"deviceType": [
- "phone",
- "tv"
+ "phone"
],
"distro": {
"deliveryWithInstall": true,
- "moduleName": "shadowlayout",
+ "moduleName": "library",
"moduleType": "har"
}
}
diff --git a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/AttrUtil.java b/library/src/main/java/com/lijiankun24/shadowlayout/AttrUtil.java
similarity index 100%
rename from shadowlayout/src/main/java/com/lijiankun24/shadowlayout/AttrUtil.java
rename to library/src/main/java/com/lijiankun24/shadowlayout/AttrUtil.java
diff --git a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/NumberUtil.java b/library/src/main/java/com/lijiankun24/shadowlayout/NumberUtil.java
similarity index 100%
rename from shadowlayout/src/main/java/com/lijiankun24/shadowlayout/NumberUtil.java
rename to library/src/main/java/com/lijiankun24/shadowlayout/NumberUtil.java
diff --git a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/ShadowLayout.java b/library/src/main/java/com/lijiankun24/shadowlayout/ShadowLayout.java
similarity index 99%
rename from shadowlayout/src/main/java/com/lijiankun24/shadowlayout/ShadowLayout.java
rename to library/src/main/java/com/lijiankun24/shadowlayout/ShadowLayout.java
index c58203d8b400a5bea8d20b3871d69a4e95b546b0..92993cb83e3f7021f0bab541bbf6ceedf7aedd6c 100644
--- a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/ShadowLayout.java
+++ b/library/src/main/java/com/lijiankun24/shadowlayout/ShadowLayout.java
@@ -162,7 +162,7 @@ public class ShadowLayout extends DependentLayout implements Component.EstimateS
*
* @param i
* @param i1
- * @return
+ * @return 是否测量
*/
@Override
public boolean onEstimateSize(int i, int i1) {
@@ -236,7 +236,7 @@ public class ShadowLayout extends DependentLayout implements Component.EstimateS
/**
* 设置背景
*
- * @param element
+ * @param element 背景
*/
@Override
public void setBackground(Element element) {
diff --git a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowComponent.java b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowComponent.java
similarity index 100%
rename from shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowComponent.java
rename to library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowComponent.java
diff --git a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java
similarity index 95%
rename from shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java
rename to library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java
index 70fd1805327a0ca2b8dd8aa7bcf6e6a868924dfa..f2777c0242486740e6dfa7eb5fb0aafd036cac0b 100644
--- a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java
+++ b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowDrawable.java
@@ -3,14 +3,8 @@ package com.lijiankun24.shadowlayout.v2;
import ohos.agp.colors.RgbColor;
import ohos.agp.components.Component;
import ohos.agp.components.element.ShapeElement;
-import ohos.agp.render.Canvas;
-import ohos.agp.render.ColorFilter;
-import ohos.agp.render.LinearShader;
-import ohos.agp.render.MaskFilter;
-import ohos.agp.render.Paint;
+import ohos.agp.render.*;
import ohos.agp.render.Paint.Style;
-import ohos.agp.render.Path;
-import ohos.agp.render.Shader;
import ohos.agp.utils.Color;
import ohos.agp.utils.Point;
import ohos.agp.utils.RectFloat;
@@ -98,7 +92,7 @@ public class ShadowDrawable extends ShapeElement implements Component.DrawTask,
* 控件内使用透明画笔
*/
mHelpPaint.setColor(Color.TRANSPARENT);
- mHelpPaint.setStyle(Paint.Style.FILL_STYLE);
+ mHelpPaint.setStyle(Style.FILL_STYLE);
mHelpPaint.setStrokeCap(Paint.StrokeCap.SQUARE_CAP);
mShadowPaint.setMaskFilter(new MaskFilter(RADIUS, MaskFilter.Blur.OUTER));
@@ -182,7 +176,7 @@ public class ShadowDrawable extends ShapeElement implements Component.DrawTask,
* 获取绑定点
*
* @param rectFloat
- * @return
+ * @return 绑定点
*/
private Point[] getBoundPoint(RectFloat rectFloat) {
Point point1 = new Point(rectFloat.left, rectFloat.top);
@@ -196,7 +190,7 @@ public class ShadowDrawable extends ShapeElement implements Component.DrawTask,
* 画矩形
*
* @param rectFloat
- * @return
+ * @return 绑定点
*/
private float[] getBoundStops(RectFloat rectFloat) {
Point point1 = new Point(rectFloat.left, rectFloat.top);
diff --git a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java
similarity index 97%
rename from shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java
rename to library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java
index 493bf00aa64232d686905dc2094f10e2bbbe8ab3..0b435cad908d96f54064679864bba13859d3b12b 100644
--- a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java
+++ b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout.java
@@ -17,17 +17,11 @@
package com.lijiankun24.shadowlayout.v2;
import com.lijiankun24.shadowlayout.AttrUtil;
-
import com.lijiankun24.shadowlayout.NumberUtil;
import ohos.agp.components.AttrSet;
import ohos.agp.components.Component;
import ohos.agp.components.StackLayout;
-import ohos.agp.render.Canvas;
-import ohos.agp.render.LinearShader;
-import ohos.agp.render.MaskFilter;
-import ohos.agp.render.Paint;
-import ohos.agp.render.Path;
-import ohos.agp.render.Shader;
+import ohos.agp.render.*;
import ohos.agp.utils.Color;
import ohos.agp.utils.Point;
import ohos.agp.utils.RectFloat;
@@ -330,7 +324,7 @@ public class ShadowLayout extends StackLayout implements Component.EstimateSizeL
* 获取绑定点
*
* @param rectFloat
- * @return
+ * @return 绑定点
*/
private Point[] getBoundPoint(RectFloat rectFloat) {
Point point1 = new Point(rectFloat.left, rectFloat.top);
diff --git a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout1.java b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout1.java
similarity index 98%
rename from shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout1.java
rename to library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout1.java
index d19c6bbcc14b12dc5ac9b00c6b2b7d6dae1cb46b..e4996fdf595d8fd9f193e9216247f52ec3a599d6 100644
--- a/shadowlayout/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout1.java
+++ b/library/src/main/java/com/lijiankun24/shadowlayout/v2/ShadowLayout1.java
@@ -1,7 +1,6 @@
package com.lijiankun24.shadowlayout.v2;
import com.lijiankun24.shadowlayout.AttrUtil;
-
import ohos.agp.colors.RgbColor;
import ohos.agp.components.AttrSet;
import ohos.agp.components.Component;
@@ -156,7 +155,7 @@ public class ShadowLayout1 extends StackLayout implements Component.EstimateSize
*
* @param widthMeasureSpec
* @param heightMeasureSpec
- * @return
+ * @return 是否测量
*/
@Override
public boolean onEstimateSize(int widthMeasureSpec, int heightMeasureSpec) {
@@ -254,6 +253,9 @@ public class ShadowLayout1 extends StackLayout implements Component.EstimateSize
/**
* 根据手机的分辨率从 px(像素) 的单位 转成为 dp
+ *
+ * @param pxValue
+ * @return vp值
*/
private int px2dip(float pxValue) {
int pxToDip = 0;
@@ -270,6 +272,9 @@ public class ShadowLayout1 extends StackLayout implements Component.EstimateSize
/**
* Color int类型转RGB
+ *
+ * @param color
+ * @return RGB值
*/
private int[] toRgb(int color) {
int red = (color & RED) >> SIXTEEN;
diff --git a/shadowlayout/src/main/resources/base/element/string.json b/library/src/main/resources/base/element/string.json
similarity index 66%
rename from shadowlayout/src/main/resources/base/element/string.json
rename to library/src/main/resources/base/element/string.json
index e75550e18a3cbbfb53a4b058114585d4bc36b9e8..6c298286373e6266fd910aac81429792f08df437 100644
--- a/shadowlayout/src/main/resources/base/element/string.json
+++ b/library/src/main/resources/base/element/string.json
@@ -2,7 +2,7 @@
"string": [
{
"name": "app_name",
- "value": "shadowlayout"
+ "value": "Library"
}
]
}
diff --git a/entry/src/test/java/com/example/hm_shadowlayout_master/ExampleTest.java b/library/src/test/java/com/lijiankun24/shadowlayout/ExampleTest.java
similarity index 69%
rename from entry/src/test/java/com/example/hm_shadowlayout_master/ExampleTest.java
rename to library/src/test/java/com/lijiankun24/shadowlayout/ExampleTest.java
index 1265dce805b4ceffe9552c8ab9081585466508f0..ec217efde6da4b9bdefcbf29b96e2a7a02b8449b 100644
--- a/entry/src/test/java/com/example/hm_shadowlayout_master/ExampleTest.java
+++ b/library/src/test/java/com/lijiankun24/shadowlayout/ExampleTest.java
@@ -1,4 +1,4 @@
-package com.example.hm_shadowlayout_master;
+package com.lijiankun24.shadowlayout;
import org.junit.Test;
diff --git a/settings.gradle b/settings.gradle
index c8d8f43fd7ab20953ee498a68eeb94ce69b58904..d0c7ee8440156d4a9324ac5357770747425fef57 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':entry', ':shadowlayout'
+include ':entry', ':library'