From 2c163f682279154eb652605e999fd388d22fbfd8 Mon Sep 17 00:00:00 2001 From: yu_xh <940151214@qq.com> Date: Fri, 30 Jul 2021 16:58:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E5=AD=97=E5=A4=A7=E5=B0=8F=E4=B8=BA=E8=B4=9F=E6=95=B0?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B4=A9=E6=BA=83=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hitomi/refresh/view/FunGameHeader.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java b/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java index e383b3c..f0d78ff 100644 --- a/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java +++ b/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java @@ -81,10 +81,10 @@ public class FunGameHeader extends StackLayout implements Component.EstimateSize gameOverText = attrSet.getAttr(Styleable.TEXT_GAME_OVER).get().getStringValue(); } if (attrSet.getAttr(Styleable.TOP_TEXT_SIZE).isPresent()) { - topMaskTextSize = (int) attrSet.getAttr(Styleable.TOP_TEXT_SIZE).get().getFloatValue(); + topMaskTextSize = (int) attrSet.getAttr(Styleable.TOP_TEXT_SIZE).get().getDimensionValue(); } if (attrSet.getAttr(Styleable.BOTTOM_TEXT_SIZE).isPresent()) { - bottomMaskTextSize = (int) attrSet.getAttr(Styleable.BOTTOM_TEXT_SIZE).get().getFloatValue(); + bottomMaskTextSize = (int) attrSet.getAttr(Styleable.BOTTOM_TEXT_SIZE).get().getDimensionValue(); } } initView(attrSet); @@ -122,6 +122,9 @@ public class FunGameHeader extends StackLayout implements Component.EstimateSize shapeElement.setRgbColor(RgbColor.fromArgbInt(Color.WHITE.getValue())); maskTextView.setBackground(shapeElement); maskTextView.setTextAlignment(gravity | TextAlignment.HORIZONTAL_CENTER); + if (textSize < 0) { + textSize = 35; + } maskTextView.setTextSize(textSize); maskTextView.setText(text); return maskTextView; -- Gitee From 901a52ed282eb5ab5e734bf13586e735ac378c36 Mon Sep 17 00:00:00 2001 From: yu_xh <940151214@qq.com> Date: Fri, 30 Jul 2021 17:15:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E9=99=90=E5=88=B6refreshView=E4=B8=8B?= =?UTF-8?q?=E9=9D=A2=E7=94=A8=E6=88=B7=E5=8F=AA=E8=83=BD=E6=94=BE=E4=B8=80?= =?UTF-8?q?=E4=B8=AAComponent=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=87=E5=AD=97=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hitomi/refresh/view/FunGameHeader.java | 13 ++++++ .../refresh/view/FunGameRefreshView.java | 45 +++++++++++++++++-- 2 files changed, 55 insertions(+), 3 deletions(-) diff --git a/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java b/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java index f0d78ff..9f08f20 100644 --- a/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java +++ b/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java @@ -331,4 +331,17 @@ public class FunGameHeader extends StackLayout implements Component.EstimateSize funGameView.setTextLoadingFinished(loadingFinishedStr); } + public String getHeaderLodingStr() { + return funGameView.getTextLoading(); + } + + public String getHeaderGameOverStr() { + return funGameView.getTextGameOver(); + } + + public String getHeaderLoadingFinishedStr() { + return funGameView.getTextLoadingFinished(); + } + + } diff --git a/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameRefreshView.java b/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameRefreshView.java index 9f3277a..0e5fc97 100644 --- a/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameRefreshView.java +++ b/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameRefreshView.java @@ -92,9 +92,6 @@ public class FunGameRefreshView extends DirectionalLayout implements Component.L public FunGameRefreshView(Context context, AttrSet attrSet, String styleName) { super(context, attrSet, styleName); - if (getChildCount() > 1) { - throw new RuntimeException("FunGameRefreshView can only contain one View"); - } setOrientation(VERTICAL); initView(context, attrSet); } @@ -108,6 +105,9 @@ public class FunGameRefreshView extends DirectionalLayout implements Component.L @Override public void onRefreshed(Component component) { + if (getChildCount() > 2) { + throw new RuntimeException("FunGameRefreshView can only contain one Component"); + } hideHeaderHeight = -header.getHeight(); headerLayoutParams = header.getLayoutConfig(); headerLayoutParams.setMarginTop(hideHeaderHeight); @@ -345,6 +345,15 @@ public class FunGameRefreshView extends DirectionalLayout implements Component.L header.setHeaderLodingStr(loadingText); } + /** + * 获取加载开始文字 + * + * @return 文字内容 + */ + public String getLoadingText() { + return header.getHeaderLodingStr(); + } + /** * 设置加载结束文字 * @@ -357,6 +366,16 @@ public class FunGameRefreshView extends DirectionalLayout implements Component.L header.setHeaderLoadingFinishedStr(loadingFinishedText); } + /** + * 获取加载结束文字 + * + * @return 文字内容 + */ + public String getLoadingFinishedText() { + return header.getHeaderLoadingFinishedStr(); + } + + /** * 设置游戏结束文字 * @@ -369,6 +388,16 @@ public class FunGameRefreshView extends DirectionalLayout implements Component.L header.setHeaderGameOverStr(gameOverText); } + /** + * 获取游戏结束文字 + * + * @return 文字内容 + */ + public String getGameOverText() { + return header.getHeaderGameOverStr(); + } + + /** * 设置上边帷幕中的文字 * @@ -381,6 +410,7 @@ public class FunGameRefreshView extends DirectionalLayout implements Component.L header.setTopMaskViewText(topMaskText); } + /** * 设置下边帷幕中的文字 * @@ -393,6 +423,15 @@ public class FunGameRefreshView extends DirectionalLayout implements Component.L header.setBottomMaskViewText(bottomMaskText); } + /** + * 获取游戏状态 + * @return 游戏状态 + */ + public int getGameStatus(){ + return header.getGameStatus(); + } + + private boolean isEmptyByText(String text) { return text == null || text.equals(""); } -- Gitee From 000d869dcf1768092a9a4b97c3a6436383413907 Mon Sep 17 00:00:00 2001 From: yu_xh <940151214@qq.com> Date: Fri, 30 Jul 2021 17:21:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix=E4=BF=AE=E5=A4=8D=E5=9D=A6=E5=85=8B?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=8E=B7=E5=8F=96height=E4=B8=BA0=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E9=99=A4=E6=95=B0=E4=B8=BA0?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hitomi/refresh/view/BattleCityView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fungamerefresh/src/main/java/com/hitomi/refresh/view/BattleCityView.java b/fungamerefresh/src/main/java/com/hitomi/refresh/view/BattleCityView.java index 11f3606..17d67af 100644 --- a/fungamerefresh/src/main/java/com/hitomi/refresh/view/BattleCityView.java +++ b/fungamerefresh/src/main/java/com/hitomi/refresh/view/BattleCityView.java @@ -242,7 +242,11 @@ public class BattleCityView extends FunGameView { * @return 轨道下标 */ private int getTrackIndex(int y) { - int index = y / (getEstimatedHeight() / TANK_ROW_NUM); + int index = 0; + try { + index = y / (getEstimatedHeight() / TANK_ROW_NUM); + } catch (ArithmeticException e) { + } index = index >= TANK_ROW_NUM ? TANK_ROW_NUM - 1 : index; index = index < 0 ? 0 : index; return index; -- Gitee From bae0baa367eb5f35227bc0fabef1104b587ea5d0 Mon Sep 17 00:00:00 2001 From: yu_xh <940151214@qq.com> Date: Fri, 30 Jul 2021 17:26:19 +0800 Subject: [PATCH 4/5] =?UTF-8?q?pref:=E8=AE=BE=E7=BD=AE=E5=B0=8F=E7=90=83?= =?UTF-8?q?=E9=80=9F=E5=BA=A6=E4=B8=BA=E5=9B=BA=E5=AE=9A=E7=9A=84=E4=B8=89?= =?UTF-8?q?=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hitomi/refresh/view/HitBlockView.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/fungamerefresh/src/main/java/com/hitomi/refresh/view/HitBlockView.java b/fungamerefresh/src/main/java/com/hitomi/refresh/view/HitBlockView.java index ce264f6..cd292bc 100644 --- a/fungamerefresh/src/main/java/com/hitomi/refresh/view/HitBlockView.java +++ b/fungamerefresh/src/main/java/com/hitomi/refresh/view/HitBlockView.java @@ -106,7 +106,7 @@ public class HitBlockView extends FunGameView { blockHorizontalNum = BLOCK_HORIZONTAL_NUM; } if (attrs != null && attrs.getAttr(Styleable.BALL_SPEED).isPresent()) { - speed = attrs.getAttr(Styleable.BALL_SPEED).get().getIntegerValue(); + speed = getBallSpeed(attrs.getAttr(Styleable.BALL_SPEED).get().getStringValue()); } else { speed = SPEED; } @@ -302,5 +302,18 @@ public class HitBlockView extends FunGameView { } } + private int getBallSpeed(String ball_speed) { + switch (ball_speed) { + case "low": + return 3; + case "medium": + return 6; + case "fast": + return 9; + default: + return 6; + } + } + } -- Gitee From 07cdc6d478467a30bdf19af8233a8232e2a74ce0 Mon Sep 17 00:00:00 2001 From: yu_xh <940151214@qq.com> Date: Mon, 2 Aug 2021 10:09:44 +0800 Subject: [PATCH 5/5] =?UTF-8?q?pref:entry=E8=AE=BE=E7=BD=AE=E6=9B=B4?= =?UTF-8?q?=E5=8A=A0=E8=AF=A6=E7=BB=86=E7=9A=84=E7=94=A8=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++++-- build.gradle | 4 ++-- changelog.md | 11 ++++++----- entry/build.gradle | 1 + entry/src/main/resources/base/layout/ability_grid.xml | 3 ++- entry/src/main/resources/base/layout/ability_list.xml | 5 ++++- .../java/com/hitomi/refresh/view/FunGameHeader.java | 4 ++-- 7 files changed, 21 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 82d89b7..a6c6f82 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,9 @@ ohos:id="$+id:refresh_fun_game" ohos:height="match_parent" ohos:width="match_parent" - hap:game_type="1"> + hap:game_type="1" + hap:top_text_size="20fp" + hap:bottom_text_size="20fp"> + hap:game_type="0" + hap:ball_speed="fast"> + hap:game_type="1" + hap:top_text_size="20fp" + hap:bottom_text_size="20fp" + >