diff --git a/entry/build.gradle b/entry/build.gradle index a0d04c7b5e29e2d18930b7e15ac25b5ecd513f20..226481b09034ce58ef0d38564717a4b03e41309b 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -19,7 +19,7 @@ ohos { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) implementation project(':fungamerefresh') - implementation 'io.openharmony.tpc.thirdlib:FunGameRefresh:1.0.0' + //implementation 'io.openharmony.tpc.thirdlib:FunGameRefresh:1.0.0' testImplementation 'junit:junit:4.13' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' } 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 366fce9cdc432537934dfad2d7f3127f57a1c330..0e1bae63ded327a2193ac664d6d40d22c31d60c8 100644 --- a/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java +++ b/fungamerefresh/src/main/java/com/hitomi/refresh/view/FunGameHeader.java @@ -19,6 +19,8 @@ import ohos.app.Context; * Created by Hitomis on 2016/3/1. */ public class FunGameHeader extends StackLayout implements Component.EstimateSizeListener { + private static final int DEFAULT_TEXT_SIZE=35; + private Context mContext; private int headerType; @@ -43,9 +45,9 @@ public class FunGameHeader extends StackLayout implements Component.EstimateSize private String loadingFinishedText = "Loading Finished"; private String gameOverText = "Game Over"; - private int topMaskTextSize = 35; + private int topMaskTextSize = DEFAULT_TEXT_SIZE; - private int bottomMaskTextSize = 35; + private int bottomMaskTextSize = DEFAULT_TEXT_SIZE; public FunGameHeader(Context context) { @@ -118,12 +120,13 @@ public class FunGameHeader extends StackLayout implements Component.EstimateSize private Text createMaskTextView(String text, int textSize, int gravity) { Text maskTextView = new Text(mContext); maskTextView.setTextColor(Color.BLACK); + maskTextView.setMultipleLine(true); ShapeElement shapeElement = new ShapeElement(); shapeElement.setRgbColor(RgbColor.fromArgbInt(Color.WHITE.getValue())); maskTextView.setBackground(shapeElement); maskTextView.setTextAlignment(gravity | TextAlignment.HORIZONTAL_CENTER); if (textSize < 0) { - textSize = 35; + textSize = DEFAULT_TEXT_SIZE; } maskTextView.setTextSize(textSize); maskTextView.setText(text);