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/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000000000000000000000000000000000000..f34df314fc0005040171a4676224a53f5a5634d0
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 0.0.1-SNAPSHOT
+
+ohos 第一个版本,完整实现了原库的全部 api
\ No newline at end of file
diff --git a/README.OPENSOURCE b/README.OPENSOURCE
index c49977868e39655895d774051959e176b4a28c93..f32659421d8f6841cfbd1a04a5b8cdd3663aeb36 100644
--- a/README.OPENSOURCE
+++ b/README.OPENSOURCE
@@ -6,7 +6,7 @@
"License": "Apache License",
- "License File": "https://github.com/nntuyen/mkloader/blob/master/LICENSE",
+ "License File": "LICENSE",
"Version Number": "1.4.0",
diff --git a/README.md b/README.md
index 804a9fb3c58daf6c1d6872bbfd20e13ddaa9acee..71ac588047bfb1f8958dd0d664449444d6c46aeb 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
- 项目名称:加载动画
- 所属系列:openharmony的第三方组件适配移植
- 功能:一个自定义加载的动画组件。
-- 基线版本: mkloader Tags 1.4.0
+- 基线版本: Release 1.4.0
- 项目移植状态:主功能完成
- 调用差异:无
- 开发版本:sdk5,DevEco Studio2.1.0.301 beta3
diff --git a/build.gradle b/build.gradle
index ff7362f67029f35dec778c6749a2269326af9339..6e73c6e2ef60c68161de5db18aa93599a68df745 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,19 +4,19 @@ apply plugin: 'com.huawei.ohos.app'
ohos {
compileSdkVersion 5
defaultConfig {
- compatibleSdkVersion 5
+ 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,7 +27,7 @@ buildscript {
allprojects {
repositories {
maven {
- url 'https://mirrors.huaweicloud.com/repository/maven/'
+ url 'https://repo.huaweicloud.com/repository/maven/'
}
maven {
url 'https://developer.huawei.com/repo/'
@@ -35,6 +35,6 @@ allprojects {
maven {
url 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
}
- jcenter()
+ jcenter()
}
}
diff --git a/changeLog.md b/changeLog.md
deleted file mode 100644
index 1d82c30a4a3103fd5d82a0c512d1bd11855a4470..0000000000000000000000000000000000000000
--- a/changeLog.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# 基本功能:
-* 自定义绘制的加载动画库。
-
-
-
-# 修改点:
-1. 无
-
-
-# 遗留问题(暂不支持的功能):
-1. 无
\ No newline at end of file
diff --git a/entry/build.gradle b/entry/build.gradle
index 42ea041878cd3884b37dd05fa476b2d4dd16ab40..8994faf425c8a38799c803db490230524880cf18 100644
--- a/entry/build.gradle
+++ b/entry/build.gradle
@@ -1,13 +1,27 @@
apply plugin: 'com.huawei.ohos.hap'
+apply plugin: 'com.huawei.ohos.decctest'
ohos {
compileSdkVersion 5
defaultConfig {
- compatibleSdkVersion 5
+ compatibleSdkVersion 4
}
+ buildTypes {
+ release {
+ proguardOpt {
+ proguardEnabled false
+ rulesFiles 'proguard-rules.pro'
+ }
+ }
+ }
+
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar', '*.har'])
- testCompile 'junit:junit:4.12'
+ testImplementation 'junit:junit:4.13'
+ ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100'
implementation('com.gitee.chinasoft_ohos:mkloader: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 be464d17e43f85c0bad49c69f9330fc20b337d90..217c4cfc30e216e96c4b96a4085570b8fc6b3d7e 100644
--- a/entry/src/main/config.json
+++ b/entry/src/main/config.json
@@ -7,7 +7,7 @@
"name": "1.0"
},
"apiVersion": {
- "compatible": 5,
+ "compatible": 4,
"target": 5
}
},
@@ -16,8 +16,7 @@
"package": "com.tuyenmonkey.sample",
"name": ".MyApplication",
"deviceType": [
- "phone",
- "tablet"
+ "phone"
],
"distro": {
"deliveryWithInstall": true,
@@ -40,7 +39,7 @@
"name": "com.tuyenmonkey.sample.MainAbility",
"icon": "$media:icon",
"description": "$string:mainability_description",
- "label": "HM_mkloader",
+ "label": "$string:app_name",
"type": "page",
"launchType": "standard"
}
diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json
index 5ce91a5b9cada85c72d0d9a48b89ba614fdc8301..031de0360eaf59b61360e380156a5a57e39a38cf 100644
--- a/entry/src/main/resources/base/element/string.json
+++ b/entry/src/main/resources/base/element/string.json
@@ -2,7 +2,7 @@
"string": [
{
"name": "app_name",
- "value": "HM_mkloader"
+ "value": "mkloader"
},
{
"name": "mainability_description",
diff --git a/entry/src/main/resources/base/graphic/background_ability_main.xml b/entry/src/main/resources/base/graphic/background_ability_main.xml
index 47a2d3e00aea59206e521f2e2c2491c629528df9..c0c0a3df480fa387a452b9c40ca191cc918a3fc0 100644
--- a/entry/src/main/resources/base/graphic/background_ability_main.xml
+++ b/entry/src/main/resources/base/graphic/background_ability_main.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/entry/src/main/resources/base/layout/ability_main.xml b/entry/src/main/resources/base/layout/ability_main.xml
index b979e96d7f7dbb5a292827d66d889a1999dfd350..e3d488b3c37be7798958d6a85d22c2888330d60a 100644
--- a/entry/src/main/resources/base/layout/ability_main.xml
+++ b/entry/src/main/resources/base/layout/ability_main.xml
@@ -1,10 +1,10 @@