diff --git a/common/src/main/res/layout/item_comment_video_view.xml b/common/src/main/res/layout/item_comment_video_view.xml index a7bd31295..c8b53433a 100644 --- a/common/src/main/res/layout/item_comment_video_view.xml +++ b/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" /> diff --git a/common/src/main/res/values-zh-rHK/strings.xml b/common/src/main/res/values-zh-rHK/strings.xml index e106620fb..d5173a2f3 100644 --- a/common/src/main/res/values-zh-rHK/strings.xml +++ b/common/src/main/res/values-zh-rHK/strings.xml @@ -1471,7 +1471,7 @@ 取消黑名单 確定刪除圖片? 上传成功 - 删除成功 + 上傳成功 最多添加9張圖片 不感興趣 人覺得很讚 diff --git a/common/src/main/res/values-zh-rTW/strings.xml b/common/src/main/res/values-zh-rTW/strings.xml index c56676737..db249b27a 100644 --- a/common/src/main/res/values-zh-rTW/strings.xml +++ b/common/src/main/res/values-zh-rTW/strings.xml @@ -1471,7 +1471,7 @@ 取消黑名单 確定刪除圖片? 上传成功 - 删除成功 + 上傳成功 最多添加9張圖片 不感興趣 人覺得很讚 diff --git a/common/src/main/res/values-zh/strings.xml b/common/src/main/res/values-zh/strings.xml index 4ece6915d..a1f302679 100644 --- a/common/src/main/res/values-zh/strings.xml +++ b/common/src/main/res/values-zh/strings.xml @@ -1469,7 +1469,7 @@ 取消黑名單 確定刪除圖片? 上传成功 - 删除成功 + 上傳成功 最多添加9張圖片 不感興趣 人覺得很讚 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 50a60c65c..bf25cee73 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1491,7 +1491,7 @@ Limited ride And limited avatar frame 取消黑名单 確定刪除圖片? 上传成功 - 删除成功 + 上傳成功 最多添加9張圖片 不感興趣 人覺得很讚 diff --git a/live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java b/live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java index 3cb4d8540..8066a8c65 100644 --- a/live/src/main/java/com/yunbao/live/adapter/LiveUserAnchorMailBoxAdapter.java +++ b/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; diff --git a/main/src/main/java/com/yunbao/main/dialog/ConversationPopuwWindow.java b/main/src/main/java/com/yunbao/main/dialog/ConversationPopuwWindow.java index ea19f1f98..9a643cc9c 100644 --- a/main/src/main/java/com/yunbao/main/dialog/ConversationPopuwWindow.java +++ b/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, - location[1]-popupHeight); + popupWindow.showAtLocation(view, Gravity.NO_GRAVITY, (location[0] + view.getWidth() / 2) - popupWidth / 2, + location[1] - popupHeight); } @Override @@ -75,7 +75,7 @@ public class ConversationPopuwWindow implements View.OnClickListener { IMCenter.getInstance().removeConversation(conversationType, userId, new RongIMClient.ResultCallback() { @Override public void onSuccess(Boolean aBoolean) { - ToastUtil.show("删除成功"); + ToastUtil.show(mContext.getResources().getString(R.string.del_suc)); } @Override diff --git a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java b/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java index 088b98a30..e22a7a2aa 100644 --- a/main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java +++ b/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() { @Override public void onSuccess(Boolean aBoolean) { - ToastUtil.show("删除成功"); + ToastUtil.show(mContext.getResources().getString(R.string.del_suc)); } @Override