From 3e7f1d908968a341a0cbc38540ce2dca159a78e5 Mon Sep 17 00:00:00 2001 From: xuhuixiang Date: Fri, 16 May 2025 16:43:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=80=E4=BA=9B=E4=B9=B1?= =?UTF-8?q?=E4=B8=83=E5=85=AB=E7=B3=9F=E7=9A=84=E4=B8=9C=E8=A5=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hbl/lewan/IMUIKitConfig.java | 23 ++- .../com/hbl/lewan/game/JsBridgeActivity.java | 2 +- .../lewan/imkit/team/TeamSettingActivity.java | 53 +++++- .../java/com/hbl/lewan/main/MainActivity.java | 2 +- .../main/index/add/AddFriendsActivity.java | 4 +- .../hbl/lewan/main/mine/UserInfoActivity.java | 4 +- .../java/com/hbl/lewan/model/LoginBean.java | 2 +- .../lewan/redpack/SendRedPacketActivity.java | 2 + .../res/layout/activity_base_chatsetting.xml | 57 +++++- .../res/layout/activity_head_user_edit.xml | 5 +- .../res/layout/activity_loc_user_info.xml | 5 +- .../layout/activity_team_members_jinyan.xml | 1 + .../res/layout/activity_teamothersetting.xml | 4 +- .../kit/chatkit/ui/ChatMessageType.java | 2 +- .../ui/custom/RedPacketViewHolder.java | 178 ++++++++++-------- .../chatkit/ui/custom/TransferViewHolder.java | 2 + .../fun/factory/FunChatViewHolderFactory.java | 5 + .../ui/fun/view/MessageBottomLayout.java | 30 ++- .../main/res/layout/redpacket_viewhead.xml | 3 +- 19 files changed, 263 insertions(+), 121 deletions(-) diff --git a/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java b/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java index 8fd1da2..71548d9 100644 --- a/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java +++ b/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java @@ -16,17 +16,16 @@ public class IMUIKitConfig { public static String LOC_COUNTRY_CODE = "loc_country_code"; - public static String RBCHAT_PRIVACY_CN_URL = "https://download.bijr3t.com/userAgreement.html?v=" + System.currentTimeMillis(); - public static String RBCHAT_SERVICE_CN_URL = "https://download.bijr3t.com/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议 + public static String RBCHAT_PRIVACY_CN_URL = "http://download.bijr3t.com/userAgreement.html?v=" + System.currentTimeMillis(); + public static String RBCHAT_SERVICE_CN_URL = "http://download.bijr3t.com/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议 - public static String MIANMI_AGREEMENT_CN_URL = "https://download.bijr3t.com/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议 + public static String MIANMI_AGREEMENT_CN_URL = "http://download.bijr3t.com/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议 public static String SUBSTATIONID = ApiService.SUBSTATIONID; public static int MOMENTS_SOURCE_TIME = 1000 * 60; - // public static String AVATAR_DOWNLOAD_CONTROLLER_URL_ROOT = ApiService.URL + "static/avatar/%s"; - // public static String AVATAR_DOWNLOAD_CONTROLLER_URL_ROOT = "http://192.168.110.233:8000/"+"static/avatar/%s"; + // public static String AVATAR_DOWNLOAD_CONTROLLER_URL_ROOT = ApiService.URL + "static/avatar/%s"; // public static String AVATAR_DOWNLOAD_CONTROLLER_URL_ROOT = "http://192.168.110.233:8000/"+"static/avatar/%s"; public static int PUSH_CIR_SUCC = 567; @@ -36,19 +35,19 @@ public class IMUIKitConfig { /** * 支付地址 */ - public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://admin.bijr3t.com/#/appPay" : "https://admin-test.bijr3t.com/#/appPay"; -// public static String ONLINE_PAYMENT_URL = "https://admin.bijr3t.com/#/appPay"; + public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "http://admin.bijr3t.com/#/appPay" : "https://admin-test.bijr3t.com/#/appPay"; +// public static String ONLINE_PAYMENT_URL = "http://admin.bijr3t.com/#/appPay"; /** * 分享落地页二维码地址 */ // public static String SHARE_INVCODE = "http://qtalk666.top/#/download?code=%s"; - public static String SHARE_INVCODE = "https://admin.bijr3t.com/#/downLoad?code=%s&userId=%s"; - public static String SHARE_INVCODEGROUP = "https://admin.bijr3t.com/#/downLoad?code=%s&teamId=%s"; - public static String SHARE_INVCODEGROUP1 = "https://admin.bijr3t.com/#/downLoad?teamId=%s"; + public static String SHARE_INVCODE = "http://admin.bijr3t.com/#/downLoad?code=%s&userId=%s"; + public static String SHARE_INVCODEGROUP = "http://admin.bijr3t.com/#/downLoad?code=%s&teamId=%s"; + public static String SHARE_INVCODEGROUP1 = "http://admin.bijr3t.com/#/downLoad?teamId=%s"; - public static String SHARE_INVCODE1 = "https://admin.bijr3t.com/#/downLoad?userId=%s"; - public static String SHARE_INVCODE_START = "https://admin.bijr3t.com/#/downLoad"; + public static String SHARE_INVCODE1 = "http://admin.bijr3t.com/#/downLoad?userId=%s"; + public static String SHARE_INVCODE_START = "http://admin.bijr3t.com/#/downLoad"; /*** * 分享用户ID 二维码 diff --git a/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java b/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java index fff8c4e..565af2d 100644 --- a/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java +++ b/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java @@ -1651,7 +1651,7 @@ public class JsBridgeActivity extends BaseActivity { //{"scheme":"time_go_mm://payment_bead/","userId":"10","value":"388a762b474f944b"} String scheme = qrData.getScheme(); if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } } diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java index 28e2bfe..e6bb6e6 100644 --- a/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java +++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamSettingActivity.java @@ -32,18 +32,22 @@ import com.hbl.lewan.utils.LogUtils; import com.hbl.lewan.widget.CircleImageView; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.RequestCallback; +import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.attachment.FileAttachment; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.MsgSearchOption; +import com.netease.nimlib.sdk.team.TeamService; +import com.netease.nimlib.sdk.team.constant.TeamAllMuteModeEnum; import com.netease.nimlib.sdk.team.constant.TeamMemberType; import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.netease.yunxin.kit.chatkit.model.IMMessageInfo; import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam; +import com.netease.yunxin.kit.chatkit.repo.TeamRepo; import com.netease.yunxin.kit.chatkit.ui.ChatKitUIConstant; import com.netease.yunxin.kit.chatkit.ui.model.CleanHistoryEvent; import com.netease.yunxin.kit.chatkit.ui.model.TeamExtensionBean; @@ -389,6 +393,8 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity { if(teamMember.getType() == TeamMemberType.Owner||teamMember.getType() == TeamMemberType.Manager){ binding.fljinyan.setVisibility(View.VISIBLE); binding.flhbkz.setVisibility(View.VISIBLE); + binding.qyjyLy.setVisibility(View.VISIBLE); + jinyanLuoji(); }else { binding.fljinyan.setVisibility(View.GONE); binding.flhbkz.setVisibility(View.GONE); @@ -396,11 +402,48 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity { } } -// public void setExtension() { -// Map fieldMap = new HashMap<>(); -// fieldMap.put(TeamFieldEnum.Extension, "1"); -// NIMClient.getService(TeamService.class).updateTeamFields(teamId, fieldMap); -// } + private void jinyanLuoji() { +// NIMClient.getService(TeamService.class).muteTeam(teamId,).setCallback(new RequestCallback() { +// @Override +// public void onSuccess(Void param) { +// // 解散群成功 +// } +// @Override +// public void onFailed(int code) { +// // 解散群失败 +// } +// @Override +// public void onException(Throwable exception) { +// // 错误 +// } +// }); + +// NIMClient.getService(GroupS.class). + +// binding.qyjySwitch.setChecked(); + + getMute(); + + binding.qyjySwitch.setOnClickListener(v -> NIMClient.getService(TeamService.class).muteAllTeamMember(teamId,binding.qyjySwitch.isChecked()).setCallback(new RequestCallbackWrapper() { + @Override + public void onResult(int code, Void result, Throwable exception) { + getMute(); + } + })); + } + + private void getMute() { + + NIMClient.getService(TeamService.class).searchTeam(teamId).setCallback(new RequestCallbackWrapper<>() { + @Override + public void onResult(int code, Team result, Throwable exception) { + LogUtils.i("群禁言类型："+result.getMuteMode()); + + binding.qyjySwitch.setChecked(result.isAllMute()); + } + }); + } + public void setNotifyUI(boolean isOpen) { if (isOpen) { diff --git a/app/src/main/java/com/hbl/lewan/main/MainActivity.java b/app/src/main/java/com/hbl/lewan/main/MainActivity.java index 9a8bc7b..eed6d1e 100644 --- a/app/src/main/java/com/hbl/lewan/main/MainActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/MainActivity.java @@ -994,7 +994,7 @@ public class MainActivity extends BaseActivity { break; default: if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent)); diff --git a/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java b/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java index 0f5f9ed..1be30f7 100644 --- a/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java @@ -593,7 +593,7 @@ public class AddFriendsActivity extends LllChatBaseActivity { default: if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { Intent intentweb = new Intent(Intent.ACTION_VIEW); @@ -612,7 +612,7 @@ public class AddFriendsActivity extends LllChatBaseActivity { } } else { if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true)); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java index 910efec..409ff34 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java @@ -379,7 +379,7 @@ public class UserInfoActivity extends BaseActivity { // break; default: if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true)); @@ -397,7 +397,7 @@ public class UserInfoActivity extends BaseActivity { } } else { if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("http://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true)); diff --git a/app/src/main/java/com/hbl/lewan/model/LoginBean.java b/app/src/main/java/com/hbl/lewan/model/LoginBean.java index 9bf03e7..c39167e 100644 --- a/app/src/main/java/com/hbl/lewan/model/LoginBean.java +++ b/app/src/main/java/com/hbl/lewan/model/LoginBean.java @@ -220,7 +220,7 @@ public class LoginBean extends RosterElementEntity { public Integer getAddFriendNeedVerify() { if(addFriendNeedVerify == null){ - return 0; + return 1; } return addFriendNeedVerify; } diff --git a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java index 739de53..027a1fe 100644 --- a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java +++ b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java @@ -981,6 +981,8 @@ public class SendRedPacketActivity extends BaseActivity { getString(com.netease.yunxin.kit.chatkit.ui.R.string.hongbao_chat_txt), customerAttachment); LogUtils.i("发送消息结构体：" + GsonUtils.beanToJSONString(customerAttachment)); + LogUtils.i("发送消息结构体：" + GsonUtils.beanToJSONString(customMessage)); + if (customMessage != null) { ChatRepo.sendMessage(customMessage, false, new FetchCallback() { @Override diff --git a/app/src/main/res/layout/activity_base_chatsetting.xml b/app/src/main/res/layout/activity_base_chatsetting.xml index 842c296..a9e2abd 100644 --- a/app/src/main/res/layout/activity_base_chatsetting.xml +++ b/app/src/main/res/layout/activity_base_chatsetting.xml @@ -130,6 +130,7 @@ android:layout_marginStart="@dimen/dp_15" android:layout_marginTop="@dimen/dp_20" android:layout_marginEnd="@dimen/dp_15" + android:layout_marginBottom="@dimen/dp_10" app:layout_constraintTop_toBottomOf="@+id/lineteamsetting"> @@ -178,17 +179,69 @@ android:visibility="gone" /> + + + + + + + + + + app:layout_constraintTop_toBottomOf="@+id/qyjy_ly"> diff --git a/app/src/main/res/layout/activity_loc_user_info.xml b/app/src/main/res/layout/activity_loc_user_info.xml index 5cc0d59..80b0abc 100644 --- a/app/src/main/res/layout/activity_loc_user_info.xml +++ b/app/src/main/res/layout/activity_loc_user_info.xml @@ -29,15 +29,14 @@ diff --git a/app/src/main/res/layout/activity_team_members_jinyan.xml b/app/src/main/res/layout/activity_team_members_jinyan.xml index 7b6c106..9d77d54 100644 --- a/app/src/main/res/layout/activity_team_members_jinyan.xml +++ b/app/src/main/res/layout/activity_team_members_jinyan.xml @@ -24,6 +24,7 @@ android:layout_height="wrap_content" app:titleTextColor="@color/color_333333" /> + onCameraClick()); // mBinding.inputAudioRb.setOnClickListener(v -> switchRecord()); // mBinding.inputAudio2Rb.setOnClickListener(v -> switchRecord()); - mBinding.inputRightLayout.setOnClickListener(v -> { - if (mBinding.inputAudio2Rb.getVisibility() == VISIBLE) { - switchRecord2(); - } else { - sendText(replyMessage); - } - } - ); +// mBinding.inputRightLayout.setOnClickListener(v -> { +// if (mBinding.inputAudio2Rb.getVisibility() == VISIBLE) { +// switchRecord2(); +// } else { +// sendText(replyMessage); +// } +// } +// ); + mBinding.inputAudio2Rb.setOnClickListener(v -> { + switchRecord2(); + }); + mBinding.emojiFsongTv.setOnClickListener(v -> { + sendText(replyMessage); + }); mBinding.layoutaudiostatus.setOnClickListener(view -> updateAudioStatus());//开始录音 mBinding.ivaudiodelete.setOnClickListener(view -> deleteRecord()); mBinding.ivaudiosend.setOnClickListener(view -> sendRecord()); @@ -1019,6 +1025,14 @@ public class MessageBottomLayout extends FrameLayout mBinding.inputEmojiRb.setAlpha(mute ? 0.5f : 1f); mBinding.inputMoreRb.setEnabled(!mute); mBinding.inputMoreRb.setAlpha(mute ? 0.5f : 1f); + + + mBinding.inputCameraRb.setEnabled(!mute); + mBinding.inputCameraRb.setAlpha(mute ? 0.5f : 1f); + mBinding.inputAlbumRb.setEnabled(!mute); + mBinding.inputAlbumRb.setAlpha(mute ? 0.5f : 1f); + mBinding.inputAudio2Rb.setEnabled(!mute); + mBinding.inputAudio2Rb.setAlpha(mute ? 0.5f : 1f); } } diff --git a/chatkit-ui/src/main/res/layout/redpacket_viewhead.xml b/chatkit-ui/src/main/res/layout/redpacket_viewhead.xml index 58026d2..b7b5666 100644 --- a/chatkit-ui/src/main/res/layout/redpacket_viewhead.xml +++ b/chatkit-ui/src/main/res/layout/redpacket_viewhead.xml @@ -51,8 +51,9 @@ android:ellipsize="end" android:gravity="center_vertical" android:lines="1" + android:textStyle="bold" android:textColor="#FEE391" - android:textSize="12sp" /> + android:textSize="16sp" />