Переглянути джерело

不支持字体与长度等

zengjiebin 7 роки тому
батько
коміт
17d36ba853

+ 4 - 1
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -260,7 +260,7 @@ public class TestUtil {
      */
     public static void test(final Activity activity) {
         final String[] items = {"复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
-                "切换皮肤", "默认皮肤", "我的游戏", "优惠券弹窗", "填写收件地址弹窗",
+                "dialog_gtg_top", "切换皮肤", "默认皮肤", "我的游戏", "优惠券弹窗", "填写收件地址弹窗",
                 "朗读文字", "游戏搜索", "测试插件","测试bitmap", "剪切视频", "我的关注", "足迹",
                 "测试联通卡", "测试联通卡2", "测试签名1", "测试签名2", "测试孔剑秋faq正式服",
                 "跳转QQ1", "跳转QQ2", "跳转QQ3", "跳转白白QQ", "龙猫竞猜", "龙猫竞猜-scheme",
@@ -280,6 +280,9 @@ public class TestUtil {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
+                            case "dialog_gtg_top":
+                                G.showToast(G.DENSITY+"////////"+activity.getResources().getDimension(R.dimen.dialog_gtg_top)+"////////"+G.getRealPix(90));
+                                break;
                             case "切换皮肤":
                                 SkinUtil.changeSkin(null);
                                 break;

+ 5 - 5
app/src/main/res/layout/dialog_game_or_task_or_gift.xml

@@ -16,7 +16,7 @@
             android:id="@+id/dialog_iv"
             android:layout_width="@dimen/content_padding_65"
             android:layout_height="@dimen/content_padding_65"
-            android:layout_marginTop="90dp"
+            android:layout_marginTop="@dimen/dialog_gtg_top"
             android:src="@drawable/loading_01" />
 
         <TextView
@@ -25,8 +25,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:text="永恒仙域"
-            android:textColor="#272727"
-            android:textSize="16sp" />
+            android:textColor="@color/tc_dialog_gtg_name"
+            android:textSize="@dimen/ts_dialog_gtg_name" />
 
         <ImageView
             android:id="@+id/dialog_iv_2"
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="+1元"
-                android:textColor="#ffff2d4b"
+                android:textColor="@color/tc_dialog_gtg_amout"
                 android:textSize="18sp"
                 android:textStyle="bold" />
 
@@ -77,7 +77,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="50dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="@dimen/dialog_gtg_code_top"
             android:layout_marginEnd="50dp"
             android:text="@string/gift_bag_code"
             android:textColor="#fffd2d54"

+ 3 - 0
app/src/main/res/values/colors.xml

@@ -11,4 +11,7 @@
     <color name="bg_class_grey">#f9f9f9</color>
     <color name="gray_CBCBCB">#cbcbcb</color>
 
+    <color name="tc_dialog_gtg_name">#272727</color>
+    <color name="tc_dialog_gtg_amout">#ffff2d4b</color>
+    <color name="red_FD2D54">#FD2D54</color>
 </resources>

+ 3 - 0
app/src/main/res/values/dimens.xml

@@ -6,5 +6,8 @@
 
 
     <dimen name="textSize1">12sp</dimen>
+    <dimen name="dialog_gtg_top">90dp</dimen>
+    <dimen name="dialog_gtg_code_top">42dp</dimen>
+    <dimen name="ts_dialog_gtg_name">16sp</dimen>
 
 </resources>

+ 0 - 1
view/src/main/res/values/colors.xml

@@ -25,7 +25,6 @@
     <color name="black_6_e">#eeeeee</color>
     <color name="gray_F0F0F0">#F0F0F0</color>
     <color name="yellow_D3AF57">#D3AF57</color>
-    <color name="red_FD2D54">#FD2D54</color>
     <color name="red_F07422">#F07422</color>
     <color name="gray_CCCCCC">#CCCCCC</color>