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

普通公屏聊天把之前的限制50个字 修改成 100个字。其他两个个不变

Browse Source
This commit is contained in:
18401019693 2023-11-14 11:31:20 +08:00
parent 04b1764f7b
commit aff5a178a0
5 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config.gradle
View File

@ -5,13 +5,13 @@ ext {
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 33, targetSdkVersion : 33,
versionCode : 453, versionCode : 453,
versionName : "6.6.3" versionName : "6.6.2"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
serverHost : " https://ceshi.yaoulive.com", // serverHost : " https://ceshi.yaoulive.com",

12
live/src/main/java/com/yunbao/live/dialog/LiveInputDialogFragment.java
View File

@ -229,6 +229,10 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
switch (messageType) { switch (messageType) {
case WORLDHORN: case WORLDHORN:
if (trumpetNum > 0) { if (trumpetNum > 0) {
if (content.length()>50){
ToastUtil.show(WordUtil.isNewZh()?"超出字數限制":"Exceed word limit");
return;
}
trumpetMsg = content; trumpetMsg = content;
LiveNetManager.get(getContext()) LiveNetManager.get(getContext())
.nobleUseTrumpet(trumpetMsg, mLiveUid, new HttpCallback<List<BaseModel>>() { .nobleUseTrumpet(trumpetMsg, mLiveUid, new HttpCallback<List<BaseModel>>() {
@ -251,9 +255,17 @@ public class LiveInputDialogFragment extends AbsDialogFragment implements View.O
break; break;
case POPUPSCREEN: case POPUPSCREEN:
if (content.length()>50){
ToastUtil.show(WordUtil.isNewZh()?"超出字數限制":"Exceed word limit");
return;
}
((LiveActivity) mContext).sendDanmuMessage(content); ((LiveActivity) mContext).sendDanmuMessage(content);
break; break;
case GENERALMESSAGE: case GENERALMESSAGE:
if (content.length()>100){
ToastUtil.show(WordUtil.isNewZh()?"超出字數限制":"Exceed word limit");
return;
}
((LiveActivity) mContext).sendChatMessage(content, atTextWatcher.getAtUserID(), atTextWatcher.getAtUserName()); ((LiveActivity) mContext).sendChatMessage(content, atTextWatcher.getAtUserID(), atTextWatcher.getAtUserName());
atTextWatcher.clearMsg(); atTextWatcher.clearMsg();
/* if (imm != null) {//收软键盘 /* if (imm != null) {//收软键盘

1
live/src/main/res/layout/dialog_live_chat_input.xml
View File

@ -102,7 +102,6 @@
android:hint="@string/live_say_something" android:hint="@string/live_say_something"
android:imeActionLabel="@string/send" android:imeActionLabel="@string/send"
android:imeOptions="actionSend" android:imeOptions="actionSend"
android:maxLength="50"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:singleLine="true" android:singleLine="true"

2
live/src/main/res/values-en/strings.xml
View File

@ -46,7 +46,7 @@
<string name="more_than" >No recording has been recognized in over 10 seconds</string> <string name="more_than" >No recording has been recognized in over 10 seconds</string>
<string name="live_role_title" >Identity privilege</string> <string name="live_role_title" >Identity privilege</string>
<string name="noble_seat" >VIP seats</string> <string name="noble_seat" >VIP seats</string>
<string name="live_mic_user_apply" >%s applies for connected wheat. Check whether</string> <string name="live_mic_user_apply" >%s Applies for connected wheat. Check whether</string>
<string name="live_mic_user_down" >The wheat has been kicked off</string> <string name="live_mic_user_down" >The wheat has been kicked off</string>
<string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string> <string name="live_mic_invite" >An invitation has been sent and is waiting for the user to accept</string>
<string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string> <string name="live_mic_request" >The request has been agreed and is awaiting acceptance by the user</string>

72
main/src/main/java/com/yunbao/main/activity/EditProfileActivity.java
View File

@ -128,46 +128,52 @@ public class EditProfileActivity extends AbsActivity {
@Override @Override
public void onSuccess(File file) { public void onSuccess(File file) {
if (file != null) { if (file != null) {
System.err.println("头像---->收到头像文件 file = "+file.getAbsolutePath()+" | length = "+file.length()); System.err.println("头像---->收到头像文件 file = "+file.getAbsolutePath()+" | length = "+file.length());
ImgLoader.display(mContext, file, mAvatar); if (file.getName().contains(".gif")){
MainHttpUtil.updateAvatar(file, new HttpCallback() { ToastUtil.show(WordUtil.isNewZh()?"暫不支持該文件":"This file is not supported");
@Override }else {
public void onSuccess(int code, String msg, String[] info) { ImgLoader.display(mContext, file, mAvatar);
System.err.println("头像---->上传头像文件成功"); MainHttpUtil.updateAvatar(file, new HttpCallback() {
Log.e("updateAvatar", "code:" + code + " msg:" + msg + " info[0]:" + info[0].toString()); @Override
if (code == 0 && info.length > 0) { public void onSuccess(int code, String msg, String[] info) {
ToastUtil.show(R.string.edit_profile_update_avatar_success); System.err.println("头像---->上传头像文件成功");
UserBean bean = CommonAppConfig.getInstance().getUserBean(); Log.e("updateAvatar", "code:" + code + " msg:" + msg + " info[0]:" + info[0].toString());
if (bean != null) { if (code == 0 && info.length > 0) {
JSONObject obj = JSON.parseObject(info[0]); ToastUtil.show(R.string.edit_profile_update_avatar_success);
bean.setAvatar(obj.getString("avatar")); UserBean bean = CommonAppConfig.getInstance().getUserBean();
bean.setAvatarThumb(obj.getString("avatarThumb")); if (bean != null) {
mUserBean.setAvatar(obj.getString("avatar")); JSONObject obj = JSON.parseObject(info[0]);
mUserBean.setAvatarThumb(obj.getString("avatarThumb")); bean.setAvatar(obj.getString("avatar"));
bean.setAvatarThumb(obj.getString("avatarThumb"));
mUserBean.setAvatar(obj.getString("avatar"));
mUserBean.setAvatarThumb(obj.getString("avatarThumb"));
V2TIMUserFullInfo v2TIMUserFullInfo = new V2TIMUserFullInfo(); V2TIMUserFullInfo v2TIMUserFullInfo = new V2TIMUserFullInfo();
v2TIMUserFullInfo.setFaceUrl(obj.getString("avatarThumb")); v2TIMUserFullInfo.setFaceUrl(obj.getString("avatarThumb"));
V2TIMManager.getInstance().setSelfInfo(v2TIMUserFullInfo, new V2TIMCallback() { V2TIMManager.getInstance().setSelfInfo(v2TIMUserFullInfo, new V2TIMCallback() {
@Override @Override
public void onError(int code, String desc) { public void onError(int code, String desc) {
} }
@Override @Override
public void onSuccess() { public void onSuccess() {
} }
}); });
}
EventBus.getDefault().post(new UpdateFieldEvent());
} }
EventBus.getDefault().post(new UpdateFieldEvent());
} }
}
@Override @Override
public void onError(Response<JsonBean> response) { public void onError(Response<JsonBean> response) {
super.onError(response); super.onError(response);
Log.e("updateAvatar", "onFailure"); Log.e("updateAvatar", "onFailure");
} }
}); });
}
} }
} }