Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

common/src/main/res/layout/item_comment_video_view.xml

@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:padding="10dp"
-            android:text="回复"
+            android:text="@string/reply"
             android:textColor="#777777"
             android:textSize="11dp" />
 

common/src/main/res/values-zh-rHK/strings.xml

@@ -1471,7 +1471,7 @@
     <string name="cancel_back">取消黑名单</string>
     <string name="user_home_img_del_dialog">確定刪除圖片？</string>
     <string name="upload_success">上传成功</string>
-    <string name="upload_failed">删除成功</string>
+    <string name="upload_failed">上傳成功</string>
     <string name="_9">最多添加9張圖片</string>
     <string name="not_interested">不感興趣</string>
     <string name="person_like">人覺得很讚</string>

common/src/main/res/values-zh-rTW/strings.xml

@@ -1471,7 +1471,7 @@
     <string name="cancel_back">取消黑名单</string>
     <string name="user_home_img_del_dialog">確定刪除圖片？</string>
     <string name="upload_success">上传成功</string>
-    <string name="upload_failed">删除成功</string>
+    <string name="upload_failed">上傳成功</string>
     <string name="_9">最多添加9張圖片</string>
     <string name="not_interested">不感興趣</string>
     <string name="person_like">人覺得很讚</string>

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

@@ -1469,7 +1469,7 @@
     <string name="cancel_back">取消黑名單</string>
     <string name="user_home_img_del_dialog">確定刪除圖片？</string>
     <string name="upload_success">上传成功</string>
-    <string name="upload_failed">删除成功</string>
+    <string name="upload_failed">上傳成功</string>
     <string name="_9">最多添加9張圖片</string>
     <string name="not_interested">不感興趣</string>
     <string name="person_like">人覺得很讚</string>

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

@@ -1491,7 +1491,7 @@ Limited ride And limited avatar frame</string>
     <string name="cancel_back">取消黑名单</string>
     <string name="user_home_img_del_dialog">確定刪除圖片？</string>
     <string name="upload_success">上传成功</string>
-    <string name="upload_failed">删除成功</string>
+    <string name="upload_failed">上傳成功</string>
     <string name="_9">最多添加9張圖片</string>
     <string name="not_interested">不感興趣</string>
     <string name="person_like">人覺得很讚</string>

live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java

@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Build;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;

main/src/main/java/com/yunbao/main/dialog/ConversationPopuwWindow.java

@@ -60,10 +60,10 @@ public class ConversationPopuwWindow implements View.OnClickListener {
         popupView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
 
         int popupWidth = popupView.getMeasuredWidth();
-        int popupHeight =  popupView.getMeasuredHeight();
+        int popupHeight = popupView.getMeasuredHeight();
 
-        popupWindow.showAtLocation(view, Gravity.NO_GRAVITY, (location[0]+view.getWidth()/2)-popupWidth/2,
+        popupWindow.showAtLocation(view, Gravity.NO_GRAVITY, (location[0] + view.getWidth() / 2) - popupWidth / 2,
-                location[1]-popupHeight);
+                location[1] - popupHeight);
     }
 
     @Override
@@ -75,7 +75,7 @@ public class ConversationPopuwWindow implements View.OnClickListener {
             IMCenter.getInstance().removeConversation(conversationType, userId, new RongIMClient.ResultCallback<Boolean>() {
                 @Override
                 public void onSuccess(Boolean aBoolean) {
-                    ToastUtil.show("删除成功");
+                    ToastUtil.show(mContext.getResources().getString(R.string.del_suc));
                 }
 
                 @Override

main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java

@@ -439,7 +439,7 @@ public class ConversationIMListManager {
         IMCenter.getInstance().removeConversation(Conversation.ConversationType.PRIVATE, userId, new RongIMClient.ResultCallback<Boolean>() {
             @Override
             public void onSuccess(Boolean aBoolean) {
-                ToastUtil.show("删除成功");
+                ToastUtil.show(mContext.getResources().getString(R.string.del_suc));
             }
 
             @Override