yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复测试反馈问题

Browse Source
This commit is contained in:
zlzw
2023-10-27 18:30:29 +08:00
parent e00df4d8e5
commit a8462b385a
5 changed files with 97 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/ChatMessageFragment.java
View File

@@ -51,6 +51,7 @@ import com.yunbao.common.http.base.HttpCallback;
import com.yunbao.common.interfaces.ImageResultCallback;
import com.yunbao.common.interfaces.OnItemClickListener;
import com.yunbao.common.manager.IMLoginManager;
import com.yunbao.common.utils.AppManager;
import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.ProcessImageUtil;
import com.yunbao.common.utils.StringUtil;
@@ -304,6 +305,8 @@ public class ChatMessageFragment extends AbsConversationFragment {
super.onError(status, msg);
if(status==1) {
sendAuthRequest();
}else if(!StringUtil.isEmpty(msg)){
ToastUtil.show(msg);
}
}
});
@@ -353,6 +356,8 @@ public class ChatMessageFragment extends AbsConversationFragment {
super.onError(status, msg);
if(status==1) {
sendAuthRequest();
}else if(!StringUtil.isEmpty(msg)){
ToastUtil.show(msg);
}
}
});
@@ -405,12 +410,12 @@ public class ChatMessageFragment extends AbsConversationFragment {
.getTargetUserInfo(Integer.parseInt(targetId), new HttpCallback<UserBean>() {
@Override
public void onSuccess(UserBean data) {
/* if (data.getInfo().getName_auth() == 2) {
if (data.getInfo().getName_auth() == 2) {
listener.onSuccess("", null);
} else {
listener.onError(data.getInfo().getName_auth(), "");
}*/
listener.onSuccess("", null);
} else if(data.getInfo().getName_auth() == 3){
listener.onError(data.getInfo().getName_auth(), "當前正在審核中，請耐心等待");
}
// listener.onSuccess("", null);
}
@Override

9
OneToOne/src/main/java/com/shayu/onetoone/activity/fragments/message/MsgMessageFragment.java
View File

@@ -146,7 +146,9 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
BaseUiConversation conversation = mAdapter.getData().get(swipeRunnable.adapterPosition);
if (swipeRunnable.menuPosition == 0) {
topItem(conversation, swipeRunnable.adapterPosition);
top.setText(R.string.untop);
} else {
top.setText(R.string.top);
removeItem(conversation, swipeRunnable.adapterPosition);
}
swipeRunnable = null;
@@ -502,11 +504,12 @@ public class MsgMessageFragment extends BaseFragment implements BaseAdapter.OnIt
return false;
}
SwipeMenuItem top=null;
SwipeMenuItem del=null;
private SwipeMenuCreator initSwipeMenuCreator() {
SwipeMenuCreator creator = (leftMenu, rightMenu, position) -> {
SwipeMenuItem top = new SwipeMenuItem(getContext());
SwipeMenuItem del = new SwipeMenuItem(getContext());
top = new SwipeMenuItem(getContext());
del = new SwipeMenuItem(getContext());
top.setBackgroundColor(Color.parseColor("#D9D9D9"));
del.setBackgroundColor(Color.parseColor("#FE5268"));
top.setText(R.string.top);

1
OneToOne/src/main/res/values-zh-rHK/strings.xml
View File

@@ -50,6 +50,7 @@
<string name="copy">複製</string>
<string name="delete">刪除</string>
<string name="top">置頂</string>
<string name="untop">取消置頂</string>
<string name="copy_success">複製成功</string>
<string name="upload_in_progress">上傳中</string>
<string name="upload_success">上傳成功</string>

1
OneToOne/src/main/res/values-zh-rTW/strings.xml
View File

@@ -50,6 +50,7 @@
<string name="copy">複製</string>
<string name="delete">刪除</string>
<string name="top">置頂</string>
<string name="untop">取消置頂</string>
<string name="copy_success">複製成功</string>
<string name="upload_in_progress">上傳中</string>
<string name="upload_success">上傳成功</string>

157
OneToOne/src/main/res/values/strings.xml
View File

@@ -32,7 +32,7 @@
<string name="diamond_exchange_immediate_exchange">立即兌換</string>
<string name="diamond_exchange_full_conversion">全額兌換</string>
<string name="choose_img_max">最多选&#160;%1$s&#160;张图片哦</string>
<string name="choose_img_max">最多選&#160;%1$s&#160;張圖片哦</string>
<string name="view_friend_empty_text">friend empty</string>
<string name="not_money">餘額不足</string>
@@ -40,37 +40,38 @@
<string name="not_money_video_tips">與TA視頻聊天每分鐘續消耗%s星幣您可通過充值獲取更多星幣以便繼續聊天</string>
<string name="not_money_audio_tips">與TA语音聊天每分鐘續消耗%s星幣您可通過充值獲取更多星幣以便繼續聊天</string>
<string name="not_money_audio_tips">與TA語音聊天每分鐘續消耗%s星幣您可通過充值獲取更多星幣以便繼續聊天</string>
<string name="not_money_text_tips">聊天每條續消耗%s鑽，您可通過充值獲取更多星幣以便繼續聊天</string>
<string name="dialog_cancel_tip">離開</string>
<string name="dialog_to_money_tip">去充值</string>
<string name="chat_video_tips">发起视频通话\n%s钻/分钟</string>
<string name="chat_audio_tips">发起语音通话\n%s钻/分钟</string>
<string name="album">相册</string>
<string name="chat_video_tips">發起視頻通話\n%s鑽/分鐘</string>
<string name="chat_audio_tips">發起語音通話\n%s鑽/分鐘</string>
<string name="album">相冊</string>
<string name="camera">拍照</string>
<string name="photo_info">图片信息</string>
<string name="copy">复制</string>
<string name="delete">删除</string>
<string name="top">置顶</string>
<string name="copy_success">复制成功</string>
<string name="upload_in_progress">上传中</string>
<string name="upload_success">上传成功</string>
<string name="upload_failed">上传失败</string>
<string name="photo_info">圖片信息</string>
<string name="copy">複製</string>
<string name="delete">刪除</string>
<string name="top">置頂</string>
<string name="untop">取消置頂</string>
<string name="copy_success">複製成功</string>
<string name="upload_in_progress">上傳中</string>
<string name="upload_success">上傳成功</string>
<string name="upload_failed">上傳失敗</string>
<string name="year">年</string>
<string name="month">月</string>
<string name="day">日</string>
<string name="birthday">生日</string>
<string name="complete">完成</string>
<string name="complete2">完成</string>
<string name="nickname_hint">请填写昵称</string>
<string name="gender_hint">请选择性别</string>
<string name="permission_hint">请允许悬浮窗权限才能进行小窗</string>
<string name="permission_setting">设置</string>
<string name="nickname_hint">請填寫昵稱</string>
<string name="gender_hint">請選擇性別</string>
<string name="permission_hint">請允許懸浮窗權限才能進行小窗</string>
<string name="permission_setting">設置</string>
<string name="permission_cancel">取消</string>
<string name="call_time">通话时长:</string>
<string name="call_tips">通话将在%s秒后断\n开，请及时充值</string>
<string name="dialog_normal_title">首次匹配成功奖励</string>
<string name="dialog_normal_content">恭喜获得</string>
<string name="call_time">通話時長:</string>
<string name="call_tips">通話將在%s秒后斷\n開，請及時充值</string>
<string name="dialog_normal_title">首次匹配成功獎勵</string>
<string name="dialog_normal_content">恭喜獲得</string>
<string name="title_greet_config">打招呼設置</string>
<string name="title_audit_config">審核中，請耐心等待</string>
<string name="title_audit_config2">已發起審核，請耐心等待審核結果</string>
@@ -82,69 +83,69 @@
<string name="resubmit">重新提交</string>
<string name="upload_enter_title">上傳入駐資料</string>
<string name="user_authentication">達人認證</string>
<string name="query">查询中</string>
<string name="query">查詢中</string>
<string name="to_upload">去上傳</string>
<string name="search_empty">請輸入內容</string>
<string name="matching_quit_title">確定要退出靈魂速配嗎？</string>
<string name="matching_quit_cancel">繼續匹配</string>
<string name="matching_quit_apply">徹底離開</string>
<string name="matching_wait_title">当前等待时间较长，建议您先去观看动态哦，稍后再来哦~</string>
<string name="matching_wait_title">當前等待時間較長，建議您先去觀看動態哦，稍後再來哦~</string>
<string name="matching_wait_cancel">繼續匹配</string>
<string name="matching_wait_apply">去看动态</string>
<string name="money_title">余额不足，请充值后再进行尝试吧~</string>
<string name="matching_wait_apply">去看動態</string>
<string name="money_title">餘額不足，請充值后再進行嘗試吧~</string>
<string name="money_cancel">取消</string>
<string name="money_apply">前往充值</string>
<string name="gift">[禮物]</string>
<string name="authentication">[邀請認證]</string>
<string name="call_tips1">等待对方接受邀请…</string>
<string name="call_tips2">连接成功</string>
<string name="permission_request_title">需要获取您的权限</string>
<string name="call_tips1">等待對方接受邀請…</string>
<string name="call_tips2">連接成功</string>
<string name="permission_request_title">需要獲取您的權限</string>
<string name="request_authentication_tips1">邀請對方完成真人認證，開通通話權限</string>
<string name="request_authentication_tips2">待开通</string>
<string name="request_authentication_tips2">待開通</string>
<string name="request_authentication_tips3">對方邀請您完成真人認證，開通通話權限</string>
<string name="request_authentication_tips4">去开通</string>
<string name="gift_send_ta">送给TA</string>
<string name="gift_send_you">送给你</string>
<string name="dialog_apply">确定</string>
<string name="request_authentication_tips4">去開通</string>
<string name="gift_send_ta">送給TA</string>
<string name="gift_send_you">送給你</string>
<string name="dialog_apply">確定</string>
<string name="layout_auth_tips1">真人說明</string>
<string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
<string name="layout_auth_tips3">身份證正面</string>
<string name="layout_auth_tips4">身份證背面</string>
<string name="layout_auth_tips5">發起審核</string>
<string name="layout_auth_blogger_tips1">带*为必填项,為保障您的利益，請如實填寫</string>
<string name="layout_auth_blogger_tips2">性别</string>
<string name="layout_auth_blogger_tips1">帶*為必填項,為保障您的利益，請如實填寫</string>
<string name="layout_auth_blogger_tips2">性別</string>
<string name="layout_auth_blogger_tips3">男</string>
<string name="layout_auth_blogger_tips4">女</string>
<string name="layout_auth_blogger_tips5">真实姓名</string>
<string name="layout_auth_blogger_tips5">真實姓名</string>
<string name="layout_auth_blogger_tips6">請填寫您的真實姓名</string>
<string name="layout_auth_blogger_tips7">手机号码</string>
<string name="layout_auth_blogger_tips8">請填寫您的手机号码</string>
<string name="layout_auth_blogger_tips9">身份证号码</string>
<string name="layout_auth_blogger_tips10">請填寫您的身份证号码</string>
<string name="layout_auth_blogger_tips11">上传手持证件照</string>
<string name="layout_auth_blogger_tips12">請將证件頭像朝向前方</string>
<string name="layout_auth_blogger_tips7">手機號碼</string>
<string name="layout_auth_blogger_tips8">請填寫您的手機號碼</string>
<string name="layout_auth_blogger_tips9">身份證號碼</string>
<string name="layout_auth_blogger_tips10">請填寫您的身份證號碼</string>
<string name="layout_auth_blogger_tips11">上傳手持證件照</string>
<string name="layout_auth_blogger_tips12">請將證件頭像朝向前方</string>
<string name="layout_auth_blogger_tips13">參考圖</string>
<string name="layout_auth_blogger_tips14">上傳背景圖片</string>
<string name="layout_auth_blogger_tips15">發起審核</string>
<string name="layout_auth_blogger_inlet_tips1">真人說明</string>
<string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送并提高聊天，收禮的收益比例</string>
<string name="layout_auth_blogger_inlet_tips2">請上傳您的身份證正反面完成真人認證，完成認證可獲得跟多消息推送並提高聊天，收禮的收益比例</string>
<string name="layout_auth_blogger_inlet_tips3">條件一：完後真人認證 </string>
<string name="layout_auth_blogger_inlet_tips4">已完成</string>
<string name="layout_auth_blogger_inlet_tips5">條件二：上傳入駐資料 </string>
<string name="layout_auth_blogger_inlet_tips6">已完成</string>
<string name="layout_choose_label_tip1">跳过</string>
<string name="layout_choose_label_tip2">我的标签</string>
<string name="layout_choose_label_tip3">暂无标签</string>
<string name="layout_choose_label_tip1">跳過</string>
<string name="layout_choose_label_tip2">我的標籤</string>
<string name="layout_choose_label_tip3">暫無標籤</string>
<string name="layout_choose_label_tip4">完成</string>
<string name="layout_complete_tip1">完善个人信息</string>
<string name="layout_complete_tip2">去选择</string>
<string name="layout_complete_tip3">昵称</string>
<string name="layout_complete_tip4">性别</string>
<string name="layout_complete_tip1">完善個人信息</string>
<string name="layout_complete_tip2">去選擇</string>
<string name="layout_complete_tip3">昵稱</string>
<string name="layout_complete_tip4">性別</string>
<string name="layout_complete_tip5">女</string>
<string name="layout_complete_tip6">男</string>
<string name="layout_complete_tip7">生日</string>
@@ -162,34 +163,34 @@
<string name="layout_edit_profile_tip8">真人認證</string>
<string name="layout_edit_profile_tip9">興趣</string>
<string name="layout_find_pwd_tip1">忘记密码</string>
<string name="layout_find_pwd_tip1">忘記密碼</string>
<string name="layout_login_tip1">用户登录</string>
<string name="layout_login_tip1">用戶登錄</string>
<string name="layout_main_list_tip1">魅力榜</string>
<string name="layout_main_list_tip2">财富榜</string>
<string name="layout_main_list_tip2">財富榜</string>
<string name="layout_matching_tip1">正在热聊中</string>
<string name="layout_matching_tip1">正在熱聊中</string>
<string name="layout_matching_tip2">匹配中…</string>
<string name="layout_matching_tip3">TA還在練習見面開場白，再給TA點時間吧~</string>
<string name="layout_matching_tip4">灵魂速配</string>
<string name="layout_matching_tip4">靈魂速配</string>
<string name="layout_msg_message_tip1">聯繫客服</string>
<string name="layout_register_tip1">用户注册</string>
<string name="layout_register_tip1">用戶註冊</string>
<string name="layout_screen_tip1">年龄</string>
<string name="layout_screen_tip1">年齡</string>
<string name="layout_screen_tip2">全部</string>
<string name="layout_screen_tip3">40以上</string>
<string name="layout_screen_tip4">性别</string>
<string name="layout_screen_tip4">性別</string>
<string name="layout_screen_tip5">男</string>
<string name="layout_screen_tip6">女</string>
<string name="layout_screen_tip7">是否完成真人认证</string>
<string name="layout_screen_tip7">是否完成真人認證</string>
<string name="layout_screen_tip8">已完成</string>
<string name="layout_screen_tip9">未完成</string>
<string name="layout_screen_tip10">确定</string>
<string name="layout_screen_tip10">確定</string>
<string name="layout_search_tip1">猜你喜欢</string>
<string name="layout_search_tip1">猜你喜歡</string>
<string name="layout_setting_tip1">個人設定</string>
<string name="layout_setting_tip2">修改密碼</string>
@@ -205,47 +206,47 @@
<string name="layout_setting_tip12">檢查新版本</string>
<string name="layout_setting_tip13">退出</string>
<string name="layout_choose_label_adapter_tip1">我的标签</string>
<string name="layout_choose_label_adapter_tip1">我的標籤</string>
<string name="layout_item_tag">活泼</string>
<string name="layout_item_tag">活潑</string>
<string name="layout_bottom_list_tips1">取消</string>
<string name="layout_bend_call_tips1">关注</string>
<string name="layout_bend_call_tips2">此次通话结束了快开启\n下一次通话吧</string>
<string name="layout_bend_call_tips3">再次通话</string>
<string name="layout_bend_call_tips1">關注</string>
<string name="layout_bend_call_tips2">此次通話結束了快開啟\n下一次通話吧</string>
<string name="layout_bend_call_tips3">再次通話</string>
<string name="layout_bend_call_tips4">去充值</string>
<string name="layout_msg_more_tips1">打招呼设置</string>
<string name="layout_msg_more_tips2">一键已读</string>
<string name="layout_msg_more_tips1">打招呼設置</string>
<string name="layout_msg_more_tips2">一鍵已讀</string>
<string name="layout_friends_tips1">推荐</string>
<string name="layout_friends_tips2">热门</string>
<string name="layout_friends_tips1">推薦</string>
<string name="layout_friends_tips2">熱門</string>
<string name="layout_home_ranking_tips1">关注</string>
<string name="layout_home_ranking_tips1">關注</string>
<string name="layout_f_msg_tips1">消息</string>
<string name="layout_f_msg_tips2">好友</string>
<string name="layout_f_my_tips1">用戶名稱</string>
<string name="layout_f_my_tips2">这个人很懒，什么也没留下。</string>
<string name="layout_f_my_tips2">這個人很懶，什麼也沒留下。</string>
<string name="layout_i_greet_config_tips1">请输入文案</string>
<string name="layout_i_greet_config_tips1">請輸入文案</string>
<string name="layout_i_sys_msg_tips1">點擊查看</string>
<string name="layout_call_input_tips1">輸入信息</string>
<string name="layout_f_system_tips1">聯繫客服</string>
<string name="layout_v_empty_list_tips1">没有找到匹配结果~</string>
<string name="layout_v_empty_list_tips1">沒有找到匹配結果~</string>
<string name="layout_d_msg_chat_auth_tips1">對方邀請您完成真人認證，開通通話權限</string>
<string name="layout_d_msg_chat_auth_tips2">去开通</string>
<string name="layout_d_msg_chat_auth_tips2">去開通</string>
<string name="layout_d_msg_gift_tips1">送給你</string>
<string name="layout_d_send_gift_tips1">充值</string>
<string name="layout_d_msg_bar_tips1">查看主页</string>
<string name="layout_d_msg_bar_tips1">查看主頁</string>
<string name="layout_v_greet_config_add_tips1">添加更多</string>
<string name="layout_v_custom_tips1">保存</string>
@@ -265,5 +266,5 @@
<string name="dialog_call_prop_apply">收下獎勵</string>
<string name="toast_call_not_unlock">發送任意禮物后即可解鎖</string>
<string name="gift_not_money">余额不足，请充值后再进行尝试吧~</string>
<string name="gift_not_money">餘額不足，請充值后再進行嘗試吧~</string>
</resources>