diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index ccbca6258a96184bf90e70cb5fbca6644ba31af5..0000000000000000000000000000000000000000 Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml deleted file mode 100644 index 9d45f4369697246b4bb01e1cb33f15a0252f36ba..0000000000000000000000000000000000000000 --- a/.idea/checkstyle-idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 61a9130cd9669c3843e6445dfe1fee2d493869bc..0000000000000000000000000000000000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 9108ab03b1e76b80feeeeb96d477196c11c82b00..0000000000000000000000000000000000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index 1dfcd020d2b2774ad414ac5c0acc344e9b9479b4..0000000000000000000000000000000000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8a14290d011eafeb38e9abc5abac47df163a6d4f..0000000000000000000000000000000000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 30ad0dca95945588a24aa9fbc2f3f59546469604..0000000000000000000000000000000000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index d9e0da015bdd4c70a271436788cbc1394952d47a..e5457a3fb6bd7670bfc31fc0a0ba62478d361b93 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# BankCardFormat +# BankCardFormat **本项目基于开源项目BankCardFormat 进行openharmony化的移植和开发，可以通过项目标签以及github地址（ https://github.com/smuyyh/BankCardFormat ）追踪到原项目版本** @@ -9,9 +9,7 @@ - 基线版本： BankCardFormat Tags 1.0.3 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio2.1 beta3 -- 项目作者和维护人：李佳晓 -- 联系方式：lijiaxiao073@chinasoftinc.com +- 开发版本：sdk5，DevEco Studio2.1 beta4 - 原项目Doc地址：https://github.com/smuyyh/BankCardFormat #### 效果演示 @@ -37,11 +35,6 @@ } ``` - -在sdk5，DevEco Studio2.1 beta3下项目可直接运行 -如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， -并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 - #### 使用说明 组件主要由TextField控件和检索 TextWatcher组成。 @@ -121,9 +114,6 @@ XML中添加自定义控件: } courPos = builder.length(); setText(builder.toString()); - - //setSelection(courPos); - if (listener != null) { if (BankCardUtils.checkBankCard(getBankCardText())) { char[] ss = getBankCardText().toCharArray(); @@ -153,8 +143,6 @@ CloudTest代码测试无异常 当前版本demo功能与原组件基本无差异 -测试员：常万里 - #### 版本迭代 - 0.0.1-SNAPSHOT \ No newline at end of file diff --git a/build.gradle b/build.gradle index bbb5d8b3bebfa3a7c406747c636f6dc51ab06748..e463f147c46e9b38e8fe2fb8e3f3059b899a057d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ ohos { compatibleSdkVersion 5 } } - + buildscript { repositories { maven { @@ -16,10 +16,10 @@ buildscript { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.2.5' + classpath 'com.huawei.ohos:hap:2.4.2.7' classpath 'com.huawei.ohos:decctest:1.0.0.6' } } @@ -32,6 +32,6 @@ allprojects { maven { url 'https://developer.huawei.com/repo/' } - jcenter() + jcenter() } } diff --git a/changeLog.md b/changeLog.md index bc6879890ed7a359d3d82e2a95e618b18da6eaa6..2dd7e8f629ccc718dd2057ba2dce2c37a907c994 100644 --- a/changeLog.md +++ b/changeLog.md @@ -1,8 +1,8 @@ -# 基本功能： -- 自动格式化银行卡号的EditText，每四位增加一个空格，并根据银行卡号判断该银行卡归属的银行 - -# 修改点： -1. 格式化银行卡号的TextField替换 - -# 遗留问题（暂不支持的功能）： -无 +# 基本功能： +- 自动格式化银行卡号的EditText，每四位增加一个空格，并根据银行卡号判断该银行卡归属的银行 + +# 修改点： +1. 格式化银行卡号的TextField替换 + +# 遗留问题（暂不支持的功能）： +无 diff --git a/entry-release-rich-unsigned.hap b/entry-release-rich-unsigned.hap new file mode 100644 index 0000000000000000000000000000000000000000..d078e382e99236a4ebc772599a18769f676b464c Binary files /dev/null and b/entry-release-rich-unsigned.hap differ diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 517d580c041c38835182ffff7d6780269ff44888..e16571909569a0ef637873c19e8efb8a3040108f 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.lijiaxiao.bankcard", + "bundleName": "com.yuyh.bankcardformat", "vendor": "yuyh", "version": { "code": 1, @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 5, "target": 5, - "releaseType": "Beta1" + "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/main/java/com/yuyh/bankcardformat/MainAbility.java b/entry/src/main/java/com/yuyh/bankcardformat/MainAbility.java index 2739b1062e3e763f22445f68f7a4b1a525a8748e..ef2c6a08152e5c4b39651ed6fc22d9d7acb606eb 100644 --- a/entry/src/main/java/com/yuyh/bankcardformat/MainAbility.java +++ b/entry/src/main/java/com/yuyh/bankcardformat/MainAbility.java @@ -1,3 +1,4 @@ + package com.yuyh.bankcardformat; import com.yuyh.bankcardformat.slice.MainAbilitySlice; diff --git a/entry/src/main/java/com/yuyh/bankcardformat/MyApplication.java b/entry/src/main/java/com/yuyh/bankcardformat/MyApplication.java index 5ce5bab852157d708ad2afccd8ede0a54d6d6c6e..a16dd397d28dbaeb2caf5b82b743437708bf15b6 100644 --- a/entry/src/main/java/com/yuyh/bankcardformat/MyApplication.java +++ b/entry/src/main/java/com/yuyh/bankcardformat/MyApplication.java @@ -1,3 +1,4 @@ + package com.yuyh.bankcardformat; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/com/yuyh/bankcardformat/slice/MainAbilitySlice.java b/entry/src/main/java/com/yuyh/bankcardformat/slice/MainAbilitySlice.java index 72ce662860ed5d450d3ab705b7a7731c43aeb000..2d7ae1d3599b4f214301061fc56f68593b7fdb90 100644 --- a/entry/src/main/java/com/yuyh/bankcardformat/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/yuyh/bankcardformat/slice/MainAbilitySlice.java @@ -1,3 +1,4 @@ + package com.yuyh.bankcardformat.slice; import com.example.library.BandCardEditText; diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index b5b92e1499736d2adc18caae66b5d87d307ed67b..075afb1c4cce67ef41ad98d5933b97cf875d2ac0 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 5, "target": 5, - "releaseType": "Beta1" + "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/entry/src/ohosTest/java/com/yuyh/bankcardformat/ExampleOhosTest.java b/entry/src/ohosTest/java/com/yuyh/bankcardformat/ExampleOhosTest.java index 162c282168a882ccc94a788ceb6caf7ead93a50c..c85b15a19782e52bf8e44032b248c19a17196367 100644 --- a/entry/src/ohosTest/java/com/yuyh/bankcardformat/ExampleOhosTest.java +++ b/entry/src/ohosTest/java/com/yuyh/bankcardformat/ExampleOhosTest.java @@ -3,6 +3,9 @@ package com.yuyh.bankcardformat; import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; import org.junit.Test; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + import static org.junit.Assert.assertEquals; public class ExampleOhosTest { @@ -11,4 +14,23 @@ public class ExampleOhosTest { final String actualBundleName = AbilityDelegatorRegistry.getArguments().getTestBundleName(); assertEquals("com.yuyh.bankcardformat", actualBundleName); } + + @Test + public void onStart() { + try { + Class mainAbilitySlice = Class.forName("com.yuyh.bankcardformat.slice.MainAbilitySlice"); + Method log = mainAbilitySlice.getMethod("onStart"); + Object obj = mainAbilitySlice.getConstructor().newInstance(); + log.invoke(obj); + } catch (ClassNotFoundException | NoSuchMethodException e) { + e.printStackTrace(); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (InvocationTargetException e) { + e.printStackTrace(); + } + } + } \ No newline at end of file diff --git a/library.har b/library.har new file mode 100644 index 0000000000000000000000000000000000000000..d3df979a45f939920cc00868d74ee6c0e3ca5e15 Binary files /dev/null and b/library.har differ diff --git a/library/src/main/java/com/example/library/BandCardEditText.java b/library/src/main/java/com/example/library/BandCardEditText.java index ee75ed362e8533a8270dfdf52314b9e96f1a2799..a85eee0ebbc807e21caa9c7a1529c32bfc836233 100644 --- a/library/src/main/java/com/example/library/BandCardEditText.java +++ b/library/src/main/java/com/example/library/BandCardEditText.java @@ -1,3 +1,4 @@ + package com.example.library; import ohos.agp.components.AttrSet; @@ -34,8 +35,6 @@ public class BandCardEditText extends TextField implements Text.TextObserver { setTouchFocusable(true); addTextObserver(this); setTextInputType(InputAttribute.PATTERN_NUMBER); -// setMaxTextWidth(19); -// setMaxTextLines(19); } @Override diff --git a/library/src/main/java/com/example/library/BankCardListener.java b/library/src/main/java/com/example/library/BankCardListener.java index dbf755adba86fde384b0c1e5ef2b76160cf999b9..fb016ca39f5d2f67609a867477ed95284fc42e50 100644 --- a/library/src/main/java/com/example/library/BankCardListener.java +++ b/library/src/main/java/com/example/library/BankCardListener.java @@ -1,3 +1,4 @@ + package com.example.library; public interface BankCardListener { diff --git a/library/src/main/java/com/example/library/BankCardUtils.java b/library/src/main/java/com/example/library/BankCardUtils.java index 1ba107b0267156c32ca0f42288d6dd5d00208a9e..6c5e50606d191447999502a3389bd34ba9f29832 100644 --- a/library/src/main/java/com/example/library/BankCardUtils.java +++ b/library/src/main/java/com/example/library/BankCardUtils.java @@ -1,3 +1,4 @@ + package com.example.library; import static com.example.library.BankCardInfo.bankBin;