diff --git a/entry/build.gradle b/entry/build.gradle index 15971d45f3de70fe510db5246d66f0c78a35b971..ca92dc91eed8fa9399cd2435fb066e0ac0647cd1 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 defaultConfig { compatibleSdkVersion 5 @@ -24,7 +23,10 @@ dependencies { implementation 'io.reactivex:rxjava:1.1.9' implementation 'com.alibaba:fastjson:1.2.55' implementation project(path: ":ikvstockchart") + testImplementation 'org.mockito:mockito-core:2.23.0' + testImplementation 'com.google.truth:truth:0.39' } + decc { supportType = ['html', 'xml'] } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 3d7ffe9b216fa8f7586090333ecc4a995419ed3f..0e2cf297293952d6df83cffd1681e0b00a6f7f28 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -3,8 +3,8 @@ "bundleName": "com.wordplat.quickstart", "vendor": "wordplat", "version": { - "code": 1, - "name": "1.0" + "code": 1000000, + "name": "1.0.0" }, "apiVersion": { "compatible": 5, diff --git a/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java b/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java index 9cbacf1ec8137eb9e6d4c220e38428489c001272..374da95d6016ef87511a69df762d6ea16166947d 100644 --- a/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java +++ b/entry/src/main/java/com/wordplat/quickstart/ability/Disable_Left_And_Right_Refresh_Ability.java @@ -18,6 +18,7 @@ package com.wordplat.quickstart.ability; import com.wordplat.quickstart.slice.Disable_Left_And_Right_Refresh_Slice; import ohos.aafwk.content.Intent; +import ohos.agp.utils.Point; /** * Disable_Left_And_Right_Refresh_Ability @@ -29,5 +30,6 @@ public class Disable_Left_And_Right_Refresh_Ability extends Enable_Left_And_Righ public void onStart(Intent intent) { super.onStart(intent); super.setMainRoute(Disable_Left_And_Right_Refresh_Slice.class.getName()); + } } diff --git a/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java b/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java index 75ce7fe2d2fcc016977be2d4b5f115358755de4c..204baae13a272f7ea8cb9c79e0ce9713422a996a 100644 --- a/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java +++ b/entry/src/main/java/com/wordplat/quickstart/base/BaseAbilitySlice.java @@ -44,6 +44,5 @@ public class BaseAbilitySlice extends AbilitySlice { */ protected void setStatusBarColor(int colorResId) { WindowManager.getInstance().getTopWindow().get().setStatusBarColor(Color.rgb(30,130,210)); - } } diff --git a/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java b/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java index b0e74bb1fe769cdf933d6eaf80e383600e0a9b06..d9af98260543c45ef56281fafcdfde9e8fe500b3 100644 --- a/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java +++ b/entry/src/main/java/com/wordplat/quickstart/slice/MainSlice.java @@ -17,6 +17,7 @@ package com.wordplat.quickstart.slice; import com.wordplat.quickstart.ResourceTable; +import com.wordplat.quickstart.ability.MainAbility; import com.wordplat.quickstart.adapter.TextAdapter; import com.wordplat.quickstart.base.BaseAbilitySlice; import com.wordplat.quickstart.utils.ToastViewDialog; @@ -97,7 +98,7 @@ public class MainSlice extends BaseAbilitySlice { exitTime = System.currentTimeMillis(); } else { this.exit(); - System.exit(0); + terminateAbility(); } } } diff --git a/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java b/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java index 03f7207a219244354ae50ea79d3684cf0f1f0ec9..1883d2054c3dcf9ae624b3d9ffd09ad7ad946014 100644 --- a/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java +++ b/entry/src/main/java/com/wordplat/quickstart/utils/SSLHelper.java @@ -2,16 +2,18 @@ package com.wordplat.quickstart.utils; import com.wordplat.quickstart.ResourceTable; + import ohos.app.Context; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; +import java.io.InputStream; +import java.security.KeyStore; + import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; -import java.io.InputStream; -import java.security.KeyStore; /** *
SSLHelper
diff --git a/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java b/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java index c4637baabded57c2ed2e7b11dc97b4b40652b104..ed8a820622421084eea6ccd640061d0736da6431 100644 --- a/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java +++ b/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheFile.java @@ -53,14 +53,4 @@ public final class DiskCacheFile extends File implements Closeable { return cacheEntity; } - /** - * finalize - * - * @throws Throwable - */ - @Override - protected void finalize() throws Throwable { - super.finalize(); - this.close(); - } } diff --git a/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java b/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java index 6042a05f686b7692779f37e3da38640b9967938b..db911f9c3c8677f79b018ec8d5114596bdf2e86a 100644 --- a/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java +++ b/entry/src/main/java/com/wordplat/quickstart/xutils/http/loader/FileLoader.java @@ -133,8 +133,10 @@ public class FileLoader extends Loader