瀏覽代碼

修改多国语言显示问题

weizhengliang 2 年之前
父節點
當前提交
29bb55cb31

+ 3 - 1
common/src/main/res/layout/custom_loading.xml

@@ -22,8 +22,10 @@
             android:id="@+id/loading_text"
             android:layout_width="150.0dip"
             android:layout_height="150.0dip"
+            android:padding="10dp"
             android:gravity="center"
-            android:text="请等待"
+            android:maxLines="2"
+            android:text="@string/str_wait"
             android:textColor="#ffcccccc"
             android:textSize="30.0sp" />
     </RelativeLayout>

+ 3 - 2
common/src/main/res/layout/netoff_loading.xml

@@ -24,8 +24,9 @@
             android:layout_height="180.0dip"
             android:padding="32dp"
             android:gravity="center"
-            android:text="连接中"
-            android:textColor="#ffffff"
+            android:maxLines="2"
+            android:text="@string/str_connecting"
+            android:textColor="#ffcccccc"
             android:textSize="24sp" />
     </RelativeLayout>
 </LinearLayout>

+ 6 - 0
common/src/main/res/values-es/strings.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string name="app_name">JavaShop_Android_Lib</string>
+
+    <string name="str_wait">Espera</string>
+    <string name="str_connecting">Conectivo</string>
+</resources>

+ 6 - 0
common/src/main/res/values-ru/strings.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string name="app_name">JavaShop_Android_Lib</string>
+
+    <string name="str_wait">Подождите</string>
+    <string name="str_connecting">Соединительный</string>
+</resources>

+ 6 - 0
common/src/main/res/values-zh/strings.xml

@@ -0,0 +1,6 @@
+<resources>
+    <string name="app_name">JavaShop_Android_Lib</string>
+
+    <string name="str_wait">请稍等</string>
+    <string name="str_connecting">连接中</string>
+</resources>

+ 3 - 0
common/src/main/res/values/strings.xml

@@ -1,3 +1,6 @@
 <resources>
     <string name="app_name">JavaShop_Android_Lib</string>
+
+    <string name="str_wait">Wait</string>
+    <string name="str_connecting">Connecting</string>
 </resources>

+ 3 - 2
home/src/main/code/com/wdkl/ncs/android/component/home/activity/WatchHome2Activity.kt

@@ -86,8 +86,6 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         if (!isTaskRoot) {
             finish()
         }
-        loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading, R.id.loadding_image)
-        netOffLoadingDialog = CommonTool.createLoadingDialog(this, R.layout.netoff_loading, R.id.netoff_loading_image)
 
         super.onCreate(savedInstanceState)
     }
@@ -107,6 +105,9 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
     //初始化
     override fun init() {
+        loadingDialog = CommonTool.createLoadingDialog(this, R.layout.custom_loading, R.id.loadding_image)
+        netOffLoadingDialog = CommonTool.createLoadingDialog(this, R.layout.netoff_loading, R.id.netoff_loading_image)
+
 //        DaemonEnv.sendStopWorkBroadcast(this)
         AnrFcExceptionUtil.getInstance(application).initFCException()
         //注册广播