diff --git a/CHANGELOG.md b/CHANGELOG.md index 87dba96e05af23f75c047cfaedc27930b7c292b9..4e99864b3db4a188731f6637ebf61863e5eb67cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,10 @@ -## 0.0.1-SNAPSHOT +## 0.0.2-SNAPSHOT + +ohos 第二个版本： +1. 修改findbugs +2. 修改SDK更新后适配配置 + +## 0.0.1-SNAPSHOT ohos 第一个版本 * 实现了原库的大部分 api * 因为SDK不支持so包动态生成的原因，该库的FlushAsync LogFile方法没有实现 \ No newline at end of file diff --git a/README.md b/README.md index a9fcb8fa22cb657b5ec37860bdafbeae27f3495d..dea946ac6644b597f7eb219af12d3911b6c90678 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ - 项目名称：LogUtils日志管理器 - 所属系列：openharmony化的第三方组件适配移植 - 功能：支持直接打印数据集合, 如List、Set、Map、数组；全局配置log输出, 个性化设置Tag -- 基线版本：Release v1.5.1 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio2.1 Release +- 开发版本：sdk6，DevEco Studio2.2 Beta1 +- 基线版本：Release v1.5.1 #### 效果演示 @@ -23,11 +23,11 @@ 2.在entry模块的build.gradle文件中， dependencies { - implementation('com.gitee.chinasoft_ohos:LogUtils:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:LogUtils:0.0.2-SNAPSHOT') ...... } -在sdk5，DevEco Studio2.1 Release下项目可直接运行 +在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 @@ -107,7 +107,7 @@ CloudTest代码测试无异常 #### 版本迭代 -0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT #### 版权和许可信息 diff --git a/build.gradle b/build.gradle index fe7a6b04115817b893997a838652720f9737ebf6..8e7d5ed27de5b0b788c4895978e0eea2ba71e12b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,9 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } } @@ -19,8 +19,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.6' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 4d7b19497ed894b768116fe3b6a8748735057389..86814d85566cffe6a41e491fd3b112af50eb31b1 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,9 +1,9 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { @@ -19,6 +19,7 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) implementation('com.gitee.chinasoft_ohos:LogUtils:0.0.1-SNAPSHOT') + compile project(path: ':export_api') implementation project(path: ':export_api') testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 99589e5b95e873c0eb441ff3ea3ea915ed42b153..6f547c77f59578308dd4750012319b60d95b903e 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -7,8 +7,8 @@ "name": "1.0" }, "apiVersion": { - "compatible": 4, - "target": 5 + "compatible": 5, + "target": 6 } }, "deviceConfig": {}, diff --git a/entry/src/main/java/com/apkfuns/demo/modle/FakeBounty.java b/entry/src/main/java/com/apkfuns/demo/modle/FakeBounty.java deleted file mode 100644 index 31f3f95cf82126ef9a74f92884a43093dec87c1d..0000000000000000000000000000000000000000 --- a/entry/src/main/java/com/apkfuns/demo/modle/FakeBounty.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.apkfuns.demo.modle; - -import com.apkfuns.logutils.LogUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -/** - * Created by pengwei on 16/5/19. - */ -public class FakeBounty { - public List mA = new ArrayList<>(); - - public class A { - int x = new Random().nextInt(); - int $change = 2; -// int this$0 = 4; - String $abc = "aaa"; - - public A() { - LogUtils.e("A"); - } - } - - public FakeBounty() { - for (int i = 0; i < 20; i++) { - mA.add(new A()); - } - } -} diff --git a/entry/src/main/java/com/apkfuns/demo/modle/Man.java b/entry/src/main/java/com/apkfuns/demo/modle/Man.java index 29f0921342b10ddf284d87b3dff4d2ea2b66f99b..f14d5b92ac9cb64cd787c4adb3fbbd7171e84a0f 100644 --- a/entry/src/main/java/com/apkfuns/demo/modle/Man.java +++ b/entry/src/main/java/com/apkfuns/demo/modle/Man.java @@ -13,8 +13,6 @@ import java.util.Map; public class Man extends Person { private static final int SEX = 1; private int a = 0; - private List list = new ArrayList<>(); - private Map map = DataHelper.getObjectMap(); public Man(int a) { super(); diff --git a/entry/src/main/java/com/apkfuns/demo/modle/MulObject.java b/entry/src/main/java/com/apkfuns/demo/modle/MulObject.java deleted file mode 100644 index 82808a0d73131090a0a760b190d978e0e6d45fc9..0000000000000000000000000000000000000000 --- a/entry/src/main/java/com/apkfuns/demo/modle/MulObject.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.apkfuns.demo.modle; - - -import com.apkfuns.demo.helper.DataHelper; - -import java.util.List; - -/** - * Created by pengwei on 16/4/18. - */ -public class MulObject { - private int part; - private Man man; - private Fruit fruit; - private Person person = DataHelper.getObject(); - private List persons = DataHelper.getObjectList(); - - public MulObject(int part) { - this.part = part; - this.man = new Man(2); - this.fruit = new Fruit("苹果", true); - fruit.setCanEat(false); - } -} diff --git a/entry/src/main/java/com/apkfuns/demo/modle/OldMan.java b/entry/src/main/java/com/apkfuns/demo/modle/OldMan.java index 137c54a6586f35eb67a669b9708871a60b389f4c..fe454031ffe68e4d1044f17a9c31c93dc55d35e1 100644 --- a/entry/src/main/java/com/apkfuns/demo/modle/OldMan.java +++ b/entry/src/main/java/com/apkfuns/demo/modle/OldMan.java @@ -5,8 +5,6 @@ package com.apkfuns.demo.modle; */ public class OldMan extends Man { - private String abc = "%^&&"; - private char x = 'c'; public OldMan(int a) { super(a); diff --git a/entry/src/main/java/com/apkfuns/demo/utils/Utils.java b/entry/src/main/java/com/apkfuns/demo/utils/Utils.java index 24c72c36c9cf582d7a53b3fd662c43deff513e67..bf150a6192a30662026106b6a0104ddfd0540539 100644 --- a/entry/src/main/java/com/apkfuns/demo/utils/Utils.java +++ b/entry/src/main/java/com/apkfuns/demo/utils/Utils.java @@ -5,9 +5,7 @@ import ohos.app.Context; public class Utils extends AbilityContext{ - Context context; public Utils(Context context){ - this.context = context; } public String mgetProcessName() { return this.getProcessName(); diff --git a/entry/src/ohosTest/java/com/apkfuns/logutils/ExampleOhosTest.java b/entry/src/ohosTest/java/com/apkfuns/logutils/ExampleOhosTest.java index de847cf81e0c2e923b0e96551803ec35b5a5ac74..1462dd7f04d398e725acb7f7ff6045a59513ec33 100644 --- a/entry/src/ohosTest/java/com/apkfuns/logutils/ExampleOhosTest.java +++ b/entry/src/ohosTest/java/com/apkfuns/logutils/ExampleOhosTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertEquals; /** * 单元测试 * - * @author fjh * @since 2021-05-24 */ public class ExampleOhosTest { diff --git a/export_api/src/main/config.json b/export_api/src/main/config.json index 2836487db7988f9577fa2d6f3485a7544bb736c2..92343fa988605bcca20c62fe4af3c4ce7da735d4 100644 --- a/export_api/src/main/config.json +++ b/export_api/src/main/config.json @@ -7,8 +7,8 @@ "name": "1.0" }, "apiVersion": { - "compatible": 4, - "target": 5, + "compatible": 5, + "target": 6, "releaseType": "Beta1" } }, diff --git a/library/src/main/config.json b/library/src/main/config.json index 2d27c55258389283c370293c0ff8910e60038058..c15c4860b264604ad763852d5d80f24ba11924f5 100644 --- a/library/src/main/config.json +++ b/library/src/main/config.json @@ -7,8 +7,8 @@ "name": "1.0" }, "apiVersion": { - "compatible": 4, - "target": 5, + "compatible": 5, + "target": 6, "releaseType": "Beta1" } }, diff --git a/library/src/main/java/com/apkfuns/logutils/Logger.java b/library/src/main/java/com/apkfuns/logutils/Logger.java index 1287ebe79b706382ad5d817c038cf105ffc0e9d2..e73e68837978a92415d9354053a7844d3521b479 100644 --- a/library/src/main/java/com/apkfuns/logutils/Logger.java +++ b/library/src/main/java/com/apkfuns/logutils/Logger.java @@ -47,7 +47,7 @@ class Logger implements Printer { Logger() { mLogConfig = LogConfigImpl.getInstance(); log2FileConfig = Log2FileConfigImpl.getInstance(); - mLogConfig.addParserClass(LocalParserManager.DEFAULT_PARSE_CLASS); + mLogConfig.addParserClass(LocalParserManager.getDefaultParseClass()); } /** diff --git a/library/src/main/java/com/apkfuns/logutils/parser/IntentParse.java b/library/src/main/java/com/apkfuns/logutils/parser/IntentParse.java index 4323d1d96ad6476fd23f54e113dc58143b985890..3a9022806807be889d96c6b96905ef580d5e5446 100644 --- a/library/src/main/java/com/apkfuns/logutils/parser/IntentParse.java +++ b/library/src/main/java/com/apkfuns/logutils/parser/IntentParse.java @@ -75,9 +75,9 @@ class IntentParse implements Parser { */ private String getFlags(int flags) { StringBuilder builder = new StringBuilder(); - for (int flagKey : FLAG_MAP.keySet()) { - if ((flagKey & flags) == flagKey) { - builder.append(FLAG_MAP.get(flagKey)); + for (Map.Entry flagKey : FLAG_MAP.entrySet()) { + if ((flagKey.getKey() & flags) == flagKey.getKey()) { + builder.append(FLAG_MAP.get(flagKey.getKey())); builder.append(" | "); } } diff --git a/library/src/main/java/com/apkfuns/logutils/parser/LocalParserManager.java b/library/src/main/java/com/apkfuns/logutils/parser/LocalParserManager.java index ab372fd919a533504e5a3b3ef2ca0df3948b1500..3f169b02eb5b3379e7d712d46feca22275676b49 100644 --- a/library/src/main/java/com/apkfuns/logutils/parser/LocalParserManager.java +++ b/library/src/main/java/com/apkfuns/logutils/parser/LocalParserManager.java @@ -4,10 +4,16 @@ import com.apkfuns.logutils.Parser; public class LocalParserManager { + public static Class[] getDefaultParseClass() { + return DEFAULT_PARSE_CLASS.clone(); + } + // 默认支持解析库 - public static final Class[] DEFAULT_PARSE_CLASS = new Class[]{ + private static Class[] DEFAULT_PARSE_CLASS = new Class[]{ BundleParse.class, IntentParse.class, CollectionParse.class, MapParse.class, ThrowableParse.class, ReferenceParse.class, MessageParse.class, ActivityParse.class }; + + } diff --git a/library/src/main/java/com/apkfuns/logutils/parser/MapParse.java b/library/src/main/java/com/apkfuns/logutils/parser/MapParse.java index 147ed5911f76eb136978db45edc13dce4a74ac6a..7f297da0c3adfadd6b9a4217c6b799e45a69d598 100644 --- a/library/src/main/java/com/apkfuns/logutils/parser/MapParse.java +++ b/library/src/main/java/com/apkfuns/logutils/parser/MapParse.java @@ -21,7 +21,7 @@ class MapParse implements Parser { @Override public String parseString(@NonNull Map map) { StringBuilder msg = new StringBuilder(map.getClass().getName() + " [" + LINE_SEPARATOR); - Set keys = map.keySet(); + Set keys = map.entrySet(); for (Object key : keys) { String itemString = "%s -> %s" + LINE_SEPARATOR; Object value = map.get(key); diff --git a/logutils_no_op/build.gradle b/logutils_no_op/build.gradle index e1c0b274a6c5cb35b197a177a17684addf760676..e5535dbec576e043146fa2f6e410dff9adeea457 100644 --- a/logutils_no_op/build.gradle +++ b/logutils_no_op/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { - compatibleSdkVersion 4 + compatibleSdkVersion 5 } buildTypes { release { @@ -17,5 +17,6 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation project(path: ':export_api') testImplementation 'junit:junit:4.13' } diff --git a/logutils_no_op/src/main/config.json b/logutils_no_op/src/main/config.json index 6a18f100310d78a36513a48d55ce900d8ca284d6..6f04bfe6de537e613531a110379b428876f1e5d5 100644 --- a/logutils_no_op/src/main/config.json +++ b/logutils_no_op/src/main/config.json @@ -7,8 +7,8 @@ "name": "1.0" }, "apiVersion": { - "compatible": 4, - "target": 5, + "compatible": 5, + "target": 6, "releaseType": "Beta1" } }, diff --git a/logutils_no_op/src/main/java/com/apkfuns/logutils/LogConfigImpl.java b/logutils_no_op/src/main/java/com/apkfuns/logutils/LogConfigImpl.java index a6c8ea4c22130eb36546fcabd52abf7ef5c0fc29..a24da60afb92897e337ac65714ab54495abc42fd 100644 --- a/logutils_no_op/src/main/java/com/apkfuns/logutils/LogConfigImpl.java +++ b/logutils_no_op/src/main/java/com/apkfuns/logutils/LogConfigImpl.java @@ -5,22 +5,6 @@ package com.apkfuns.logutils; */ class LogConfigImpl implements LogConfig { - private volatile static LogConfigImpl singleton; - - private LogConfigImpl() { - } - - static LogConfigImpl getInstance() { - if (singleton == null) { - synchronized (LogConfigImpl.class) { - if (singleton == null) { - singleton = new LogConfigImpl(); - } - } - } - return singleton; - } - @Override public LogConfig configAllowLog(boolean allowLog) { return this; diff --git a/logutils_no_op/src/main/java/com/apkfuns/logutils/LogUtils.java b/logutils_no_op/src/main/java/com/apkfuns/logutils/LogUtils.java index d6efc0e9b2109007f31c30045f01ac78e97e380d..8ba062921729f47b8dc457fe8a283af5c98034af 100644 --- a/logutils_no_op/src/main/java/com/apkfuns/logutils/LogUtils.java +++ b/logutils_no_op/src/main/java/com/apkfuns/logutils/LogUtils.java @@ -5,10 +5,6 @@ package com.apkfuns.logutils; */ public final class LogUtils { - public static LogConfig getLogConfig() { - return LogConfigImpl.getInstance(); - } - public static Log2FileConfig getLog2FileConfig() { return Log2FileConfigImpl.getInstance(); }