diff --git a/CHANGELOG.md b/CHANGELOG.md index 5afcfcb4f451a81fd0031ad0084b8b8bc7ec3d0a..768d44d4921e0f5d349c940c00b1f813c7130e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 1.0.0 +ohos 第4个版本 + * 正式版 ## 0.0.3-SNAPSHOT ohos 第3个版本 * 优化代码 diff --git a/README.md b/README.md index 222bf8f45a7e7ace7d636ec728b7a95509f39a34..5697fd408a083264d8d7a16c73da84f075f4916a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ 真理的单一来源、状态为只读、使用纯函数进行更改，该实现的关键是保留Redux的原始概念以重用大多数现有方法，但提供良好的Java API并尽可能保留类型。 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk6，DevEco Studio2.2 Beta1 +- 开发版本：sdk6，DevEco Studio2.2 Beta2 - 基线版本：Release v0.13.2 ## 效果演示 @@ -23,7 +23,7 @@ allprojects { repositories { maven { - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' } } } @@ -32,12 +32,12 @@ ``` dependencies { - implementation('com.gitee.chinasoft_ohos:reductor:0.0.3-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:reductor:1.0.0') ...... } ``` -在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 +在sdk6，DevEco Studio2.2 Beta2下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 diff --git a/build.gradle b/build.gradle index 8e7d5ed27de5b0b788c4895978e0eea2ba71e12b..f7ab1a4d4855eb490cbbb972195925504bbdac68 100644 --- a/build.gradle +++ b/build.gradle @@ -19,8 +19,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.5.0' - classpath 'com.huawei.ohos:decctest:1.2.4.1' + classpath 'com.huawei.ohos:hap:2.4.5.5' + classpath 'com.huawei.ohos:decctest:1.2.5.1' } } @@ -33,7 +33,7 @@ allprojects { url 'https://developer.huawei.com/repo/' } maven { - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' } jcenter() } diff --git a/compiller/src/main/java/com/yheriatovych/reductor/processor/Utils.java b/compiller/src/main/java/com/yheriatovych/reductor/processor/Utils.java index 1e206af7b7213d7f8944a706711690da31809d5b..a6ca473406d3911fe7682ae333e538793fad8b58 100644 --- a/compiller/src/main/java/com/yheriatovych/reductor/processor/Utils.java +++ b/compiller/src/main/java/com/yheriatovych/reductor/processor/Utils.java @@ -1,10 +1,7 @@ package com.yheriatovych.reductor.processor; import com.google.auto.common.MoreTypes; -import com.squareup.javapoet.AnnotationSpec; import com.yheriatovych.reductor.Reducer; - -import javax.annotation.Generated; import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; import java.util.ArrayList; diff --git a/entry/build.gradle b/entry/build.gradle index 3f5e232ea01c0677d0a1c14ddbe2171830c27bf2..7ead2fc3c8b4daa50354bc96c86e7eea799f2914 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -30,12 +30,12 @@ dependencies { annotationProcessor "com.google.auto.value:auto-value:1.5.2" implementation 'com.ryanharter.auto.value:auto-value-gson:0.4.2' annotationProcessor 'com.ryanharter.auto.value:auto-value-gson:0.4.2' -// implementation project(path:":compiller") -// annotationProcessor project(path:":compiller") - implementation('com.gitee.chinasoft_ohos:reductor:0.0.3-SNAPSHOT') - annotationProcessor('com.gitee.chinasoft_ohos:reductor:0.0.3-SNAPSHOT') +// implementation project(path: ":compiller") +// annotationProcessor project(path: ":compiller") + implementation('com.gitee.chinasoft_ohos:reductor:1.0.0') + annotationProcessor('com.gitee.chinasoft_ohos:reductor:1.0.0') testImplementation 'junit:junit:4.13' } decc { - supportType = ['html','xml'] + supportType = ['html', 'xml'] } diff --git a/entry/src/main/java/com/yheriatovych/reductor/example/SampleItemProvider.java b/entry/src/main/java/com/yheriatovych/reductor/example/SampleItemProvider.java index d4922a69c907f57a2a0bff095ba80c9ff43bcfec..59888e294bb58c6de3edb0ca28dfff8a0b9b7f35 100644 --- a/entry/src/main/java/com/yheriatovych/reductor/example/SampleItemProvider.java +++ b/entry/src/main/java/com/yheriatovych/reductor/example/SampleItemProvider.java @@ -100,12 +100,6 @@ public class SampleItemProvider extends RecycleItemProvider { checkbox.setText(note.getNote()); checkbox.setChecked(note.isChecked()); checkbox.setClickable(false); - checkbox.addDrawTask(new Component.DrawTask() { - @Override - public void onDraw(Component component, Canvas canvas) { - drawCheckBox(component, canvas); - } - }); cpt.setClickedListener(view -> { onClickListener.call(note); checkbox.invalidate(); @@ -160,24 +154,6 @@ public class SampleItemProvider extends RecycleItemProvider { } } - private void drawCheckBox(Component component, Canvas canvas) { - final float height = component.getHeight(); - Paint paint = new Paint(); - paint.setColor(Color.WHITE); - float circleX = NumCalcUtil.subtract(height / NUM2, OFFSET); - float circleY = height / NUM2; - canvas.drawCircle(circleX, circleY, RADIUSBIG, paint); - paint.setColor(new Color(Color.getIntColor("#FFFF4081"))); - paint.setStyle(Paint.Style.STROKE_STYLE); - paint.setStrokeWidth(STROKEWIDTH); - canvas.drawCircle(circleX, circleY, RADIUSBIG, paint); - if (((Checkbox) component).isChecked()) { - paint.setColor(new Color(Color.getIntColor("#FFFF4081"))); - paint.setStyle(Paint.Style.FILL_STYLE); - canvas.drawCircle(circleX, circleY, RADIUSSMALL, paint); - } - } - public void setNotes(List notes) { this.mNotes = notes; } diff --git a/entry/src/main/resources/base/graphic/checkbox_check_element.xml b/entry/src/main/resources/base/graphic/checkbox_check_element.xml new file mode 100644 index 0000000000000000000000000000000000000000..df55ede0dd2f358ecc28a718244859415040f85c --- /dev/null +++ b/entry/src/main/resources/base/graphic/checkbox_check_element.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/entry/src/main/resources/base/layout/item_sample.xml b/entry/src/main/resources/base/layout/item_sample.xml index 1e9dc7a801de5fbfaddd883b6937cf51efff92b9..c38ad0d9a01c3b8ba3a1d4d3c2993d8c29e33aee 100644 --- a/entry/src/main/resources/base/layout/item_sample.xml +++ b/entry/src/main/resources/base/layout/item_sample.xml @@ -11,6 +11,7 @@ ohos:width="match_content" ohos:layout_alignment="vertical_center" ohos:padding="4vp" + ohos:check_element="$graphic:checkbox_check_element" ohos:text_size="20fp"/> diff --git a/entry/src/main/resources/base/media/icon_checkbox_selected.png b/entry/src/main/resources/base/media/icon_checkbox_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..3a875e07f5fd7c5a342508f9f74246144e700afc Binary files /dev/null and b/entry/src/main/resources/base/media/icon_checkbox_selected.png differ diff --git a/entry/src/main/resources/base/media/icon_checkbox_unselected.png b/entry/src/main/resources/base/media/icon_checkbox_unselected.png new file mode 100644 index 0000000000000000000000000000000000000000..0d414740e2dae6ced6b19e5fdfe2b698b50ef1d8 Binary files /dev/null and b/entry/src/main/resources/base/media/icon_checkbox_unselected.png differ