diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 0b2d177..cd03eb4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -47,12 +47,12 @@ android { applicationId = "com.dskj.rbchat" minSdk = 24 targetSdk = 34 - versionCode = 202 - versionName = "2.0.2" + versionCode = 203 + versionName = "2.0.3" multiDexEnabled = true testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 -// manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //测试 +// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 + manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" //测试 manifestPlaceholders["JPUSH_PKGNAME"] = "com.dskj.rbchat" manifestPlaceholders["JPUSH_APPKEY"] = "9041bc22de91e3d9af3cfd23" @@ -101,8 +101,8 @@ android { "\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\"" ) //正式服 - manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 - // manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" +// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" //正式 + manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" } @@ -126,8 +126,8 @@ android { "\"AIzaSyB7P1o1EIA02eWoNP_7QJ9XwWe3WkSZb9k\"" ) //测试APPKEY -// manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" - manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" + manifestPlaceholders["IMAPPKEY"] = "4cb6b0998f9e7af9d7673963e429959a" +// manifestPlaceholders["IMAPPKEY"] = "c38c8bbebf7d12992d2a361bfceb6c6f" } diff --git a/app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java b/app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java index b976321..41201b9 100644 --- a/app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java +++ b/app/src/main/java/com/dskj/rbchat/contact/UserInfoActivity.java @@ -1009,7 +1009,7 @@ public class UserInfoActivity extends BaseActivity { .skipMemoryCache(false) .diskCacheStrategy(DiskCacheStrategy.RESOURCE); try { - +// LogUtils.i("头像地址:"+u.getUserAvatarFileName()); Glide.with(UserInfoActivity.this) .load(u.getUserAvatarFileName()) diff --git a/app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java b/app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java index 305e814..36eea64 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java +++ b/app/src/main/java/com/dskj/rbchat/imkit/selector/FunContactSelectorActivity.java @@ -105,11 +105,24 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity { public void updateView() { super.updateView(); if (type == 1) { //转发 这ui 修改的.... + shoeSignOne(true); + + } + } + + private void shoeSignOne(boolean b) { + if (b) { rvSelected.setVisibility(View.GONE); updateListView(contactListView); updateListView(lastContactView); updateListView(loveContactView); updateListView(searchContactView); + } else { + rvSelected.setVisibility(View.VISIBLE); + updateListView1(contactListView); + updateListView1(lastContactView); + updateListView1(loveContactView); + updateListView1(searchContactView); } } @@ -120,6 +133,12 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity { contactListView.setLayoutParams(params1); } + public void updateListView1(ContactListView contactListView) { + contactListView.showSelector(true); + LinearLayout.LayoutParams params1 = (LinearLayout.LayoutParams) contactListView.getLayoutParams(); + params1.setMarginStart(SizeUtils.dp2px(15)); + contactListView.setLayoutParams(params1); + } public void setViewHolderFactory(ContactListView contactView) { contactView .getDecoration() @@ -212,23 +231,43 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity { } protected void configTitle(BackTitleBar titleBar) { - if (type == 1) { - titleBar - .setOnBackIconClickListener(v -> onBackPressed()) - .setTitle(R.string.select); - } else { +// if (type == 1) { +// titleBar +// .setOnBackIconClickListener(v -> onBackPressed()) +// .setTitle(R.string.select); +// } else { titleBar .setOnBackIconClickListener(v -> onBackPressed()) .setTitle(R.string.select) - .setActionText(R.string.selector_sure_without_num) + .setActionText(type==1?getString(com.dskj.rbchat.R.string.chat_message_action_multi_select):getString(R.string.selector_sure_without_num)) .setActionTextColor(getResources().getColor(R.color.color_6877fe)) .setActionListener( v -> { + if(type==1&&isSignOne){ + isSignOne = false; + shoeSignOne(false); + + int verticalPadding = SizeUtils.dp2px(5); + int horizontalPadding = SizeUtils.dp2px(10); + int endPadding = SizeUtils.dp2px(5); + TextView rightTextView = titleBar.getRightTextView(); + rightTextView.setText(getString(R.string.selector_sure_without_num)); + FrameLayout.LayoutParams layoutParams = + (FrameLayout.LayoutParams) rightTextView.getLayoutParams(); + layoutParams.rightMargin = SizeUtils.dp2px(endPadding); + rightTextView.setPadding( + horizontalPadding, verticalPadding, horizontalPadding, verticalPadding); + + return; + } + if (checkNetworkEnable && !NetworkUtils.isConnected()) { Toast.makeText(this, R.string.contact_network_error_tip, Toast.LENGTH_SHORT).show(); return; } List select = getSelectedAccount(); + List selectName = getSelectedName(); + if (select.size() < 1) { Toast.makeText(this, getString(R.string.select_empty_tips), Toast.LENGTH_LONG) .show(); @@ -240,7 +279,23 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity { .show(); return; } - createGroup(); + + if(type ==1){ +// FriendInfo friendInfo = ((ContactFriendBean) data).data; + //转发选取一个结束 + Intent result = new Intent(); + + listAccount.clear(); + listname.clear(); + listAccount.addAll(select); + listname.addAll(selectName); + result.putExtra(REQUEST_CONTACT_SELECTOR_KEY, listAccount); + result.putExtra(KEY_REQUEST_SELECTOR_NAME, listname); + setResult(RESULT_OK, result); + finish(); + }else { + createGroup(); + } // if (!selectedListAdapter.getSelectedFriends().isEmpty()) { @@ -256,7 +311,7 @@ public class FunContactSelectorActivity extends BaseContactSelectorActivity { // titleBar.getTitleTextView().setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); // titleBar.getRightTextView().setTextColor(getResources().getColor(R.color.color_6b3689)); - } +// } int verticalPadding = SizeUtils.dp2px(5); int horizontalPadding = SizeUtils.dp2px(10); int endPadding = SizeUtils.dp2px(5); diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java b/app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java index eb53c14..8b0f693 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java +++ b/app/src/main/java/com/dskj/rbchat/imkit/team/TeamMembersListActivity.java @@ -33,7 +33,12 @@ import com.dskj.rbchat.network.BaseObserver; import com.dskj.rbchat.network.Result; import com.dskj.rbchat.utils.GsonUtils; import com.dskj.rbchat.utils.LogUtils; +import com.netease.nimlib.sdk.NIMClient; +import com.netease.nimlib.sdk.RequestCallback; +import com.netease.nimlib.sdk.team.TeamService; +import com.netease.nimlib.sdk.team.constant.TeamMemberType; import com.netease.nimlib.sdk.team.model.Team; +import com.netease.nimlib.sdk.team.model.TeamMember; import com.netease.yunxin.kit.chatkit.model.UserInfoWithTeam; import com.netease.yunxin.kit.chatkit.repo.ContactRepo; import com.netease.yunxin.kit.chatkit.ui.model.TeamExtensionBean; @@ -338,6 +343,36 @@ public class TeamMembersListActivity extends BaseTeamQrSettingActivity { public void startUserInfoActivity(String userid, String teamId) { //如果群不允许群内添加好友 当前登录用户不是群主,以及userid 也不是群主 直接跳过 if (isAllowAdd == 0 && isManager != 1 && !userid.equals(teamOwnerId)) { + + NIMClient.getService(TeamService.class).queryTeamMember(teamId, userid).setCallback(new RequestCallback() { + @Override + public void onSuccess(TeamMember members) { + if(members!=null){ + if(members.getType() == TeamMemberType.Manager){ + XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE) + .withContext(TeamMembersListActivity.this) + .withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account()) + .withParam("userId", userid) + .withParam("teamId", teamId) + .withParam("isGroup", true) + .navigate(); + } + } + + } + + @Override + public void onFailed(int code) { + // 撤销群管理员失败 + + } + + @Override + public void onException(Throwable exception) { + // 错误 + } + }); + return; } diff --git a/app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java b/app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java index a28f44f..683a5ef 100644 --- a/app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java +++ b/app/src/main/java/com/dskj/rbchat/imkit/team/adapter/TeamMembersAdapter.java @@ -125,14 +125,28 @@ public class TeamMembersAdapter extends RecyclerView.Adapter @@ -366,7 +367,7 @@ @@ -404,7 +405,7 @@ @@ -431,7 +432,7 @@ @@ -480,7 +481,7 @@ @@ -518,7 +519,7 @@ @@ -551,7 +552,7 @@ @@ -615,7 +616,7 @@ @@ -655,7 +656,7 @@ @@ -688,7 +689,7 @@ diff --git a/app/src/main/res/layout/team_members_view_holder.xml b/app/src/main/res/layout/team_members_view_holder.xml index 6633422..bf6da3c 100644 --- a/app/src/main/res/layout/team_members_view_holder.xml +++ b/app/src/main/res/layout/team_members_view_holder.xml @@ -33,7 +33,7 @@ + + + A maximum of 5 administrators can be set Added successfully Please select an administrator + Multi-select + \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index af4fd55..cdb20a9 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -7,7 +7,7 @@ AIzaSyAAXviskUffLY3KfnrKVPlwcj5Ks5ces_8 - 淘夢購 + MM 網易雲信 真正穩定的IM 雲端服務 @@ -330,7 +330,7 @@ クリア Q&A履歴をクリアしてもよろしいですか? スマート ドリームの回答を生成中です。お待​​ちください... - 您好,我是淘夢購團隊研發的智能認知模型,我的名字叫小夢,我可以和人類進行自然交流,解答問題,高效完成各領域的認知智能需求 + 您好,我是MM團隊研發的智能認知模型,我的名字叫小夢,我可以和人類進行自然交流,解答問題,高效完成各領域的認知智能需求 Hello, I am an intelligent cognitive model developed by TimeGo team. My name is Xiaomeng. I can naturally communicate with humans, answer questions, and efficiently complete the cognitive intelligence needs in various fields ちょっと、そこ!私はあなたの新しい友達シャオ・メンです @@ -346,6 +346,7 @@ まだ話していませんね~ まだチャット記録がありません~ 金貨残高が入金されているので、をクリックして確認してください> + ギフトポイント残高が入金されました。クリックして確認> 金貨 ポイント 銀貨 @@ -360,6 +361,7 @@ パソコン お金持ちになり、幸運を祈ります 赤い封筒に金貨を入れます + ギフトポイントを赤い封筒に詰める 赤い封筒に金貨を詰める 未受領のお年玉は、24時間以内に返却されます クリックして転送オブジェクトを選択します @@ -887,7 +889,7 @@ 他のアルバムに移動 このアルバムは友達のみ閲覧可能に設定されています。閲覧するには友達リクエストを送信してください。 お問い合わせの内容を選択してください: - 淘夢購に関する質問 + MMに関する質問 淘樂町に関する質問 ポイントモールに関する質問 協力業者に関する質問 @@ -920,4 +922,8 @@ 追加に成功しました 管理者を選択してください + 世界チャット + + 多选 + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4d7a512..d8644ad 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -3,4 +3,6 @@ 最多只能选择%1$s张照片或视频 + 多选 + \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index d51eb82..bc0b98a 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -921,5 +921,6 @@ 管理員最多可設置5個 添加成功 請選擇管理員 + 多選 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 82557d8..bc77c66 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -915,6 +915,7 @@ 管理员最多可设置5个 添加成功 请选择管理员 + 多选 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 028663b..490c604 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -129,13 +129,13 @@ false @android:color/transparent false - @color/white @color/white @color/black + @mipmap/ic_welcome_bg - + You are already in this group I see No data + + Multi-select + \ No newline at end of file diff --git a/contactkit-ui/src/main/res/values-ja/strings.xml b/contactkit-ui/src/main/res/values-ja/strings.xml index e2b14e5..7d10709 100644 --- a/contactkit-ui/src/main/res/values-ja/strings.xml +++ b/contactkit-ui/src/main/res/values-ja/strings.xml @@ -157,5 +157,6 @@ あなたはすでにこのグループに属しています なるほど まだ情報がありません + 複数選択 \ No newline at end of file diff --git a/contactkit-ui/src/main/res/values-zh/strings.xml b/contactkit-ui/src/main/res/values-zh/strings.xml index 77a769a..d03b105 100644 --- a/contactkit-ui/src/main/res/values-zh/strings.xml +++ b/contactkit-ui/src/main/res/values-zh/strings.xml @@ -157,4 +157,6 @@ 您已经在该群组中 我知道了 暂无数据 + 多选 + \ No newline at end of file diff --git a/contactkit-ui/src/main/res/values/strings.xml b/contactkit-ui/src/main/res/values/strings.xml index 992de6b..5f9b3c3 100644 --- a/contactkit-ui/src/main/res/values/strings.xml +++ b/contactkit-ui/src/main/res/values/strings.xml @@ -158,6 +158,7 @@ 我知道了 暫無數據 + 多選 \ No newline at end of file diff --git a/conversationkit-ui/src/main/res/drawable/bg_conversation_red_dot1.xml b/conversationkit-ui/src/main/res/drawable/bg_conversation_red_dot1.xml new file mode 100644 index 0000000..9164722 --- /dev/null +++ b/conversationkit-ui/src/main/res/drawable/bg_conversation_red_dot1.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/conversationkit-ui/src/main/res/values/colors.xml b/conversationkit-ui/src/main/res/values/colors.xml index b5b73dc..69011ca 100644 --- a/conversationkit-ui/src/main/res/values/colors.xml +++ b/conversationkit-ui/src/main/res/values/colors.xml @@ -6,6 +6,8 @@ #ededef #666666 #ff4e54 + #88ff4e54 + #999999 #cccccc #9e9e9e