Browse Source

提交分类: ui改版;
提交内容: 空白布局文字修改
当前版本: 测试版本6.3.0
是否冲突: 否

raomeng 8 years ago
parent
commit
4f0d3b6c24

+ 1 - 1
WeiChat/src/main/res/layout/oa_empty_list.xml

@@ -33,7 +33,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
             android:layout_marginBottom="90dp"
-            android:text="@string/common_list_empty"
+            android:text="@string/str_common_empty_text"
             android:textSize="14sp"
             android:textSize="14sp"
             android:textColor="@color/empty_text_color"
             android:textColor="@color/empty_text_color"
             />
             />

+ 1 - 1
app_core/common/src/main/res/layout/recycler_empty_view.xml

@@ -22,7 +22,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
             android:layout_marginBottom="90dp"
-            android:text="数据为空"
+            android:text="@string/str_common_empty_text"
             android:textSize="14sp"
             android:textSize="14sp"
             android:textColor="@color/empty_text_color"
             android:textColor="@color/empty_text_color"
             />
             />

+ 1 - 1
app_core/common/src/main/res/layout/view_empty.xml

@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
             android:layout_marginBottom="90dp"
-            android:text="@string/common_list_empty"
+            android:text="@string/str_common_empty_text"
             android:textSize="14sp"
             android:textSize="14sp"
             android:textColor="@color/empty_text_color"
             android:textColor="@color/empty_text_color"
             />
             />

+ 1 - 0
app_core/common/src/main/res/values-en/strings.xml

@@ -1636,4 +1636,5 @@
          <string name = "booking_time_set"> Reservation time period setting </string>
          <string name = "booking_time_set"> Reservation time period setting </string>
         <string name = "enter_details_money"> Please enter the details amount </string>
         <string name = "enter_details_money"> Please enter the details amount </string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
 </resources>
 </resources>

+ 1 - 0
app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1686,4 +1686,5 @@
     <string name="table_repeat">桌位不可重复设置</string>
     <string name="table_repeat">桌位不可重复设置</string>
     <string name="booking_time_set">预约时间段设置</string>
     <string name="booking_time_set">预约时间段设置</string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
 </resources>
 </resources>

+ 1 - 0
app_core/common/src/main/res/values-zh-rTW/strings.xml

@@ -1748,6 +1748,7 @@
     <string name="booking_time_set">預約時間段設置</string>
     <string name="booking_time_set">預約時間段設置</string>
     <string name="enter_details_money">請輸入明細金額</string>
     <string name="enter_details_money">請輸入明細金額</string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
     <!--end s商家设置-->
     <!--end s商家设置-->
 
 
 </resources>
 </resources>

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

@@ -2033,5 +2033,6 @@
     <string name="room_location">服务/场地/房间</string>
     <string name="room_location">服务/场地/房间</string>
     <string name="relax_time">休息时间</string>
     <string name="relax_time">休息时间</string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
     <string name="host_null_please_login_retry">站点地址获取失败,请重新登录后重试</string>
+    <string name="str_common_empty_text">暂无记录</string>
     <!--end s商家设置-->
     <!--end s商家设置-->
 </resources>
 </resources>

+ 1 - 1
app_modular/apputils/src/main/res/layout/common_empty_view.xml

@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="90dp"
             android:layout_marginBottom="90dp"
-            android:text="数据为空"
+            android:text="@string/str_common_empty_text"
             android:textSize="14sp"
             android:textSize="14sp"
             android:textColor="@color/empty_text_color"
             android:textColor="@color/empty_text_color"
             />
             />