d

.idea/misc.xml

@@ -255,10 +255,12 @@
         <entry key="user/src/main/res/layout/activity_setting.xml" value="0.36302083333333335" />
         <entry key="user/src/main/res/layout/activity_tab_black.xml" value="0.3619791666666667" />
         <entry key="user/src/main/res/layout/activity_task.xml" value="0.3776041666666667" />
+        <entry key="user/src/main/res/layout/activity_transfer.xml" value="0.35643115942028986" />
         <entry key="user/src/main/res/layout/activity_user_edit.xml" value="0.3638968481375358" />
         <entry key="user/src/main/res/layout/dialog_edit.xml" value="0.39166666666666666" />
         <entry key="user/src/main/res/layout/dialog_exchange.xml" value="0.3776041666666667" />
         <entry key="user/src/main/res/layout/dialog_sex.xml" value="0.34057971014492755" />
+        <entry key="user/src/main/res/layout/dialog_transfer_sure.xml" value="0.20572916666666666" />
         <entry key="user/src/main/res/layout/fragment_anchor.xml" value="0.3015625" />
         <entry key="user/src/main/res/layout/fragment_anchor_level.xml" value="0.3171875" />
         <entry key="user/src/main/res/layout/fragment_black.xml" value="0.17603850050658562" />
@@ -277,6 +279,7 @@
         <entry key="user/src/main/res/layout/item_recharge.xml" value="0.39166666666666666" />
         <entry key="user/src/main/res/layout/item_room_black.xml" value="0.36302083333333335" />
         <entry key="user/src/main/res/layout/item_task.xml" value="0.25" />
+        <entry key="user/src/main/res/layout/item_transfer_detail.xml" value="0.20572916666666666" />
         <entry key="user/src/main/res/layout/item_xing_zuo.xml" value="0.3020833333333333" />
         <entry key="user/src/main/res/layout/layout_list.xml" value="0.39166666666666666" />
       </map>

baseswago/src/main/res/layout/dialog_person_data.xml

@@ -93,17 +93,12 @@
                 app:layout_constraintBottom_toBottomOf="@+id/tvLevelView"
                 tools:visibility="visible" />
 
-            <TextView
+            <ImageView
                 android:id="@+id/tvAgent"
-                android:textSize="10dp"
-                android:text="@string/agent"
-                android:textColor="#fff"
-                android:paddingStart="16dp"
-                android:paddingEnd="5dp"
+                android:src="@mipmap/icon_agent"
                 android:visibility="gone"
                 tools:visibility="visible"
                 android:layout_marginStart="5dp"
-                android:background="@mipmap/icon_agent_bg"
                 app:layout_constraintBottom_toBottomOf="@+id/tvLevelView"
                 app:layout_constraintTop_toTopOf="@+id/tvLevelView"
                 app:layout_constraintStart_toEndOf="@+id/ivVip"

baseswago/src/main/res/values-ar/strings.xml

@@ -186,7 +186,6 @@
     <string name="live_time">وقت البث المباشر هذا:</string>
     <string name="live_all_time">إجمالي وقت البث المباشر:</string>
     <string name="watcher_num">إجمالي المشاهدين:</string>
-    <string name="agent">Agent</string>
     <string name="official">Official</string>
     <string name="coin_transfer">金币转账</string>
     <string name="transferor">Transferor</string>

baseswago/src/main/res/values-in/strings.xml

@@ -198,7 +198,6 @@
     <string name="live_time">Durasi live:</string>
     <string name="live_all_time">Durasi total live:</string>
     <string name="watcher_num">Jumlah penonton:</string>
-    <string name="agent">Agent</string>
     <string name="official">Official</string>
     <string name="coin_transfer">金币转账</string>
     <string name="transferor">Transferor</string>

baseswago/src/main/res/values-ms/strings.xml

@@ -197,7 +197,6 @@
     <string name="live_time">Live duration：</string>
     <string name="live_all_time">Total live broadcast time：</string>
     <string name="watcher_num">Total Viewers：</string>
-    <string name="agent">Agent</string>
     <string name="official">Official</string>
     <string name="coin_transfer">金币转账</string>
     <string name="transferor">Transferor</string>

baseswago/src/main/res/values-zh/strings.xml

@@ -186,26 +186,25 @@
     <string name="live_time">直播时长：</string>
     <string name="live_all_time">直播总时长：</string>
     <string name="watcher_num">总计观看人数：</string>
-    <string name="agent">Agent</string>
-    <string name="official">Official</string>
+    <string name="official">官方</string>
     <string name="coin_transfer">金币转账</string>
-    <string name="transferor">Transferor</string>
-    <string name="recently">Recently</string>
-    <string name="please_enter_the_transferor_id">Please enter the transferor ID</string>
-    <string name="name_of_the_transferor">Name of the transferor:</string>
-    <string name="transfer_amount">Transfer amount</string>
-    <string name="please_enter_the_transfer_amount">Please enter the transfer amount</string>
-    <string name="common_amount">Common amount</string>
-    <string name="transfer_notes">Transfer notes</string>
-    <string name="transfer_accounts">Transfer accounts</string>
-    <string name="recent_transfers">Recent transfers</string>
-    <string name="transfer">Transfer</string>
-    <string name="not_less_than_not_more_than">Not less than 100000,not more than 10000000</string>
-    <string name="success">Success</string>
-    <string name="total_transfer_amount">Total transfer amount</string>
+    <string name="transferor">转账对象</string>
+    <string name="recently">近期转账对象</string>
+    <string name="please_enter_the_transferor_id">请输入接收人ID</string>
+    <string name="name_of_the_transferor">接收人昵称:</string>
+    <string name="transfer_amount">转账金额</string>
+    <string name="please_enter_the_transfer_amount">请输入转账金额</string>
+    <string name="common_amount">常用金额</string>
+    <string name="transfer_notes">转账备注</string>
+    <string name="transfer_accounts">转账</string>
+    <string name="recent_transfers">转账对象</string>
+    <string name="transfer">确认转账</string>
+    <string name="not_less_than_not_more_than">不少于100000,不超过10000000</string>
+    <string name="success">成功</string>
+    <string name="total_transfer_amount">转账总金额</string>
     <string name="transfer_success">金币转账成功</string>
-    <string name="remarks_no_more_than_words">Remarks no more than 50 words</string>
-    <string name="coin_transfer_detail">金币转账详情</string>
-    <string name="transfer_time">Transfer time</string>
+    <string name="remarks_no_more_than_words">备注不超过50字</string>
+    <string name="coin_transfer_detail">转账记录</string>
+    <string name="transfer_time">转账时间</string>
     <string name="family_menu">家族长后台</string>
 </resources>

baseswago/src/main/res/values/strings.xml

@@ -216,7 +216,6 @@
     <string name="live_time">Live duration：</string>
     <string name="live_all_time">Total live broadcast time：</string>
     <string name="watcher_num">Total Viewers：</string>
-    <string name="agent">Agent</string>
     <string name="official">Official</string>
     <string name="coin_transfer">金币转账</string>
     <string name="transferor">Transferor</string>

home/src/main/res/layout/fragment_mine.xml

@@ -82,17 +82,12 @@
         app:layout_constraintStart_toEndOf="@+id/tvLevelView"
         tools:visibility="visible" />
 
-    <TextView
+    <ImageView
         android:id="@+id/tvAgent"
-        android:textSize="10dp"
-        android:text="@string/agent"
-        android:textColor="#fff"
-        android:paddingStart="16dp"
-        android:paddingEnd="5dp"
+        android:src="@mipmap/icon_agent"
         android:visibility="gone"
         tools:visibility="visible"
         android:layout_marginStart="5dp"
-        android:background="@mipmap/icon_agent_bg"
         app:layout_constraintBottom_toBottomOf="@+id/tvLevelView"
         app:layout_constraintTop_toTopOf="@+id/tvLevelView"
         app:layout_constraintStart_toEndOf="@+id/ivVip"

home/src/main/res/layout/item_search.xml

@@ -35,17 +35,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <ImageView
         android:id="@+id/tvAgent"
-        android:textSize="10dp"
-        android:text="@string/agent"
-        android:textColor="#fff"
-        android:paddingStart="16dp"
-        android:paddingEnd="5dp"
+        android:src="@mipmap/icon_agent"
         android:visibility="gone"
         tools:visibility="visible"
         android:layout_marginStart="5dp"
-        android:background="@mipmap/icon_agent_bg"
         app:layout_constraintBottom_toBottomOf="@+id/tvLevel"
         app:layout_constraintTop_toTopOf="@+id/tvLevel"
         app:layout_constraintStart_toEndOf="@+id/tvLevel"

room/src/main/res/layout/item_dialog_audience.xml

@@ -48,17 +48,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <ImageView
         android:id="@+id/tvAgent"
-        android:textSize="10dp"
-        android:text="@string/agent"
-        android:textColor="#fff"
-        android:paddingStart="16dp"
-        android:paddingEnd="5dp"
+        android:src="@mipmap/icon_agent"
         android:layout_marginStart="5dp"
         android:visibility="gone"
         tools:visibility="visible"
-        android:background="@mipmap/icon_agent_bg"
         app:layout_constraintBottom_toBottomOf="@+id/tvLevel"
         app:layout_constraintTop_toTopOf="@+id/tvLevel"
         app:layout_constraintStart_toEndOf="@+id/ivBenefit"

room/src/main/res/layout/item_service.xml

@@ -4,16 +4,11 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <TextView
+    <ImageView
         android:id="@+id/tvAgent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:textSize="10dp"
-        android:text="@string/agent"
-        android:textColor="#fff"
-        android:paddingStart="16dp"
-        android:paddingEnd="5dp"
-        android:background="@mipmap/icon_agent_bg"
+        android:src="@mipmap/icon_agent"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 

tuikit/src/main/java/com/tencent/qcloud/tim/uikit/modules/conversation/holder/ConversationCommonHolder.java

@@ -44,7 +44,7 @@ public class ConversationCommonHolder extends ConversationBaseHolder {
     protected TextView unreadText;
     protected TextView atInfoText;
     protected ImageView disturbView;
-    protected TextView tvAgent;
+    protected ImageView tvAgent;
     protected TextView tvOfficial;
 
     public ConversationCommonHolder(View itemView) {

tuikit/src/main/res/layout/conversation_adapter.xml

@@ -44,19 +44,14 @@
                 android:textColor="@color/black_font_color"
                 android:textSize="16.3sp" />
 
-            <TextView
+            <ImageView
                 android:id="@+id/tvAgent"
-                android:textSize="10dp"
-                android:text="@string/agent"
-                android:textColor="#fff"
-                android:paddingStart="16dp"
-                android:paddingEnd="5dp"
+                android:src="@mipmap/icon_agent"
                 android:visibility="gone"
                 tools:visibility="visible"
                 android:layout_marginStart="5dp"
                 android:layout_marginTop="4dp"
                 android:layout_toEndOf="@+id/conversation_title"
-                android:background="@mipmap/icon_agent_bg"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 

user/src/main/res/layout/item_follow_fan.xml

@@ -49,17 +49,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
-    <TextView
+    <ImageView
         android:id="@+id/tvAgent"
-        android:textSize="10dp"
-        android:text="@string/agent"
-        android:textColor="#fff"
-        android:paddingStart="16dp"
-        android:paddingEnd="5dp"
+        android:src="@mipmap/icon_agent"
         android:visibility="gone"
         tools:visibility="visible"
         android:layout_marginStart="5dp"
-        android:background="@mipmap/icon_agent_bg"
         app:layout_constraintBottom_toBottomOf="@+id/tvName"
         app:layout_constraintTop_toTopOf="@+id/tvName"
         app:layout_constraintStart_toEndOf="@+id/tvName"