diff --git a/README.OPENSOURCE.md b/README.OPENSOURCE.md new file mode 100644 index 0000000000000000000000000000000000000000..f60aa97653e6b571132a9bf18211d0077162fb1e --- /dev/null +++ b/README.OPENSOURCE.md @@ -0,0 +1,19 @@ +[ + + { + + "Name": "StateButton", + + "License": "MIT License", + + "License File": "https://github.com/niniloveyou/StateButton/blob/master/LICENSE", + + "Version Number": "1.1.0", + + "Upstream URL": "https://github.com/niniloveyou/StateButton", + + "Description": "比较常用的ViewGroup和View的圆角实现,一发治好设计的圆角病" + + } + +] \ No newline at end of file diff --git a/entry/src/ohosTest/config.json b/entry/src/ohosTest/config.json index e3ff2e51d4e8b7a907db94d1c1fb5822b8a3c4fb..1f030c422b3051618cb118c15db9de0633d15512 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/statebutton/src/main/config.json b/statebutton/src/main/config.json index 23c0a4f476f22d2bccc9c21e8ba15bed1d8c0400..c92ec98e591bdf7fd4c09f56f411c097e36c2ae5 100644 --- a/statebutton/src/main/config.json +++ b/statebutton/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 5, "target": 5, - "releaseType": "Beta1" + "releaseType": "Release" } }, "deviceConfig": { diff --git a/statebutton/src/main/java/com/deadline/statebutton/StateButton.java b/statebutton/src/main/java/com/deadline/statebutton/StateButton.java index eb26d90888afb6d423f31e8334c88b7593279a54..47957b43ae307fd6e4e591b53b4f95160353d6fa 100644 --- a/statebutton/src/main/java/com/deadline/statebutton/StateButton.java +++ b/statebutton/src/main/java/com/deadline/statebutton/StateButton.java @@ -112,9 +112,11 @@ public class StateButton extends Button implements Component.TouchEventListener // 获取屏幕高度和宽度 Optional display = DisplayManager.getInstance().getDefaultDisplay(this.getContext()); - DisplayAttributes displayAttributes = display.get().getAttributes(); - displayWidth = displayAttributes.width; - displayHeight = displayAttributes.height; + if (display.isPresent()) { + DisplayAttributes displayAttributes = display.get().getAttributes(); + displayWidth = displayAttributes.width; + displayHeight = displayAttributes.height; + } // 初始化button initButton(attrSet); diff --git a/statebutton/src/main/java/com/deadline/statebutton/StateConfig.java b/statebutton/src/main/java/com/deadline/statebutton/StateConfig.java index 6a447ee465424ee39f1fc1e6e4b8319b1ee8e7c1..85771f3f57ba6c7249868927535d70be6f516d0b 100644 --- a/statebutton/src/main/java/com/deadline/statebutton/StateConfig.java +++ b/statebutton/src/main/java/com/deadline/statebutton/StateConfig.java @@ -163,11 +163,6 @@ public class StateConfig { return this; } - private Builder setUnableTextColor(int unableTextColor) { - this.mUnableTextColor = unableTextColor; - return this; - } - private Builder setStrokeDashWidth(float strokeDashWidth) { this.mStrokeDashWidth = strokeDashWidth; return this; @@ -203,11 +198,6 @@ public class StateConfig { return this; } - private Builder setUnableStrokeColor(int unableStrokeColor) { - this.mUnableStrokeColor = mUnableStrokeColor; - return this; - } - private Builder setNormalBackgroundColor(int normalBackgroundColor) { this.mNormalBackgroundColor = normalBackgroundColor; return this;