diff --git a/build.gradle b/build.gradle index 6796aad624ba566ab12cf4291e7ad083fc128e87..8e7d5ed27de5b0b788c4895978e0eea2ba71e12b 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 ca92dc91eed8fa9399cd2435fb066e0ac0647cd1..6aabb021c12fe6b1127a55bc72d9dbe570ec270d 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 0e2cf297293952d6df83cffd1681e0b00a6f7f28..5d5031ff4832b316b82a9bdba02ab96b25752c02 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": {}, 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 6b43f079d256df39de70589e3982568500ef546f..b12e8930afb45d3107f7781698f57e61f52039e7 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 a0db10d5dbe0833d8eb5968dcf0be8309ff8cb49..09b75c6e71604b4f9cf04b936f23cf10624bef36 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 629f4279c19ba8866669a93ec245bfb7e8af4669..5fcaa08e1e289e19c33e88a89c2844d0742fb21d 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 8026b2257fe4d131ed3ac6ad71a9eb079e9c2103..959cbd6c6063403e93881de67af13f43f6c4ed4c 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 943b22683cc8b190cd4ab15eac48478958261c3b..81e71908bdee2a020d54cd2bf70590bebfd2709c 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; }