From 1a2cfa45cb1f2ace327700067e7e4d34b47c39a5 Mon Sep 17 00:00:00 2001 From: liangqingsong Date: Tue, 6 Jul 2021 10:08:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7SDK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- build.gradle | 6 +++--- entry/build.gradle | 2 +- entry/src/main/config.json | 8 ++------ entry/src/ohosTest/config.json | 5 ----- statebutton/build.gradle | 2 +- statebutton/src/main/config.json | 5 ----- 7 files changed, 9 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 5ed7c10..6e71f12 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - 项目移植状态：已完成 - 调用差异：无 - 基线版本：Release 1.0.0 -- 开发版本：sdk5，DevEco Studio2.1 Release +- 开发版本：sdk6，DevEco Studio2.2 Beta1 ### 效果演示 @@ -33,7 +33,7 @@ dependencies { } ``` -在sdk5，DevEco Studio2.1 Release下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 +在sdk6，DevEco Studio2.2 Beta1下项目可直接运行。如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 ### 使用说明 diff --git a/build.gradle b/build.gradle index 75ff32d..a4bbee5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { 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.7' + 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 47d085a..187d515 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 2216a4a..effae62 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, @@ -22,7 +17,8 @@ "distro": { "deliveryWithInstall": true, "moduleName": "entry", - "moduleType": "entry" + "moduleType": "entry", + "installationFree": false }, "abilities": [ { diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index 1f030c4..5f1388a 100644 --- a/entry/src/ohosTest/config.json +++ b/entry/src/ohosTest/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, diff --git a/statebutton/build.gradle b/statebutton/build.gradle index 25ddf0c..7e1e475 100644 --- a/statebutton/build.gradle +++ b/statebutton/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/statebutton/src/main/config.json b/statebutton/src/main/config.json index c92ec98..d86bdda 100644 --- a/statebutton/src/main/config.json +++ b/statebutton/src/main/config.json @@ -5,11 +5,6 @@ "version": { "code": 1, "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": { -- Gitee From 329d59a64e96e6d3ed96982294c323ec9101b50d Mon Sep 17 00:00:00 2001 From: liangqingsong Date: Tue, 6 Jul 2021 10:42:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9README=E5=9F=BA=E7=BA=BF?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e71f12..485aaa3 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ - 功能：button点击效果 - 项目移植状态：已完成 - 调用差异：无 -- 基线版本：Release 1.0.0 - 开发版本：sdk6，DevEco Studio2.2 Beta1 +- 基线版本：Release 1.0.0 ### 效果演示 -- Gitee From 701eb3b9ad4df425b89c3d8c3cbe0cae95c0c769 Mon Sep 17 00:00:00 2001 From: liangqingsong Date: Tue, 6 Jul 2021 10:46:15 +0800 Subject: [PATCH 3/4] 0.0.2-SNAPSHOT --- CHANGELOG.md | 4 ++++ README.md | 4 ++-- entry/build.gradle | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78aec78..12da782 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.2-SNAPSHOT +ohos 第2个版本 + * 更新sdk6 + ## 0.0.1-SNAPSHOT ohos 第一个版本，完整实现了原库的全部 api diff --git a/README.md b/README.md index 485aaa3..5d94685 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ allprojects { 2. 在entry模块下的build.gradle文件中添加依赖。 ``` dependencies { - implementation('com.gitee.chinasoft_ohos:StateButton:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:StateButton:0.0.2-SNAPSHOT') } ``` @@ -98,7 +98,7 @@ CloudTest代码测试无异常 ### 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT ### 版权和许可信息 diff --git a/entry/build.gradle b/entry/build.gradle index 187d515..b0b0700 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -17,7 +17,7 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) - implementation('com.gitee.chinasoft_ohos:StateButton:0.0.1-SNAPSHOT') + implementation('com.gitee.chinasoft_ohos:StateButton:0.0.2-SNAPSHOT') testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' } -- Gitee From 65e2aedcc3eea076c0eb9dc3d464ca113f3c5d73 Mon Sep 17 00:00:00 2001 From: liangqingsong Date: Tue, 6 Jul 2021 14:52:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3FindBugs=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/deadline/statebutton/StateButton.java | 29 ++++--------------- .../com/deadline/statebutton/ViewExtend.java | 2 +- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/statebutton/src/main/java/com/deadline/statebutton/StateButton.java b/statebutton/src/main/java/com/deadline/statebutton/StateButton.java index 6b32587..790c7bb 100644 --- a/statebutton/src/main/java/com/deadline/statebutton/StateButton.java +++ b/statebutton/src/main/java/com/deadline/statebutton/StateButton.java @@ -62,23 +62,11 @@ public class StateButton extends Button implements Component.TouchEventListener // 是否移出button范围 private boolean moveOutOfButtonFlag = false; - // 屏幕宽度 - private float displayWidth; - - // 屏幕高度 - private float displayHeight; - - // 当前点击的button的宽度 - private float buttonWidth; - // 当前点击的button的高度 - private float buttonHeight; - - // 按下时触摸X坐标 - private float downTouchX; + private double buttonHeight; // 按下时触摸X坐标 - private float downTouchY; + private double downTouchY; // button左边界X坐标 private float leftX; @@ -87,10 +75,10 @@ public class StateButton extends Button implements Component.TouchEventListener private float rightX; // button上边界Y坐标 - private float topY; + private double topY; // button下边界Y坐标 - private float bottomY; + private double bottomY; /** * 单参构造 @@ -114,8 +102,6 @@ public class StateButton extends Button implements Component.TouchEventListener Optional display = DisplayManager.getInstance().getDefaultDisplay(this.getContext()); if (display.isPresent()) { DisplayAttributes displayAttributes = display.get().getAttributes(); - displayWidth = displayAttributes.width; - displayHeight = displayAttributes.height; } // 初始化button @@ -164,9 +150,7 @@ public class StateButton extends Button implements Component.TouchEventListener // 初次按下设置标记: 是否移出button范围 moveOutOfButtonFlag = false; - buttonWidth = this.getWidth(); buttonHeight = this.getHeight(); - downTouchX = touchEvent.getPointerScreenPosition(0).getX(); downTouchY = touchEvent.getPointerScreenPosition(0).getY(); // 获取button横坐标范围 @@ -180,8 +164,8 @@ public class StateButton extends Button implements Component.TouchEventListener 这里的计算,假设点击位置都在button高度中心点击,移动偏移1/2高度,就当做移出button范围 最上边的label和屏幕顶端状态栏还有高度 */ - topY = downTouchY - buttonHeight / 2; - bottomY = downTouchY + buttonHeight / 2; + topY = downTouchY - buttonHeight / 2f; + bottomY = downTouchY + buttonHeight / 2f; downElement = new ShapeElement(); downColor = new RgbColor(46, 64, 320); @@ -339,7 +323,6 @@ public class StateButton extends Button implements Component.TouchEventListener this.setBackground(strokeBackgroundAnimation); } else if ("withDash".equals(buttonName)) { ShapeElement withDashElement = (ShapeElement) cpt.getBackgroundElement(); - int width = withDashElement.getWidth(); withDashElement.setStroke(withDashElement.getStrokeWidth(), RgbColor.fromArgbInt(Color.WHITE.getValue())); this.setBackground(withDashElement); this.setTextColor(Color.WHITE); diff --git a/statebutton/src/main/java/com/deadline/statebutton/ViewExtend.java b/statebutton/src/main/java/com/deadline/statebutton/ViewExtend.java index 2983bd2..fe38baf 100644 --- a/statebutton/src/main/java/com/deadline/statebutton/ViewExtend.java +++ b/statebutton/src/main/java/com/deadline/statebutton/ViewExtend.java @@ -45,6 +45,6 @@ public class ViewExtend extends Component implements Component.DrawTask { @Override public void onDraw(Component component, Canvas canvas) { - Element backgroundElement = component.getBackgroundElement(); + } } -- Gitee