From b8d3b443eb4fdb73edd157da687777c8fc9f187b Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Tue, 6 Jul 2021 18:50:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=91=EF=BC=9A=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/wordplat/quickstart/json/JSONObject.java | 2 +- .../quickstart/wight/navigation/BottomNavigation.java | 9 +++++---- .../quickstart/xutils/cache/DiskCacheEntity.java | 2 +- .../quickstart/xutils/http/request/ResRequest.java | 4 ++-- .../ikvstockchart/marker/YAxisTextMarkerView.java | 5 +++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/entry/src/main/java/com/wordplat/quickstart/json/JSONObject.java b/entry/src/main/java/com/wordplat/quickstart/json/JSONObject.java index 6b43f07..b12e893 100644 --- a/entry/src/main/java/com/wordplat/quickstart/json/JSONObject.java +++ b/entry/src/main/java/com/wordplat/quickstart/json/JSONObject.java @@ -89,7 +89,7 @@ public class JSONObject { public static final Object NULL = new Object() { @Override public boolean equals(Object o) { - if (o.equals(this) || o == null) { + if (o == null || o.equals(this)) { return true; } return false; // API specifies this broken equals implementation diff --git a/entry/src/main/java/com/wordplat/quickstart/wight/navigation/BottomNavigation.java b/entry/src/main/java/com/wordplat/quickstart/wight/navigation/BottomNavigation.java index a0db10d..09b75c6 100644 --- a/entry/src/main/java/com/wordplat/quickstart/wight/navigation/BottomNavigation.java +++ b/entry/src/main/java/com/wordplat/quickstart/wight/navigation/BottomNavigation.java @@ -266,8 +266,9 @@ public class BottomNavigation extends Component implements Component.DrawTask, C * (double) changePose); if (touchEffect && i == downPosition) { mPaint.setColor(new Color(0x20000000)); + canvas.drawCircle( - centerX, bottomNavigationHeight / 2, (float) ((double) notSelectedItemWidth * (double) 0.6f), mPaint); + centerX, bottomNavigationHeight / (float)2, (float) ((double) notSelectedItemWidth * (double) 0.6f), mPaint); } if (forceTint) { @@ -1232,7 +1233,7 @@ public class BottomNavigation extends Component implements Component.DrawTask, C return; } - double itemWidth = layoutWidth / items.size(); + double itemWidth = layoutWidth / (double)items.size(); if (itemWidth < minWidth) { itemWidth = minWidth; } else if (itemWidth > maxWidth) { @@ -1249,7 +1250,7 @@ public class BottomNavigation extends Component implements Component.DrawTask, C return; } - float itemWidth = layoutWidth / items.size(); + float itemWidth = layoutWidth / (float)items.size(); if (itemWidth < minWidth) { itemWidth = minWidth; @@ -1369,6 +1370,6 @@ public class BottomNavigation extends Component implements Component.DrawTask, C * @return int */ protected int dp2px(float dp) { - return (int) (getResourceManager().getDeviceCapability().screenDensity / 160 * dp); + return (int) (getResourceManager().getDeviceCapability().screenDensity / (double)(160 * dp)); } } diff --git a/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheEntity.java b/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheEntity.java index 629f427..5fcaa08 100644 --- a/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheEntity.java +++ b/entry/src/main/java/com/wordplat/quickstart/xutils/cache/DiskCacheEntity.java @@ -146,7 +146,7 @@ public final class DiskCacheEntity { if (lastModify == null) { this.lastModify = null; } else { - this.lastModify = lastModify; + this.lastModify = (Date) lastModify.clone(); } } diff --git a/entry/src/main/java/com/wordplat/quickstart/xutils/http/request/ResRequest.java b/entry/src/main/java/com/wordplat/quickstart/xutils/http/request/ResRequest.java index 8026b22..959cbd6 100644 --- a/entry/src/main/java/com/wordplat/quickstart/xutils/http/request/ResRequest.java +++ b/entry/src/main/java/com/wordplat/quickstart/xutils/http/request/ResRequest.java @@ -170,9 +170,9 @@ public class ResRequest extends UriRequest { } } catch (Throwable ex) { LogUtil.w(ex.getMessage(), ex); - lastModifiedTime = 0; + setLastModifiedTime(0); } finally { - if (lastModifiedTime == 0) { + if (getLastModifiedTime() == 0) { setLastModifiedTime(System.currentTimeMillis()); } } diff --git a/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/marker/YAxisTextMarkerView.java b/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/marker/YAxisTextMarkerView.java index 943b226..81e7190 100644 --- a/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/marker/YAxisTextMarkerView.java +++ b/ikvStockChart/src/main/java/com/wordplat/ikvstockchart/marker/YAxisTextMarkerView.java @@ -106,8 +106,9 @@ public class YAxisTextMarkerView implements IMarkerView { String value = decimalFormatter.format(pointCache[1]); float width = markerTextPaint.measureText(value) + 50; - - highlightPointY = (float) ((double)highlightPointY - height / 2); + double y = highlightPointY; + double h = height / (double)2; + highlightPointY = (float) (y - h); if (highlightPointY < contentRect.top) { highlightPointY = contentRect.top; } -- Gitee From 11203f4232fdf3e4ff3801de97dac0e1e709b5f5 Mon Sep 17 00:00:00 2001 From: HYL123698745 <1252347619@qq.com> Date: Tue, 6 Jul 2021 19:00:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E3=80=91=EF=BC=9A=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- entry/build.gradle | 2 +- entry/src/main/config.json | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 6796aad..8e7d5ed 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 } diff --git a/entry/build.gradle b/entry/build.gradle index ca92dc9..6aabb02 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 0e2cf29..5d5031f 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,10 +5,6 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5 } }, "deviceConfig": {}, -- Gitee