diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6a21942..37192d1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -47,8 +47,8 @@ android {
applicationId = "com.hbl.lewan"
minSdk = 24
targetSdk = 33
- versionCode = 214
- versionName = "2.1.4"
+ versionCode = 215
+ versionName = "2.1.5"
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders["IMAPPKEY"] = "23c9cbddd4b876908efdccd0a6f2638d" //正式
@@ -58,8 +58,8 @@ android {
manifestPlaceholders["JPUSH_APPKEY"] = "9041bc22de91e3d9af3cfd23"
manifestPlaceholders["JPUSH_CHANNEL"] = "developer-default"
ndk {
-// abiFilters += listOf("armeabi-v7a", "arm64-v8a")
- abiFilters += listOf("x86","x86_64","armeabi","armeabi-v7a","arm64-v8a")
+ abiFilters += listOf("armeabi-v7a", "arm64-v8a")
+// abiFilters += listOf("x86","x86_64","armeabi","armeabi-v7a","arm64-v8a")
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cd3ad8f..b20f010 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -508,6 +508,13 @@
android:screenOrientation="portrait"
android:theme="@style/TransTheme"
android:windowSoftInputMode="adjustResize" />
+
+
>>() {
+ .subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result> result) {
LogUtils.i("result==" + result.code + "result.data==" + result.data.getList());
diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java b/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java
index d0bbf98..cd25cfe 100644
--- a/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java
+++ b/app/src/main/java/com/hbl/lewan/imkit/team/BaseTeamQrSettingActivity.java
@@ -130,7 +130,7 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
public List selectorlist = new ArrayList<>(); //邀請好友列表
- //群行动码
+ //群二维码
public ShareDateUtils shareDateUtils;
public LoginBean loginBean;
public String teamId;
@@ -489,7 +489,7 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
super.onDestroy();
}
- //******************************************************群行动码处理start*****************************************************************
+ //******************************************************群二维码处理start*****************************************************************
private ImageView coloseIv;
private LinearLayout qrcodeLy;
@@ -919,7 +919,7 @@ public abstract class BaseTeamQrSettingActivity extends BaseActivity implements
}
}
- //******************************************************群行动码处理end*****************************************************************
+ //******************************************************群二维码处理end*****************************************************************
public boolean onTouchEvent(MotionEvent event) {
if (null != this.getCurrentFocus()) {
/**
diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList2Activity.java b/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList2Activity.java
new file mode 100644
index 0000000..7adf689
--- /dev/null
+++ b/app/src/main/java/com/hbl/lewan/imkit/team/TeamMembersList2Activity.java
@@ -0,0 +1,639 @@
+// Copyright (c) 2022 NetEase, Inc. All rights reserved.
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+package com.hbl.lewan.imkit.team;
+
+import static com.netease.yunxin.kit.corekit.im.utils.RouterConstant.KEY_TEAM_ID;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.hbl.lewan.R;
+import com.hbl.lewan.databinding.ActivityTeamMembers1Binding;
+import com.hbl.lewan.dialog.ActionConfirmDialog;
+import com.hbl.lewan.imkit.team.adapter.TeamMembersAdapter2;
+import com.hbl.lewan.network.Api;
+import com.hbl.lewan.network.BaseObserver;
+import com.hbl.lewan.network.Result;
+import com.hbl.lewan.utils.GsonUtils;
+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.SwitchGroupBean;
+import com.netease.yunxin.kit.chatkit.ui.model.TeamExtensionBean;
+import com.netease.yunxin.kit.common.ui.utils.ToastX;
+import com.netease.yunxin.kit.common.utils.NetworkUtils;
+import com.netease.yunxin.kit.corekit.im.IMKitClient;
+import com.netease.yunxin.kit.corekit.im.model.UserInfo;
+import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
+import com.netease.yunxin.kit.corekit.route.XKitRouter;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+/**
+ * 群聊成员页面 (编辑群员，群主转让那) 这快逻辑有点乱
+ */
+public class TeamMembersList2Activity extends BaseTeamQrSettingActivity {
+
+ public static final String ISMANAGER = "isManager";
+ public static final String LISTUSERINFOS = "listUserInfos";
+ public static final String TEAMINFO = "teamInfo";
+ public static final String TYPE = "type";
+ public static final String QUITE = "quite";
+ public static final String TEAMQR = "teamQr";
+ public int type; //0查看群成员，1 群主转让
+ public int quite; //0 转让退群 1 只转让
+ public boolean isRefresh = false; //是否刷新设置页
+ public boolean teamQr = true;
+ public List listSearch = new ArrayList<>();
+ public int isAllowAdd = 1;
+ List switchGroupBeans = new ArrayList<>();
+
+ public static void launch(Context context, int isManager, boolean isShowTeamQR, String teamId, List userInfos, Team team, @NonNull ActivityResultLauncher launcher) {
+ Intent intent = new Intent(context, TeamMembersList2Activity.class);
+ intent.putExtra(ISMANAGER, isManager);
+ intent.putExtra(TYPE, 0);
+ intent.putExtra(TEAMQR, isShowTeamQR);
+ intent.putExtra(KEY_TEAM_ID, teamId);
+ intent.putExtra(LISTUSERINFOS, (Serializable) userInfos);
+ intent.putExtra(TEAMINFO, (Serializable) team);
+ launcher.launch(intent);
+ }
+
+ public static void launch(Context context, int isQuit, String teamId, List userInfos, @NonNull ActivityResultLauncher launcher) {
+ Intent intent = new Intent(context, TeamMembersList2Activity.class);
+ intent.putExtra(KEY_TEAM_ID, teamId);
+ intent.putExtra(TYPE, 1);
+ intent.putExtra(QUITE, isQuit);
+ intent.putExtra(LISTUSERINFOS, (Serializable) userInfos);
+ launcher.launch(intent);
+ }
+
+
+ ActivityTeamMembers1Binding binding;
+ private int isManager = 0; // 1 群主 2 管理员
+ private Team teamInfo;
+ private String teamOwnerId; //群主id;
+
+ private TeamMembersAdapter2 membersAdapter;
+ private TeamExtensionBean extensionBean;
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+// getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+// getWindow().setNavigationBarColor(getResources().getColor(com.netease.yunxin.kit.chatkit.ui.R.color.color_white));
+ isManager = getIntent().getIntExtra(ISMANAGER, 0);
+ teamInfo = (Team) getIntent().getSerializableExtra(TEAMINFO);
+ type = getIntent().getIntExtra(TYPE, 0);
+ quite = getIntent().getIntExtra(QUITE, 0);
+ List list = (List) getIntent().getSerializableExtra(LISTUSERINFOS);
+ teamQr = getIntent().getBooleanExtra(TEAMQR, true);
+
+ if (teamInfo != null) {
+ teamOwnerId = teamInfo.getCreator();
+ if (!TextUtils.isEmpty(teamInfo.getExtension())) {
+ extensionBean = GsonUtils.getObjFromJSON(teamInfo.getExtension(), TeamExtensionBean.class);
+ if (extensionBean == null) {
+ extensionBean = new TeamExtensionBean(Integer.parseInt(teamInfo.getExtension()), 0);
+ }
+ } else {
+ extensionBean = new TeamExtensionBean(1, 0);
+ }
+ isAllowAdd = extensionBean.getAllowAddFriends();
+ }
+ if (list != null && list.size() > 0) {
+
+ listmemebers.clear();
+ listmemebers.addAll(list);
+ } else {
+ if (NetworkUtils.isConnected()) {
+ showLoading();
+ //重新获取群成员
+ teammodel.getUserInfoData().observe(this, listResultInfo -> {
+ dismissLoading();
+ if (listResultInfo.getSuccess()) {
+// getTeamActiveTime();
+ List listmember = listResultInfo.getValue();
+ listmemebers.clear();
+ listmember = sortListMembers(listmember);
+ for (UserInfoWithTeam userinfo : listmember) {
+// LogUtils.i("走了333333333355555555555："+GsonUtils.beanToJSONString(userinfo));
+
+ UserInfo userInfos = userinfo.getUserInfo();
+ userInfos.setSignature(userinfo.getTeamInfo().isMute() ? "1" : "");
+ listmemebers.add(userInfos);
+ }
+ setData();
+
+ }
+ });
+ teammodel.requestTeamMembers(teamId);
+ }
+
+ }
+ initView();
+ initData();
+ }
+
+
+ @Override
+ public View getContentView() {
+ binding = ActivityTeamMembers1Binding.inflate(getLayoutInflater());
+ return binding.getRoot();
+ }
+
+
+ Map memberMap;
+
+ public void getTeamActiveTime() {
+ if (isManager != 0 && type == 0) {
+ Api.getInstance().teamMemberActiveTime(teamId)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new BaseObserver>>() {
+ @Override
+ public void onSuccess(Result> feedbackResp) {
+// LogUtils.d("dddd" + feedbackResp.data);
+// LogUtils.i("走了333333333366666666：");
+
+ memberMap = feedbackResp.data;
+ listmemebers.remove(0);
+ listmemebers = sortListByActivieTime(listmemebers);
+ listmemebers.add(0, IMKitClient.getUserInfo());
+ membersAdapter.setData(listmemebers, false, memberMap, teamId);
+ }
+
+
+ @Override
+ public void onError(int code, String msg) {
+ ToastX.showShortToast(msg);
+
+ }
+ });
+ }
+ }
+
+ //排序成员
+ public List sortListByActivieTime(List teamMemberlist) {
+ List resultlist = new ArrayList<>();
+ Set keys = memberMap.keySet();
+ if (!keys.isEmpty()) {
+ for (String id : keys) {
+ for (UserInfo userInfo : teamMemberlist) {
+ if (userInfo.getAccount().equals(id)) {
+ resultlist.add(userInfo);
+ }
+ }
+ }
+ }
+ return resultlist;
+ }
+
+
+ public void setData() {
+ if (type == 0) {
+// listmemebers.add(0, IMKitClient.getUserInfo());
+ membersAdapter.setData(listmemebers, false, memberMap, teamId);
+// binding.tvteammembers.setText(getString(com.netease.yunxin.kit.contactkit.ui.R.string.fun_creategroup_members, listmemebers.size() - 1));
+ } else { //不能编辑 转让
+ for (int i = 0; i < listmemebers.size(); i++) {
+ if (listmemebers.get(i).getAccount().equals(IMKitClient.account())) {
+ listmemebers.remove(i);
+ }
+ }
+
+// binding.tvteammembers.setText(getString(com.netease.yunxin.kit.contactkit.ui.R.string.fun_creategroup_members, listmemebers.size()));
+ membersAdapter.setEdit(false);
+ membersAdapter.setData(listmemebers, false, memberMap, teamId);
+ }
+ binding.rvMembers.setAdapter(membersAdapter);
+ }
+
+ public void initView() {
+ initTitleView();
+
+ LinearLayoutManager layoutManager =
+ new LinearLayoutManager(this, RecyclerView.VERTICAL, false);
+ binding.rvMembers.setLayoutManager(layoutManager);
+ membersAdapter = new TeamMembersAdapter2(this, type);
+ setData();
+ membersAdapter.setItemClickListener(new TeamMembersAdapter2.ItemClickListener() {
+ @Override
+ public void onItemClick(UserInfo item, int position) {
+
+ }
+
+ @Override
+ public void onAddClick(UserInfo item, int position) {
+ startUserInfoActivity(item.getAccount(), teamId);
+ }
+
+ @Override
+ public void onSwithType(UserInfo userInfo, int position, boolean isGrab, int allowGrab, int allowSend) {
+ groupSwitch(position, userInfo.getAccount(), allowSend, allowGrab);
+ }
+
+ });
+ binding.editSelectorFriends.setOnEditorActionListener((textView, actionId, keyEvent) ->
+ {
+ if (actionId == EditorInfo.IME_ACTION_SEARCH) {
+ String search = textView.getEditableText().toString();
+ //搜索好友
+ List listSearchResult = searchName(search);
+ listSearch.clear();
+ listSearch.addAll(listSearchResult);
+ if (listSearch.size() > 0) {
+ membersAdapter.refreshData(listSearch, false);
+// binding.tvteammembers.setText(getString(com.netease.yunxin.kit.contactkit.ui.R.string.fun_creategroup_members, listSearch.size()));
+
+ }
+ }
+ return false;
+ });
+ binding.editSelectorFriends.addTextChangedListener(new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+ }
+
+ @Override
+ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
+ }
+
+ @Override
+ public void afterTextChanged(Editable editable) {
+ if (TextUtils.isEmpty(editable.toString())) {
+ binding.icCleanEdit.setVisibility(View.GONE);
+// membersAdapter.setEdit(false);
+// binding.title.setActionText(R.string.teammember_edit);
+// listmemebers.add(0, IMKitClient.getUserInfo());
+ membersAdapter.refreshData(listmemebers, type == 0);
+// binding.tvteammembers.setText(getString(com.netease.yunxin.kit.contactkit.ui.R.string.fun_creategroup_members, listmemebers.size() - 1));
+ } else {
+ binding.icCleanEdit.setVisibility(View.VISIBLE);
+ }
+ }
+ });
+ binding.icCleanEdit.setOnClickListener(view -> binding.editSelectorFriends.setText(""));
+ }
+
+ public void startUserInfoActivity(String userid, String teamId) {
+
+ if (isManager == 1 || isManager == 2) {
+ XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
+ .withContext(TeamMembersList2Activity.this)
+ .withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account())
+ .withParam("userId", userid)
+ .withParam("teamId", teamId)
+ .withParam("isGroup", true)
+ .navigate();
+ return;
+ }
+
+
+ //如果群不允许群内添加好友 当前登录用户不是群主，以及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(TeamMembersList2Activity.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;
+ }
+
+ XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE)
+ .withContext(TeamMembersList2Activity.this)
+ .withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, IMKitClient.account())
+ .withParam("userId", userid)
+ .withParam("teamId", teamId)
+ .withParam("isGroup", true)
+ .navigate();
+ }
+
+ public void initData() {
+ teammodel.getRemoveMembersData().observe(
+ this,
+ voidResultInfo -> {
+ if (voidResultInfo.getSuccess()) {
+ //移除群成员成功 变量太多
+ List userInfos = new ArrayList<>();
+ List list = membersAdapter.getSelectedInt();
+ for (int i = 0; i < list.size(); i++) {
+ userInfos.add(membersAdapter.getData().get(list.get(i)));
+ }
+ for (int i = 0; i < userInfos.size(); i++) {
+ UserInfo userInfo = userInfos.get(i);
+// int searchIndex = listSearch.indexOf(userInfo);
+// if (searchIndex >= 0) { //通过搜索列表删除的
+// listSearch.remove(searchIndex);
+// }
+ int indexSelector = selectorlist.indexOf(userInfo.getAccount());
+ int indexMembers = listmemebers.indexOf(userInfo);
+ if (indexSelector >= 0) {
+ selectorlist.remove(indexSelector); //成员有变化 ，邀请 选中的人数就有变化（都是好友)
+ }
+ if (indexMembers >= 0) {
+ listmemebers.remove(indexMembers);
+ }
+
+ }
+// LogUtils.d("删除结束 " + listmemebers.size());
+// binding.tvteammembers.setText(getString(com.netease.yunxin.kit.contactkit.ui.R.string.fun_creategroup_members, listmemebers.size() - 1));
+ isRefresh = true;
+ setTitleEdit(listmemebers, true, R.string.teammember_edit);
+ binding.editSelectorFriends.setText("");
+
+
+ //刪除的
+// if (deletePosition >= 0) {
+// if (listSearch.size() == deletePosition || listmemebers.size() == deletePosition) {
+// deletePosition = deletePosition - 1;
+// }
+//// if (listSearch.size() == 0 && listmemebers.size() == deletePosition) {
+//// deletePosition = deletePosition - 1;
+//// }
+// UserInfo userInfo;
+// if (listSearch.size() > 0) {
+// userInfo = listSearch.get(deletePosition);
+// listSearch.remove(deletePosition);
+// membersAdapter.removeData(deletePosition);
+// deletePosition = listmemebers.indexOf(userInfo);
+// } else {
+// membersAdapter.removeData(deletePosition);
+// }
+// binding.tvteammembers.setText(getString(com.netease.yunxin.kit.contactkit.ui.R.string.fun_creategroup_members, membersAdapter.getData().size()));
+// selectorlist.remove(listmemebers.get(deletePosition).getAccount());
+// listmemebers.remove(deletePosition);
+// isRefresh = true;
+// }
+ }
+
+ });
+ teammodel.getUserInfoData().observe(this, listResultInfo -> {
+ if (listResultInfo.getSuccess()) {
+ memberMap = null;
+// getTeamActiveTime();
+ List list = listResultInfo.getValue();
+ //邀请成功 获取用户信息
+ selectorlist.clear();
+ listmemebers.clear();
+ listmemebers.add(IMKitClient.getUserInfo());
+ for (UserInfoWithTeam userinfo : list) {
+// LogUtils.i("走了3333333333444444444："+GsonUtils.beanToJSONString(userinfo));
+
+ selectorlist.add(userinfo.getUserInfo().getAccount());
+ UserInfo userInfos = userinfo.getUserInfo();
+ userInfos.setSignature(userinfo.getTeamInfo().isMute() ? "1" : "");
+ listmemebers.add(userInfos);
+
+// listmemebers.add(userinfo.getUserInfo());
+ }
+ membersAdapter.setData(listmemebers, false, memberMap, teamId);
+ isRefresh = true;
+// binding.tvteammembers.setText(getString(com.netease.yunxin.kit.contactkit.ui.R.string.fun_creategroup_members, listmemebers.size() - 1));
+ }
+ });
+
+ if (listmemebers != null) {
+ for (UserInfo userInfo : listmemebers) {
+ selectorlist.add(userInfo.getAccount());
+ }
+ }
+
+ teammodel.getQuitTeamData().observe(this, voidResultInfo -> {
+ if (voidResultInfo.getSuccess()) {
+ //成功
+ showTransferDialog(true, "");
+ } else {
+ showTransferDialog(false, voidResultInfo.getMsg().getMessage());
+ }
+ });
+
+ getTeamSwiches();
+ }
+
+ private void getTeamSwiches() {
+ com.netease.yunxin.kit.chatkit.ui.network.Api.getInstance().groupSwitches(teamId)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new com.netease.yunxin.kit.chatkit.ui.network.BaseObserver<>() {
+ @Override
+ public void onSuccess(com.netease.yunxin.kit.chatkit.ui.network.Result> feedbackResp) {
+ switchGroupBeans = feedbackResp.data;
+ membersAdapter.notifyDataSetChanged();
+
+ }
+
+ @Override
+ public void onError(int code, String msg) {
+
+ }
+ });
+ }
+
+ private void getTeamSwiches(int index) {
+ com.netease.yunxin.kit.chatkit.ui.network.Api.getInstance().groupSwitches(teamId)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new com.netease.yunxin.kit.chatkit.ui.network.BaseObserver<>() {
+ @Override
+ public void onSuccess(com.netease.yunxin.kit.chatkit.ui.network.Result> feedbackResp) {
+ switchGroupBeans = feedbackResp.data;
+ membersAdapter.notifyItemChanged(index);
+ }
+
+ @Override
+ public void onError(int code, String msg) {
+
+ }
+ });
+ }
+ public boolean getSwitchValue(Long userId, boolean isGrad) {
+ if (switchGroupBeans != null && switchGroupBeans.size() > 0) {
+ boolean isIn = false;
+ for (SwitchGroupBean s : switchGroupBeans) {
+ if (userId.equals(s.getUserUid())) {
+ isIn = true;
+ if (isGrad) {
+ return s.getAllowGrab() == 1;
+ } else {
+ return s.getAllowSend() == 1;
+ }
+ }
+
+ }
+ if (!isIn) {
+ if (isGrad) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+ }
+ if (isGrad) {
+ return false;
+ } else {
+ return true;
+ }
+
+ }
+
+ private void groupSwitch(int index, String Uid, int allowSend, int allowGrab) {
+ Map map = new HashMap<>();
+ map.put("uid", Uid);
+ map.put("allowSend", allowSend);
+ map.put("allowGrab", allowGrab);
+ map.put("groupId", teamId);
+ Api.getInstance().groupSwitch(map)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new BaseObserver() {
+ @Override
+ public void onSuccess(Result feedbackResp) {
+ getTeamSwiches(index);
+ }
+
+ @Override
+ public void onError(int code, String msg) {
+
+ }
+ });
+ }
+
+
+ private boolean isRemove = false;
+
+
+ private void initTitleView() {
+// binding.title.setTitle(com.netease.yunxin.kit.contactkit.ui.R.string.select);
+// binding.title.getBackImageView().setImageResource(com.netease.yunxin.kit.contactkit.ui.R.drawable.ic_dialog_close);
+ binding.title.getBackImageView().setOnClickListener(v -> {
+ finish();
+ });
+ }
+
+
+ public void setTitleEdit(List listmember, boolean isEdit, int actionText) {
+// binding.title.setActionText(actionText);
+ membersAdapter.setEdit(!isEdit);
+ membersAdapter.getSelectedInt().clear();
+ membersAdapter.setData(listmember, false, memberMap, teamId);
+ }
+
+
+ public void showTransferDialog(boolean isSuccess, String value) {
+
+ ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(this, isSuccess ? getString(R.string.transfer_success)
+ : (TextUtils.isEmpty(value) ? getString(R.string.transfer_fail) : getString(R.string.transfer_failmsg, value)), false);
+
+ actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
+ @Override
+ public void toSumbit() {
+ if (isSuccess) {
+ //回调结果
+ quite = 2;
+ setActivityResult();
+ } else {
+ actionConfirmDialog.dismiss();
+ }
+
+ }
+
+ @Override
+ public void toCancel() {
+ }
+ });
+ actionConfirmDialog.show();
+
+ }
+
+ public void setActivityResult() {
+ Intent intent = new Intent();
+ intent.putExtra(TYPE, type);
+ intent.putExtra(QUITE, quite);
+ setResult(RESULT_OK, intent);
+ finish();
+ }
+
+ public List searchName(String key) {
+ List listSearch = new ArrayList<>();
+ List result = new ArrayList<>();
+ result.addAll(listmemebers);
+ if (result.size() >= 2 && (result.get(0).getAccount().equals(result.get(1).getAccount()))) { //因为邀请好友icon
+ result.remove(result.get(0));
+ }
+ for (UserInfo userInfo : result) {
+
+ String name = getAlias(userInfo);
+ if (name.contains(key)) {
+ listSearch.add(userInfo);
+ }
+ }
+ return listSearch;
+ }
+
+
+ public String getAlias(UserInfo userInfo) {
+ String name = userInfo.getName();
+ if (ContactRepo.isFriend(userInfo.getAccount())) {
+ String alias = ContactRepo.getFriend(userInfo.getAccount()).getAlias();
+ return TextUtils.isEmpty(alias) ? name : alias;
+ }
+ return name;
+ }
+
+
+}
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 b0b6fda..28e2bfe 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
@@ -26,6 +26,7 @@ import com.hbl.lewan.contact.ReportActivity;
import com.hbl.lewan.databinding.ActivityBaseChatsettingBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
import com.hbl.lewan.model.TeamUpdateEvent;
+import com.hbl.lewan.redpack.SendRedPacketActivity;
import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.widget.CircleImageView;
@@ -65,6 +66,8 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
protected TeamMember teamMember;
private boolean isOpenNotify = true;
private ActivityResultLauncher launcher;
+ private ActivityResultLauncher launcher1;
+
private boolean isTeamShow;
private boolean isUpdateTeam = false;
@@ -101,6 +104,11 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
}
}
});
+ launcher1 = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
+ if (result.getResultCode() == Activity.RESULT_OK) {
+
+ }
+ });
}
public void updateTeamData() {
@@ -155,6 +163,17 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
intent.putExtra("teamId",teamId);
startActivity(intent);
});
+ binding.flhbkz.setOnClickListener(v -> {
+ int manager = 0;
+ if (teamMember.getType() == TeamMemberType.Owner) {
+ manager = 1;
+ }
+ if (teamMember.getType() == TeamMemberType.Manager) {
+ manager = 2;
+ }
+
+ TeamMembersList2Activity.launch(TeamSettingActivity.this, manager, false, teamId, listmemebers, teamInfo, launcher1);
+ });
}
private void getChatList() {
@@ -369,8 +388,11 @@ public class TeamSettingActivity extends BaseTeamQrSettingActivity {
if(teamMember.getType() == TeamMemberType.Owner||teamMember.getType() == TeamMemberType.Manager){
binding.fljinyan.setVisibility(View.VISIBLE);
+ binding.flhbkz.setVisibility(View.VISIBLE);
}else {
binding.fljinyan.setVisibility(View.GONE);
+ binding.flhbkz.setVisibility(View.GONE);
+
}
}
diff --git a/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter2.java b/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter2.java
new file mode 100644
index 0000000..df4b027
--- /dev/null
+++ b/app/src/main/java/com/hbl/lewan/imkit/team/adapter/TeamMembersAdapter2.java
@@ -0,0 +1,340 @@
+// Copyright (c) 2022 NetEase, Inc. All rights reserved.
+// Use of this source code is governed by a MIT license that can be
+// found in the LICENSE file.
+
+package com.hbl.lewan.imkit.team.adapter;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewbinding.ViewBinding;
+
+import com.hbl.lewan.R;
+import com.hbl.lewan.databinding.TeamMembersViewHolder2Binding;
+import com.hbl.lewan.imkit.team.TeamMembersList2Activity;
+import com.netease.nimlib.sdk.NIMClient;
+import com.netease.nimlib.sdk.team.TeamService;
+import com.netease.nimlib.sdk.team.constant.TeamMemberType;
+import com.netease.nimlib.sdk.team.model.TeamMember;
+import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
+import com.netease.yunxin.kit.corekit.im.model.UserInfo;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+// 群组成员列表
+public class TeamMembersAdapter2 extends RecyclerView.Adapter {
+
+ protected List members;
+ private Context mContext;
+ private boolean isShowInvited = true;
+ private boolean isEdit = false;
+ private int mType; //
+ private int selectpostion = -1;
+ private Map mapTime;
+ private List selectedInt = new ArrayList<>(); //多选position
+ private String teamId;
+ TeamMembersList2Activity teamMembersList2Activity;
+
+ public TeamMembersAdapter2(Context context, int type) {
+ members = new ArrayList<>();
+ mContext = context;
+ mType = type;
+ teamMembersList2Activity = (TeamMembersList2Activity) context;
+ }
+
+ protected TeamMembersAdapter2.ItemClickListener itemClickListener;
+
+ public void setItemClickListener(TeamMembersAdapter2.ItemClickListener itemClickListener) {
+ this.itemClickListener = itemClickListener;
+ }
+
+ public void setData(List list, boolean isShow, Map mapActiveTime, String teamId) {
+ members.clear();
+ members.addAll(list);
+ selectedInt.clear();
+ isShowInvited = isShow;
+ mapTime = mapActiveTime;
+ this.teamId = teamId;
+ notifyDataSetChanged();
+ }
+
+ public void setEdit(boolean edit) {
+ isEdit = edit;
+ }
+
+ public boolean isEdit() {
+ return isEdit;
+ }
+
+
+ public int getSelectpostion() {
+ return selectpostion;
+ }
+
+
+ public void refreshData(List list, boolean isInvited) {
+ isShowInvited = isInvited;
+ selectpostion = -1;
+ members.clear();
+ members.addAll(list);
+ notifyDataSetChanged();
+ }
+
+ public List getSelectedInt() {
+ return selectedInt;
+ }
+
+ // public void addData(List list) {
+// int initsize = members.size();
+// members.addAll(list);
+// notifyItemRangeChanged(initsize, list.size());
+// }
+
+ public void removeData(int position) {
+ members.remove(position);
+ notifyItemRemoved(position);
+ }
+
+ public List getData() {
+ return members;
+ }
+
+ @NonNull
+ @Override
+ public TeamMembersViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ return new TeamMembersViewHolder(TeamMembersViewHolder2Binding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull TeamMembersViewHolder holder, int position) {
+ UserInfo userInfo = members.get(position);
+ holder.binding.unreadTv.setVisibility(View.GONE);
+ if (position == 0 && isShowInvited) {
+ holder.binding.avatarView.setData(com.netease.yunxin.kit.contactkit.ui.R.drawable.ic_creategroup_add, "");
+ holder.binding.icDelete.setVisibility(View.GONE);
+ holder.binding.tvName.setText(mContext.getResources().getString(R.string.invcode_friend_txt));
+ holder.binding.tvNameActivetime.setVisibility(View.GONE);
+ } else {
+ TeamMember teamMember = NIMClient.getService(TeamService.class).queryTeamMemberBlock(teamId, userInfo.getAccount());
+ if(teamMember!=null){
+ if(teamMember.getType() == TeamMemberType.Manager){
+ holder.binding.unreadTv.setVisibility(View.VISIBLE);
+ holder.binding.unreadTv.setText(R.string.teamsetting_other_teammanager);
+ holder.binding.unreadTv.setBackgroundResource(com.netease.yunxin.kit.conversationkit.ui.R.drawable.bg_conversation_red_dot1);
+ }else if(teamMember.getType() == TeamMemberType.Owner){
+ holder.binding.unreadTv.setVisibility(View.VISIBLE);
+ holder.binding.unreadTv.setText(com.netease.yunxin.kit.teamkit.ui.R.string.team_owner);
+ holder.binding.unreadTv.setBackgroundResource(com.netease.yunxin.kit.conversationkit.ui.R.drawable.bg_conversation_red_dot);
+
+
+ }
+ }
+ if (isEdit) {
+ if (teamMember != null && (teamMember.getType() == TeamMemberType.Manager || teamMember.getType() == TeamMemberType.Owner)) {
+ holder.binding.icDelete.setVisibility(View.GONE);
+ } else {
+ holder.binding.icDelete.setVisibility(View.VISIBLE);
+ }
+ if (selectedInt.indexOf(position) >= 0) {
+ holder.binding.icDelete.setBackgroundResource(R.mipmap.dialog_gou_t);
+ } else {
+ holder.binding.icDelete.setBackgroundResource(R.mipmap.dialog_gou_ff);
+ }
+// holder.binding.icDelete.setVisibility(userInfo.getAccount().equals(IMKitClient.account()) ? View.GONE : View.VISIBLE);
+ } else if (mType == 1) {
+
+ if (selectpostion >= 0 && position == selectpostion) {
+ holder.binding.icDelete.setBackgroundResource(R.mipmap.dialog_gou_tt);
+ } else {
+ holder.binding.icDelete.setBackgroundResource(R.drawable.bg_d8d8d8_singleunselector);
+ }
+ holder.binding.icDelete.setVisibility(View.VISIBLE);
+ } else {
+ holder.binding.icDelete.setVisibility(View.GONE);
+ }
+ String avaterurl = userInfo.getAvatar();
+ if (TextUtils.isEmpty(avaterurl)) {
+ holder.binding.avatarView.setData(R.mipmap.default_head_img, userInfo.getName(), 0);
+ } else {
+ holder.binding.avatarView.setData(avaterurl, userInfo.getName());
+ }
+ String name = userInfo.getName();
+ if (ContactRepo.isFriend(userInfo.getAccount())) {
+ String alias = ContactRepo.getFriend(userInfo.getAccount()).getAlias();
+ if (!TextUtils.isEmpty(alias)) {
+ name = alias;
+ }
+ }
+ holder.binding.tvName.setText(name);
+ if (mapTime != null && mapTime.size() > 0) {
+ holder.binding.tvNameActivetime.setVisibility(View.VISIBLE);
+ holder.binding.tvNameActivetime.setTextColor(Color.parseColor("#FE6881"));
+ holder.binding.tvNameActivetime.setBackgroundResource(R.drawable.cornor_stroke_fe6881_2dp);
+ String time = parseTimeLong(holder.binding.tvNameActivetime, mapTime.get(userInfo.getAccount()));
+ holder.binding.tvNameActivetime.setText(time);
+ } else {
+ holder.binding.tvNameActivetime.setVisibility(View.GONE);
+ }
+
+ holder.binding.jinyanIv.setVisibility(View.GONE);
+ if(!TextUtils.isEmpty(userInfo.getSignature())&&userInfo.getSignature().equals("1")){
+ holder.binding.jinyanIv.setVisibility(View.VISIBLE);
+ }
+
+
+ }
+ holder.binding.avatarView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (itemClickListener != null) {
+ itemClickListener.onAddClick(userInfo, position);
+ }
+ }
+ });
+ holder.binding.shouhongbaoSwitch.setOnClickListener(v -> {
+ if (itemClickListener != null) {
+ itemClickListener.onSwithType(userInfo, position,true,
+ holder.binding.shouhongbaoSwitch.isChecked()?1:0,holder.binding.fahongbaoSwitch.isChecked()?1:0);
+ }
+ });
+
+ holder.binding.fahongbaoSwitch.setOnClickListener(v -> {
+ if (itemClickListener != null) {
+ itemClickListener.onSwithType(userInfo, position,false,
+ holder.binding.shouhongbaoSwitch.isChecked()?1:0,holder.binding.fahongbaoSwitch.isChecked()?1:0);
+ }
+ });
+
+ holder.binding.fahongbaoSwitch.setChecked(teamMembersList2Activity.getSwitchValue(Long.parseLong(userInfo.getAccount()),false));
+
+ holder.binding.shouhongbaoSwitch.setChecked(teamMembersList2Activity.getSwitchValue(Long.parseLong(userInfo.getAccount()),true));
+
+ holder.binding.getRoot().setOnClickListener(view -> {
+ if (itemClickListener != null) {
+ if (position == 0 && isShowInvited) {
+// itemClickListener.onAddClick(); //邀请好友
+ } else {
+ if (mType == 1) { //转让
+ if (selectpostion == position) {
+ selectpostion = -1;
+ } else {
+ selectpostion = position;
+ }
+ notifyDataSetChanged();
+ } else {
+ if (isEdit && holder.binding.icDelete.getVisibility() == View.VISIBLE) {
+ //管理员删除用户选择
+ int index = selectedInt.indexOf(position);
+ if (index >= 0) {
+ selectedInt.remove(index);
+ } else {
+ selectedInt.add(position);
+ }
+ notifyItemChanged(position);
+
+ } else {
+ itemClickListener.onItemClick(userInfo, position);
+ }
+ }
+
+ }
+
+
+ }
+ });
+ }
+
+
+ /*
+ 相差天数
+ */
+ public static int differentDays(long timeseconds) {
+ Date date1 = new Date(timeseconds);
+ Date date2 = new Date(System.currentTimeMillis()); //当前日期
+ Calendar cal1 = Calendar.getInstance();
+ cal1.setTime(date1);
+
+ Calendar cal2 = Calendar.getInstance();
+ cal2.setTime(date2);
+ int day1 = cal1.get(Calendar.DAY_OF_YEAR);
+ int day2 = cal2.get(Calendar.DAY_OF_YEAR);
+
+ int year1 = cal1.get(Calendar.YEAR);
+ int year2 = cal2.get(Calendar.YEAR);
+ if (year1 != year2) //不同年
+ {
+ int timeDistance = 0;
+ for (int i = year1; i < year2; i++) {
+ if (i % 4 == 0 && i % 100 != 0 || i % 400 == 0) //闰年
+ {
+ timeDistance += 366;
+ } else //不是闰年
+ {
+ timeDistance += 365;
+ }
+ }
+
+ return timeDistance + (day2 - day1);
+ } else //同年
+ {
+ return day2 - day1;
+ }
+ }
+
+ public String parseTimeLong(TextView textView, long timestra) {
+ int days = differentDays(timestra);
+ String time;
+ if (days == 0) {
+ time = textView.getResources().getString(R.string.today_txt);
+ } else if (days == 1) {
+ time = textView.getResources().getString(R.string.yesterday_txt);
+ } else if (days <= 6) {
+ time = String.format(textView.getResources().getString(R.string.jinjiri_txt), days + 1);
+ } else if (days <= 29) {
+ time = String.format(textView.getResources().getString(R.string.jinjiri_txt), days + 1);
+ } else {
+ textView.setTextColor(Color.parseColor("#cbcbcb"));
+ textView.setBackgroundResource(R.drawable.cornor_stroke_cbcbcb_2dp);
+ time = String.format(textView.getResources().getString(R.string.jitianqi_txt), days + 1);
+ }
+ return time;
+ }
+
+ @Override
+ public int getItemCount() {
+ return members.size();
+ }
+
+
+ public interface ItemClickListener {
+ void onItemClick(UserInfo item, int position);
+
+ void onAddClick(UserInfo item, int position);
+
+ void onSwithType(UserInfo userInfo,int position,boolean isGrab,int allowGrab,int allowSend);
+ }
+
+ protected class TeamMembersViewHolder extends RecyclerView.ViewHolder {
+
+ TeamMembersViewHolder2Binding binding;
+
+ public TeamMembersViewHolder(@NonNull ViewBinding binding) {
+ super(binding.getRoot());
+ this.binding = (TeamMembersViewHolder2Binding) binding;
+ }
+ }
+}
+
+
diff --git a/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java b/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java
index caa6cfe..ac17fbc 100644
--- a/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java
+++ b/app/src/main/java/com/hbl/lewan/login/RegisterActivity.java
@@ -910,7 +910,7 @@ public class RegisterActivity extends BaseActivity {
String stsCredentialsBean;
private void toShangchuanAli(File file ) {
- showLoadingDialog();
+ showLoadingDialog("正在上传头像");
// Api.getInstance().stsCredentials()
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
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 6274ccf..88bb54f 100644
--- a/app/src/main/java/com/hbl/lewan/main/MainActivity.java
+++ b/app/src/main/java/com/hbl/lewan/main/MainActivity.java
@@ -53,6 +53,7 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager2.widget.ViewPager2;
import com.codersun.fingerprintcompat.AonFingerChangeCallback;
import com.codersun.fingerprintcompat.FingerManager;
@@ -403,6 +404,9 @@ public class MainActivity extends BaseActivity {
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
ViewGroup.LayoutParams layoutParams = activityMainBinding.bottomV.getLayoutParams();
layoutParams.height = getNavigationBarHeight(this);
+ if(Build.MANUFACTURER.equals("HUAWEI")){
+ layoutParams.height = 0;
+ }
activityMainBinding.bottomV.setLayoutParams(layoutParams);
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
@@ -410,7 +414,7 @@ public class MainActivity extends BaseActivity {
ChatDataUtils.set(this, ChatKitUIConstant.SERVICES_LOGIN, false);
ChatKitUIConstant.isSendGiftRedPacket = DataUtils.getIsSendGiftRedPacket();
initView();
- getServiceId();
+// getServiceId();
ChatObserverRepo.registerReceiveMessageObserve(receiveMessageObserver);
// EventCenter.registerEventNotify(skinNotify);
@@ -788,10 +792,34 @@ public class MainActivity extends BaseActivity {
fragmentAdapter = new FragmentAdapter(this);
fragmentAdapter.setFragmentList(fragments);
- activityMainBinding.viewPager.setUserInputEnabled(false);
+// activityMainBinding.viewPager.setUserInputEnabled(false);
activityMainBinding.viewPager.setAdapter(fragmentAdapter);
activityMainBinding.viewPager.setCurrentItem(START_INDEX, false);
activityMainBinding.viewPager.setOffscreenPageLimit(fragments.size());
+ activityMainBinding.viewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+ super.onPageScrolled(position, positionOffset, positionOffsetPixels);
+ }
+
+ @Override
+ public void onPageSelected(int position) {
+ super.onPageSelected(position);
+ resetTabStyle();
+ if(position == 0){
+ activityMainBinding.contact.setTextColor(
+ getResources().getColor(R.color.color_fe6881));
+ activityMainBinding.contact.setCompoundDrawablesWithIntrinsicBounds(
+ null, getResources().getDrawable(R.mipmap.chat_img_t), null, null);
+ getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+ }else{
+ activityMainBinding.mine.setTextColor(getResources().getColor(R.color.color_fe6881));
+ activityMainBinding.mine.setCompoundDrawablesWithIntrinsicBounds(
+ null, getResources().getDrawable(R.mipmap.wo_t), null, null);
+ getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
+ }
+ }
+ });
mCurrentTab = activityMainBinding.contactBtnGroup;
resetTabSkin(isCommonSkin);
checkZhiWen();
@@ -840,7 +868,7 @@ public class MainActivity extends BaseActivity {
if (obj instanceof HmsScan) {
if (!TextUtils.isEmpty(((HmsScan) obj).getOriginalValue())) {
String result1 = ((HmsScan) obj).getOriginalValue();
- Log.v("LAILIAOLIAO", "行动码是啥：" + result1);
+ Log.v("LAILIAOLIAO", "二维码是啥：" + result1);
// 开始解析2维码内容并进入相应的处理逻辑
processQRCodeScanResult(this, result1);
}
@@ -899,14 +927,14 @@ public class MainActivity extends BaseActivity {
} else {
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr);
// 2维码内容前缀（形如“time_go_mm://add_user/”）
- LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
+ LogUtils.i("二维码是啥111：" + GsonUtils.beanToJSONString(qrData));
String scheme = qrData.getScheme();
// 2维码内容（形如“400069”）
String value = qrData.getValue();
String uid = qrData.getUserId();
if (!CommonUtils.isStringEmpty(scheme, true) && !CommonUtils.isStringEmpty(value, true)) {
- LogUtils.i("行动码是啥222：" + scheme);
+ LogUtils.i("二维码是啥222：" + scheme);
switch (scheme) {
case QRCodeScheme.QR_CODE_SCHEME_ADD_USER:
@@ -1015,19 +1043,16 @@ public class MainActivity extends BaseActivity {
private void showGiftView(String machineId, String orderNos, String moneys) {
this.orderNo = orderNos;
- LogUtils.i("进来了啊");
if (bindBean != null) {
if (!bindBean.getPhoneBind()) {
showDialog();
} else if (!bindBean.getPayPasswordSet()) {
showDialogPay();
} else {
- LogUtils.i("进来了啊11111");
if (DataUtils.get(MainActivity.this, "hasFinger", false)) {
showPayCashFingerDialog(machineId, moneys, TYPE_PAYMENT_GIFT);
} else {
- LogUtils.i("进来了啊22222222");
showPayCashDialog(machineId, moneys, TYPE_PAYMENT_GIFT);
}
@@ -1298,12 +1323,10 @@ public class MainActivity extends BaseActivity {
joinTitleTv = (TextView) bottomView.findViewById(R.id.join_title_tv);
groupHeadIv = (ContactAvatarView) bottomView.findViewById(R.id.group_head_iv);
joinTv = (TextView) bottomView.findViewById(R.id.join_tv);
- LogUtils.i("1111111111111111122222222222:" + IMApplication.schemeTeamId);
Team team = NIMClient.getService(TeamService.class).queryTeamBlock(groupId);
groupNameTv = (TextView) bottomView.findViewById(R.id.group_name_tv);
if (team != null) {
- LogUtils.i("11111111111111111333333333333:" + IMApplication.schemeTeamId);
if (TextUtils.isEmpty(team.getIcon())) {
groupHeadIv.setData(com.netease.yunxin.kit.contactkit.ui.R.mipmap.ic_group_defaulthead, "head");
@@ -1312,11 +1335,9 @@ public class MainActivity extends BaseActivity {
}
groupNameTv.setText(team.getName());
if (team.isMyTeam()) {
- LogUtils.i("加入群聊成功1111111111111111111");
joinTitleTv.setText(R.string.jinru_group_txt);
joinTv.setText(R.string.jinru_group_txt);
} else {
- LogUtils.i("加入群聊成功22222222222222");
joinTitleTv.setText(R.string.join_group_txt);
joinTv.setText(R.string.join_group_txt);
@@ -1328,15 +1349,12 @@ public class MainActivity extends BaseActivity {
.withParam(RouterConstant.CHAT_KRY, team)
.withContext(MainActivity.this)
.navigate();
- LogUtils.i("加入群聊成功33333333333333");
} else {
NIMClient.getService(TeamService.class).applyJoinTeam(groupId, null).setCallback(new RequestCallback() {
@Override
public void onSuccess(Team team1) {
- LogUtils.i("加入群聊成功4444444444444444444");
- LogUtils.i("加入群聊成功：" + GsonUtils.beanToJSONString(team1));
bottomSheetDialog.dismiss();
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
@@ -1381,18 +1399,14 @@ public class MainActivity extends BaseActivity {
}
});
} else {
- LogUtils.i("1111111111111111144444444444:" + IMApplication.schemeTeamId);
joinTitleTv.setText(R.string.join_group_txt);
joinTv.setText(R.string.join_group_txt);
getJoinInfo(groupId, false, bottomSheetDialog);
- LogUtils.i("加入群聊成功555555555555");
joinTv.setOnClickListener(v -> NIMClient.getService(TeamService.class).applyJoinTeam(groupId, null).setCallback(new RequestCallback() {
@Override
public void onSuccess(Team team1) {
- LogUtils.i("加入群聊成功：" + GsonUtils.beanToJSONString(true));
- LogUtils.i("加入群聊成功6666666666666666");
bottomSheetDialog.dismiss();
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, team1)
@@ -1436,12 +1450,7 @@ public class MainActivity extends BaseActivity {
}
- coloseIv.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- bottomSheetDialog.dismiss();
- }
- });
+ coloseIv.setOnClickListener(v -> bottomSheetDialog.dismiss());
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
@@ -1459,11 +1468,9 @@ public class MainActivity extends BaseActivity {
@Override
public void onSuccess(Team result) {
if (!b) {
- LogUtils.i("加入群聊成功7777777777777777");
groupHeadIv.setData(result.getIcon(), result.getName());
groupNameTv.setText(result.getName());
} else {
- LogUtils.i("加入群聊成功88888888888888");
dialog.dismiss();
XKitRouter.withKey(RouterConstant.PATH_FUN_CHAT_TEAM_PAGE)
.withParam(RouterConstant.CHAT_KRY, result)
@@ -1488,7 +1495,6 @@ public class MainActivity extends BaseActivity {
private void sendMachine(String scheme) {
scheme = scheme.replace("https://admin.letschat2023.com/#/downLoad", "https://www.baidu.com");
Uri uri = Uri.parse(scheme);
- LogUtils.i("数据是啥：" + scheme);
String id = uri.getQueryParameter("deviceId"); //id 值 10943
Intent intent = new Intent(MainActivity.this, AuthorizeActivity.class);
intent.putExtra("deviceId", id);
@@ -1511,12 +1517,10 @@ public class MainActivity extends BaseActivity {
@Override
public void onSuccess(Result feedbackResp) {
bindBean = feedbackResp.data;
- LogUtils.i("获取到的数据：" + GsonUtils.beanToJSONString(bindBean));
}
@Override
public void onError(int code, String msg) {
- LogUtils.i("获取到的错误:" + code + "" + msg);
}
});
@@ -1524,7 +1528,6 @@ public class MainActivity extends BaseActivity {
@Override
protected void onDestroy() {
- ALog.d(Constant.PROJECT_TAG, "MainActivity:onDestroy");
// EventCenter.unregisterEventNotify(skinNotify);
ChatObserverRepo.unregisterReceiveMessageObserve(receiveMessageObserver);
if (mEventSubscription != null) {
@@ -2004,15 +2007,15 @@ public class MainActivity extends BaseActivity {
if (feedbackResp.data != null && feedbackResp.data.size() > 0) {
for (ConfigBean configBean : feedbackResp.data) {
-// if (configBean.getId() == 1) {
-// DataUtils.set(MainActivity.this, "transfer_cash", configBean.getVal().equals("1"));
-// }
+ if (configBean.getId() == 1) {
+ DataUtils.set(MainActivity.this, "transfer_cash", configBean.getVal().equals("1"));
+ }
// if (configBean.getId() == 2) {
// DataUtils.set(MainActivity.this, "transfer_jifen", configBean.getVal().equals("1"));
// }
- if (configBean.getId() == 3) {
- DataUtils.set(MainActivity.this, "transfer_score", configBean.getVal().equals("1"));
- }
+// if (configBean.getId() == 3) {
+// DataUtils.set(MainActivity.this, "transfer_score", configBean.getVal().equals("1"));
+// }
if (configBean.getId() == 4) {
DataUtils.set(MainActivity.this, "redpkg_score", configBean.getVal().equals("1"));
}
diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java
index 9b2c87a..e59cad7 100644
--- a/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java
+++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatConversationFragment.java
@@ -660,9 +660,9 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
conversationViewBottom.setViewHolderFactory(funViewHolderFactory);
conversationViewShiJie.setViewHolderFactory(funViewHolderFactory);
if (conversationType == 2) {
- if(ApiService.AREA_CODE.equals("+86")) {
+ if (ApiService.AREA_CODE.equals("+86")) {
viewBinding.layoutShijiechat.setVisibility(View.VISIBLE);
- }else{
+ } else {
viewBinding.layoutShijiechat.setVisibility(View.GONE);
}
@@ -1008,9 +1008,9 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
viewBinding.layoutOneroot.setVisibility(View.GONE);
viewBinding.layoutShijiechat.setVisibility(View.GONE);
} else {
- if(ApiService.AREA_CODE.equals("+86")) {
+ if (ApiService.AREA_CODE.equals("+86")) {
viewBinding.layoutShijiechat.setVisibility(View.VISIBLE);
- }else{
+ } else {
viewBinding.layoutShijiechat.setVisibility(View.GONE);
}
@@ -1125,11 +1125,32 @@ public class ChatConversationFragment extends BaseFragment implements ILoadListe
View bottomView = LayoutInflater.from(getActivity()).inflate(R.layout.bottom_sheet_layout_conversation, null);
bottomSheetDialog.setContentView(bottomView);
bottomSheetDialog.show();
-
+ TextView zhiding_tv = (TextView) bottomView.findViewById(R.id.zhiding_tv);
TextView coloseIv1 = (TextView) bottomView.findViewById(R.id.colose_iv);
TextView hideTv = (TextView) bottomView.findViewById(R.id.hide_tv);
TextView deleteTv = (TextView) bottomView.findViewById(R.id.delete_tv);
+ if (dataBean.infoData.isStickTop()) {
+ zhiding_tv.setText(getString(com.netease.yunxin.kit.conversationkit.ui.R.string.cancel_stick_title));
+ } else {
+ zhiding_tv.setText(getString(com.netease.yunxin.kit.conversationkit.ui.R.string.stick_title));
+
+ }
+
+ zhiding_tv.setOnClickListener(v -> {
+ if (dataBean.infoData.isStickTop()) {
+ viewModel.removeStick((ConversationBean) data);
+// NIMClient.getService(MsgService.class).removeStickTopSession(dataBean.infoData.getContactId(), dataBean.infoData.getSessionType(),""); //删除会话 没删聊天记录
+
+ } else {
+ viewModel.addStickTop((ConversationBean) data);
+// NIMClient.getService(MsgService.class).addStickTopSession(dataBean.infoData.getContactId(), dataBean.infoData.getSessionType(),""); //删除会话 没删聊天记录
+
+ }
+ bottomSheetDialog.dismiss();
+
+ });
+
coloseIv1.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
diff --git a/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java b/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java
index 154608c..346d91d 100644
--- a/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java
+++ b/app/src/main/java/com/hbl/lewan/main/chat/ChatTabFragment.java
@@ -23,6 +23,7 @@ import com.hbl.lewan.IMUIKitConfig;
import com.hbl.lewan.R;
import com.hbl.lewan.databinding.FragmentChatBinding;
import com.hbl.lewan.imkit.selector.FunContactSelectorActivity;
+import com.hbl.lewan.imkit.verify.FunVerifyListActivity;
import com.hbl.lewan.main.FragmentAdapter;
import com.hbl.lewan.main.MainActivity;
import com.hbl.lewan.main.index.add.AddFriendsActivity;
@@ -48,9 +49,11 @@ import com.netease.yunxin.kit.chatkit.repo.ContactRepo;
import com.netease.yunxin.kit.chatkit.ui.fun.FunChatForwardSelectDialog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.utils.NetworkUtils;
+import com.netease.yunxin.kit.contactkit.ui.fun.contact.FunContactFragment;
import com.netease.yunxin.kit.contactkit.ui.fun.search.FunSearchActivity;
import com.netease.yunxin.kit.conversationkit.ui.common.ConversationConstant;
import com.netease.yunxin.kit.conversationkit.ui.model.ConversationBean;
+import com.netease.yunxin.kit.conversationkit.ui.normal.page.ConversationFragment;
import com.netease.yunxin.kit.corekit.event.EventCenter;
import com.netease.yunxin.kit.corekit.event.EventNotify;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
@@ -71,7 +74,8 @@ import io.reactivex.schedulers.Schedulers;
public class ChatTabFragment extends BaseFragment {
FragmentChatBinding viewBinding;
- ChatConversationFragment allConversationFragment;
+// ChatConversationFragment allConversationFragment;
+ ConversationFragment contactFragment;
ChatConversationFragment friendConversationFragment;
ChatConversationFragment teamConversationFragment;
// FollowListFragment followListFragment;
@@ -243,7 +247,7 @@ public class ChatTabFragment extends BaseFragment {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result feedbackResp) {
- LogUtils.i("获取到的错误:" + feedbackResp + "" + feedbackResp.data);
+ LogUtils.i("获取到:" + feedbackResp + "" + feedbackResp.data);
int count = feedbackResp.data.getSystemMsgCount();
int activityMsgCount = feedbackResp.data.getActivityMsgCount();
int msgcount = DataUtils.get(getActivity(), "activity_message_count", 0);
@@ -314,7 +318,8 @@ public class ChatTabFragment extends BaseFragment {
public void initView() {
tabView = new View[]{viewBinding.layoutChatfmAll, viewBinding.layoutChatfmFriends, viewBinding.layoutChatfmGroup, viewBinding.layoutChatfmFollow};
- fragments.add(allConversationFragment = ChatConversationFragment.newInstance(0));
+// fragments.add(allConversationFragment = ChatConversationFragment.newInstance(0));
+ fragments.add(contactFragment = new ConversationFragment());
// fragments.add(friendConversationFragment = ChatConversationFragment.newInstance(1));
// fragments.add(teamConversationFragment = ChatConversationFragment.newInstance(2));
// followListFragment = new FollowListFragment();
@@ -348,7 +353,9 @@ public class ChatTabFragment extends BaseFragment {
viewBinding.ivIndexfmNotifytop.setOnClickListener(v -> {
notifyCount = 0;
setNotifyTotalCount();
- startActivity(new Intent(getActivity(), NotifyMessageActivity.class));
+// startActivity(new Intent(getActivity(), NotifyMessageActivity.class));
+ startActivity(new Intent(getActivity(), FunVerifyListActivity.class));
+
});
viewBinding.layoutChatfmCommonSearch.getRoot().setOnClickListener(view -> startActivity(new Intent(getActivity(), FunSearchActivity.class))
);
diff --git a/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java b/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java
index 242d87d..fe94d31 100644
--- a/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java
+++ b/app/src/main/java/com/hbl/lewan/main/home/HomeFragment.java
@@ -465,7 +465,7 @@ public class HomeFragment extends BaseFragment {
public void onResume() {
super.onResume();
getWallet();
- getNotifiesCount();
+// getNotifiesCount();
if (verifyCount > 0) {
getNotificationUnreadCount();
}
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 169ef8c..0f5f9ed 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
@@ -457,7 +457,7 @@ public class AddFriendsActivity extends LllChatBaseActivity {
String result1 = ((HmsScan) obj).getOriginalValue();
// String result = CameraScan.parseScanResult(data);
// Log.v(TAG, "2维码扫码结果：" + result);
- Log.v("LAILIAOLIAO", "行动码是啥：" + result1);
+ Log.v("LAILIAOLIAO", "二维码是啥：" + result1);
// 开始解析2维码内容并进入相应的处理逻辑
processQRCodeScanResult(this, result1);
@@ -515,14 +515,14 @@ public class AddFriendsActivity extends LllChatBaseActivity {
} else {
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr);
// 2维码内容前缀（形如“time_go_mm://add_user/”）
- LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
+ LogUtils.i("二维码是啥111：" + GsonUtils.beanToJSONString(qrData));
String scheme = qrData.getScheme();
// 2维码内容（形如“400069”）
String value = qrData.getValue();
String uid = qrData.getUserId();
if (!CommonUtils.isStringEmpty(scheme, true) && !CommonUtils.isStringEmpty(value, true)) {
- LogUtils.i("行动码是啥222：" + scheme);
+ LogUtils.i("二维码是啥222：" + scheme);
switch (scheme) {
case QRCodeScheme.QR_CODE_SCHEME_ADD_USER:
diff --git a/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java
index 8e59fd1..dbd16f2 100644
--- a/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java
+++ b/app/src/main/java/com/hbl/lewan/main/mine/AccountAndSecurityActivity.java
@@ -120,7 +120,7 @@ public class AccountAndSecurityActivity extends BaseActivity {
//
// wxAPI = WXAPIFactory.createWXAPI(this, IMUIKitConfig.WECHAT_APPID, true);
// wxAPI.registerApp(IMUIKitConfig.WECHAT_APPID);
-// initListeners();
+ initListeners();
}
@@ -183,6 +183,10 @@ public class AccountAndSecurityActivity extends BaseActivity {
viewBinding.settingTitleBar.setOnBackIconClickListener(v -> onBackPressed());
viewBinding.zhmmBt.setOnClickListener(v -> {
+ if(loginBean!=null&&(loginBean.getUserType()+"").equals("2")){
+ ToastX.showShortToast("副号不支持修改密码");
+ return;
+ }
if (bean != null) {
if (bean.getPhoneBind() == false) {
showDialog();
@@ -200,6 +204,11 @@ public class AccountAndSecurityActivity extends BaseActivity {
});
viewBinding.bindPhoneBt.setOnClickListener(v -> {
+ if(loginBean!=null&&(loginBean.getUserType()+"").equals("2")){
+ ToastX.showShortToast("副号不支持修改手机号");
+ return;
+
+ }
if (bean != null && bean.getPhoneBind() == false) {
Intent intent = new Intent(AccountAndSecurityActivity.this, ChangeAccoutActionActivity.class);
intent.putExtra("type", ChangeAccoutActionActivity.TYPE_BIND_PHONE);
@@ -221,6 +230,10 @@ public class AccountAndSecurityActivity extends BaseActivity {
// }
});
viewBinding.accoutBt.setOnClickListener(v -> {
+ if(loginBean!=null&&(loginBean.getUserType()+"").equals("2")){
+ ToastX.showShortToast("副号不支持修改乐玩账号");
+ return;
+ }
startActivityForResult(new Intent(AccountAndSecurityActivity.this, SettingAccoutIdActivity.class), 888);
});
viewBinding.closeAccount.setOnClickListener(v -> {
@@ -297,8 +310,10 @@ public class AccountAndSecurityActivity extends BaseActivity {
bean = feedbackResp.data;
//只有这是个参数允许切换
// viewBinding.bindWechatTv.setText(feedbackResp.data.getWechatBind()?getString(R.string.yibangding_txt):getString(R.string.weibangding_txt));
- viewBinding.bindPhoneTv.setText(feedbackResp.data.getPhoneBind() ? (feedbackResp.data.getAreaCode() + feedbackResp.data.getPhone()) : getString(R.string.weibangding_txt));
+ if(!loginBean.getUserType().equals("2")) {
+ viewBinding.bindPhoneTv.setText(feedbackResp.data.getPhoneBind() ? (feedbackResp.data.getAreaCode() + feedbackResp.data.getPhone()) : getString(R.string.weibangding_txt));
+ }
}
@Override
@@ -329,22 +344,26 @@ public class AccountAndSecurityActivity extends BaseActivity {
@Override
public void onSuccess(Result feedbackResp) {
- LoginBean loginBean = DataUtils.getLocUserInfo();
+ LoginBean loginBean1 = DataUtils.getLocUserInfo();
- if (loginBean != null) {
+ if (loginBean1 != null) {
//只有这是个参数允许切换
- loginBean.setNwId(feedbackResp.data.getNwId());
- loginBean.setNwIdSetTime(feedbackResp.data.getNwIdSetTime());
- loginBean.getUser().setNwId(feedbackResp.data.getNwId());
- loginBean.getUser().setNwIdSetTime(feedbackResp.data.getNwIdSetTime());
- DataUtils.set(AccountAndSecurityActivity.this, "login_bean", GsonUtils.beanToJSONString(loginBean));
-
+ loginBean1.setNwId(feedbackResp.data.getNwId());
+ loginBean1.setNwIdSetTime(feedbackResp.data.getNwIdSetTime());
+ loginBean1.getUser().setNwId(feedbackResp.data.getNwId());
+ loginBean1.getUser().setNwIdSetTime(feedbackResp.data.getNwIdSetTime());
+ loginBean1.getUser().setUserType(feedbackResp.data.getUserType());
+ DataUtils.set(AccountAndSecurityActivity.this, "login_bean", GsonUtils.beanToJSONString(loginBean1));
+ loginBean = loginBean1;
if (TextUtils.isEmpty(loginBean.getNwId())) {
viewBinding.accoutTv.setText(getString(R.string.weishezhi_txt));
} else {
viewBinding.accoutTv.setText(loginBean.getNwId());
}
+ if(feedbackResp.data.getUserType().equals("2")){
+ viewBinding.bindPhoneTv.setText(feedbackResp.data.getUser_mail());
+ }
}
}
diff --git a/app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java
index 0967dd8..21bb9e1 100644
--- a/app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java
+++ b/app/src/main/java/com/hbl/lewan/main/mine/AccoutListActivity.java
@@ -10,6 +10,7 @@ import android.text.TextUtils;
import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
+import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -58,11 +59,14 @@ import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.SetPayPasswordActivity;
import com.hbl.lewan.wallet.TopUpActivity;
+import com.hbl.lewan.welcome.WelcomeActivity;
import com.hbl.lewan.widget.CircleImageView;
import com.netease.nimlib.sdk.auth.LoginInfo;
import com.netease.yunxin.kit.alog.ALog;
import com.netease.yunxin.kit.chatkit.ui.common.RxBus;
+import com.netease.yunxin.kit.chatkit.ui.data.ChatDatabase;
import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
+import com.netease.yunxin.kit.common.ui.dialog.LoadingDialog;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
import com.netease.yunxin.kit.corekit.im.login.LoginCallback;
@@ -96,6 +100,7 @@ public class AccoutListActivity extends BaseActivity {
iniAdapter();
accounts();
}
+ Handler handler = new Handler();
private void accounts() {
@@ -107,6 +112,7 @@ public class AccoutListActivity extends BaseActivity {
public void onSuccess(Result> feedbackResp) {
if (feedbackResp.data != null && feedbackResp.data.size() > 0) {
globalAmountList = (ArrayList) feedbackResp.data;
+// globalAmountList.add(new AccountsBean(-1));
commonAdapter.setDates(globalAmountList);
}
}
@@ -127,32 +133,46 @@ public class AccoutListActivity extends BaseActivity {
@Override
public void convert(ViewHolder holder, AccountsBean s, int index) {
//{"userId":61330234,"phone":"jue00lie","nickname":"jue00lie","avatar":null}
- holder.setText(R.id.title_tv, s.getNickname());
- holder.setText(R.id.des_tv, "ID:" + s.getUserId());
- CircleImageView item_iv = holder.getView(R.id.item_iv);
- Glide.with(AccoutListActivity.this).load(s.getAvatar()).placeholder(R.mipmap.default_head_img).error(R.mipmap.default_head_img).into(item_iv);
- TextView dqsy_tv = holder.getView(R.id.dqsy_tv);
- if (IMKitClient.account().equals(s.getUserId() + "")) {
- dqsy_tv.setVisibility(View.VISIBLE);
- } else {
- dqsy_tv.setVisibility(View.GONE);
- }
+ LinearLayout user_ly = holder.getView(R.id.user_ly);
+ TextView add_accout_ly = holder.getView(R.id.add_accout_ly);
TextView unreadTv = holder.getView(R.id.unreadTv);
+ TextView dqsy_tv = holder.getView(R.id.dqsy_tv);
+ CircleImageView item_iv = holder.getView(R.id.item_iv);
+
+ dqsy_tv.setVisibility(View.GONE);
unreadTv.setVisibility(View.GONE);
+ if (s.getUserId() == -1) {
+ add_accout_ly.setVisibility(View.VISIBLE);
+ user_ly.setVisibility(View.GONE);
+ item_iv.setImageResource(R.mipmap.add_accouts_img);
+ holder.getView(R.id.big_bg).setOnClickListener(v -> {
- if (index == 0) {
- unreadTv.setVisibility(View.VISIBLE);
- }
-
- holder.getView(R.id.big_bg).setOnClickListener(v -> {
+ ToastX.showShortToast("去添加账号");
+ });
+ } else {
+ add_accout_ly.setVisibility(View.GONE);
+ user_ly.setVisibility(View.VISIBLE);
+ holder.setText(R.id.title_tv, s.getNickname());
+ holder.setText(R.id.des_tv, "ID:" + s.getNwId());
+ Glide.with(AccoutListActivity.this).load(s.getAvatar()).placeholder(R.mipmap.default_head_img).error(R.mipmap.default_head_img).into(item_iv);
if (IMKitClient.account().equals(s.getUserId() + "")) {
- return;
+ dqsy_tv.setVisibility(View.VISIBLE);
} else {
- changeUser(s);
+ dqsy_tv.setVisibility(View.GONE);
}
+ if (index == 0) {
+ unreadTv.setVisibility(View.VISIBLE);
+ }
+ holder.getView(R.id.big_bg).setOnClickListener(v -> {
- });
+ if (!IMKitClient.account().equals(s.getUserId() + "")) {
+ changeUser(s);
+ }
+
+ });
+
+ }
}
};
viewBinding.recycler.setAdapter(commonAdapter);
@@ -161,8 +181,32 @@ public class AccoutListActivity extends BaseActivity {
}
private void changeUser(AccountsBean s) {
+ showLoadingDialog("正在切换账号");
+ IMKitClient.logoutIM(
+ new com.netease.yunxin.kit.corekit.im.login.LoginCallback() {
+ @Override
+ public void onError(int errorCode, @NonNull String errorMsg) {
+ DataUtils.set(AccoutListActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
+ DataUtils.set(AccoutListActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
+ ChatDatabase.chatDatabase = null;
+ handler.postDelayed(() -> changeUserNew(s),3000);
+ }
- Api.getInstance().changeAccount(s.getUserId()+"")
+ @Override
+ public void onSuccess(@Nullable Void data) {
+ DataUtils.set(AccoutListActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, "");
+ DataUtils.set(AccoutListActivity.this, IMUIKitConfig.LOGIN_TOKEN, "");
+ ChatDatabase.chatDatabase = null;
+ handler.postDelayed(() -> changeUserNew(s),3000);
+ }
+ });
+
+
+
+ }
+
+ private void changeUserNew(AccountsBean s) {
+ Api.getInstance().changeAccount(s.getUserId() + "")
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@@ -170,6 +214,7 @@ public class AccoutListActivity extends BaseActivity {
public void onSuccess(Result feedbackResp) {
if (TextUtils.isEmpty(feedbackResp.data.getUser().getChatToken())) {
+ dimessLoadingDialog();
ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(AccoutListActivity.this, getString(R.string.zhbhf_jqsb_txt), false);
actionConfirmDialog.show();
return;
@@ -184,11 +229,10 @@ public class AccoutListActivity extends BaseActivity {
@Override
public void onError(int code, String msg) {
+ dimessLoadingDialog();
ToastX.showShortToast(msg);
}
});
-
-
}
private void loginIM(String account, String token) {
@@ -203,12 +247,14 @@ public class AccoutListActivity extends BaseActivity {
new LoginCallback<>() {
@Override
public void onError(int errorCode, @NonNull String errorMsg) {
+ dimessLoadingDialog();
ToastX.showShortToast(
String.format(getResources().getString(R.string.login_fail), errorCode));
}
@Override
public void onSuccess(@Nullable LoginInfo data) {
+ dimessLoadingDialog();
DataUtils.set(AccoutListActivity.this, IMUIKitConfig.LOGIN_ACCOUNT, account);
DataUtils.set(AccoutListActivity.this, IMUIKitConfig.LOGIN_TOKEN, token);
DataUtils.set(AccoutListActivity.this, "last_login_time", System.currentTimeMillis());
@@ -219,8 +265,31 @@ public class AccoutListActivity extends BaseActivity {
}
+ public LoadingDialog loadingDialog;
+
+ public void showLoadingDialog() {
+ if (loadingDialog == null)
+ loadingDialog = new LoadingDialog(this);
+ loadingDialog.show();
+ }
+
+ public void showLoadingDialog(String msg) {
+ if (loadingDialog == null)
+ loadingDialog = new LoadingDialog(this);
+ loadingDialog.setLoadingText(msg);
+ loadingDialog.show();
+ }
+
+
+ public void dimessLoadingDialog() {
+ if (loadingDialog != null) {
+ loadingDialog.dismiss();
+ }
+
+ }
+
private void showMainActivityAndFinish() {
- ALog.d(Constant.PROJECT_TAG, AccoutListActivity.class.getName(), "showMainActivityAndFinish");
+ ALog.d(Constant.PROJECT_TAG, AccoutListActivity.class.getName(), "showMainActivityAndFinish");
RxBus.getInstance().post(117765); //5秒
Intent intent = new Intent();
diff --git a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java
index 54befa5..6e0cadc 100644
--- a/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java
+++ b/app/src/main/java/com/hbl/lewan/main/mine/MineFragment.java
@@ -82,6 +82,8 @@ import java.util.List;
import java.util.Map;
import com.hbl.lewan.dialog.SelectLanguageDialog;
+import com.netease.yunxin.kit.corekit.im.utils.RouterConstant;
+import com.netease.yunxin.kit.corekit.route.XKitRouter;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -255,8 +257,12 @@ public class MineFragment extends BaseFragment {
checkAccounts();
});
- binding.friendTv.setOnClickListener(v -> startActivity(new Intent(getActivity(), FriendPermissionsActivity.class)));
-
+ binding.friendTv.setOnClickListener(v ->
+ XKitRouter.withKey(RouterConstant.PATH_FUN_MY_BLACK_PAGE)
+ .withContext(getActivity())
+ .navigate()
+ );
+// startActivity(new Intent(getActivity(), FriendPermissionsActivity.class))
binding.toMerchantTv.setOnClickListener(v -> {
Intent intent = new Intent(getActivity(), JsBridgeActivity.class);
intent.putExtra("url", IMUIKitConfig.MERCHANT_URL);
@@ -276,10 +282,10 @@ public class MineFragment extends BaseFragment {
.subscribe(new BaseObserver<>() {
@Override
public void onSuccess(Result> feedbackResp) {
- if(feedbackResp.data!=null && feedbackResp.data.size()>1){
- startActivity(new Intent(getActivity(),AccoutListActivity.class));
- }else{
- ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(getActivity(), "当前没有副号，是否需要购买", "取消","购买",true);
+ if (feedbackResp.data != null && feedbackResp.data.size() > 1) {
+ startActivity(new Intent(getActivity(), AccoutListActivity.class));
+ } else {
+ ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(getActivity(), "当前没有副号，是否需要购买?", "取消", "购买", true);
actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
@Override
public void toSumbit() {
@@ -302,6 +308,8 @@ public class MineFragment extends BaseFragment {
}
});
+// startActivity(new Intent(getActivity(),AccoutListActivity.class));
+
}
private void toWalletInfo(boolean b) {
@@ -364,7 +372,7 @@ public class MineFragment extends BaseFragment {
private void getVersion() {
try {
- Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86")?7:0, DataUtils.getVersionCode(getActivity()), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
+ Api.getInstance().version(com.hbl.lewan.network.ApiService.AREA_CODE.equals("+86") ? 7 : 0, DataUtils.getVersionCode(getActivity()), com.netease.yunxin.kit.chatkit.ui.network.ApiService.SUBSTATIONID1)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BaseObserver<>() {
@@ -377,7 +385,7 @@ public class MineFragment extends BaseFragment {
VersionDialog actionDialog = new VersionDialog(getActivity(),
String.format(getString(R.string.updateversion_txt), versionBean.getVersionName()),
getDownloadText(versionBean), getString(R.string.xiacigengxin_txt),
- getString(R.string.login_form_have_latest_version_update_now),versionBean.getForceDownload()==0);
+ getString(R.string.login_form_have_latest_version_update_now), versionBean.getForceDownload() == 0);
actionDialog.setOnToActionListener(new VersionDialog.OnToActionListener() {
@Override
public void toSumbit() {
@@ -419,7 +427,7 @@ public class MineFragment extends BaseFragment {
}
private void checkUpdate(String url) {
- new AppUpdater(getActivity(), url).start();
+ new AppUpdater(getActivity(), url).start();
// Intent intent = new Intent(Intent.ACTION_VIEW);
// intent.setData(Uri.parse(url));
// startActivity(intent);
@@ -431,16 +439,16 @@ public class MineFragment extends BaseFragment {
int loc = DataUtils.get(getActivity(), "locale", 1);
switch (loc) {
case 1:
- name = versionBean.getUpgradeHintZhCn().replace("\\n","\n");
+ name = versionBean.getUpgradeHintZhCn().replace("\\n", "\n");
break;
case 2:
- name = versionBean.getUpgradeHintEnUs().replace("\\n","\n");
+ name = versionBean.getUpgradeHintEnUs().replace("\\n", "\n");
break;
case 3:
- name = versionBean.getUpgradeHintJaJp().replace("\\n","\n");
+ name = versionBean.getUpgradeHintJaJp().replace("\\n", "\n");
break;
default:
- name = versionBean.getUpgradeHintZhTw().replace("\\n","\n");
+ name = versionBean.getUpgradeHintZhTw().replace("\\n", "\n");
break;
}
diff --git a/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java
index 07270af..c08a94e 100644
--- a/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java
+++ b/app/src/main/java/com/hbl/lewan/main/mine/SettingAccoutIdActivity.java
@@ -107,6 +107,7 @@ public class SettingAccoutIdActivity extends BaseActivity {
loginBean.setNwIdSetTime(feedbackResp.data.getNwIdSetTime());
loginBean.getUser().setNwId(feedbackResp.data.getNwId());
loginBean.getUser().setNwIdSetTime(feedbackResp.data.getNwIdSetTime());
+ loginBean.getUser().setUserType(feedbackResp.data.getUserType());
DataUtils.set(SettingAccoutIdActivity.this, "login_bean", GsonUtils.beanToJSONString(loginBean));
showChange(loginBean);
diff --git a/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java
index 83c853a..bbd2afa 100644
--- a/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java
+++ b/app/src/main/java/com/hbl/lewan/main/mine/UserHeadEditActivity.java
@@ -243,7 +243,7 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
String stsCredentialsBean;
private void toShangchuanAli(File file, boolean isHead) {
- showLoadingDialog();
+ showLoadingDialog(isHead?"正在上传头像":"正在上传背景图");
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -342,6 +342,7 @@ public class UserHeadEditActivity extends BaseActivity implements CommonCallback
} else {
// 上传失败
LogUtils.i("结果是啥失败：" + GsonUtils.beanToJSONString(info));
+ ToastX.showShortToast(info.error);
}
}, options);
}
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 4d615af..910efec 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
@@ -233,7 +233,7 @@ public class UserInfoActivity extends BaseActivity {
String result1 = ((HmsScan) obj).getOriginalValue();
// String result = CameraScan.parseScanResult(data);
// Log.v(TAG, "2维码扫码结果：" + result);
- Log.v("LAILIAOLIAO", "行动码是啥：" + result1);
+ Log.v("LAILIAOLIAO", "二维码是啥：" + result1);
// 开始解析2维码内容并进入相应的处理逻辑
processQRCodeScanResult(this, result1);
@@ -294,7 +294,7 @@ public class UserInfoActivity extends BaseActivity {
} else {
QRCodeScheme.QRCodeData qrData = QRCodeScheme.parseCodeData(originalQrcodeStr);
// 2维码内容前缀（形如“time_go_mm://add_user/”）
- LogUtils.i("行动码是啥111：" + GsonUtils.beanToJSONString(qrData));
+ LogUtils.i("二维码是啥111：" + GsonUtils.beanToJSONString(qrData));
String scheme = qrData.getScheme();
// 2维码内容（形如“400069”）
@@ -302,7 +302,7 @@ public class UserInfoActivity extends BaseActivity {
String uid = qrData.getUserId();
if (!CommonUtils.isStringEmpty(scheme, true) && !CommonUtils.isStringEmpty(value, true)) {
- LogUtils.i("行动码是啥222：" + scheme);
+ LogUtils.i("二维码是啥222：" + scheme);
switch (scheme) {
case QRCodeScheme.QR_CODE_SCHEME_ADD_USER:
@@ -751,6 +751,11 @@ public class UserInfoActivity extends BaseActivity {
v -> EditUserInfoActivity.launch(getApplicationContext(), Constant.EDIT_EMAIL, launcher));
binding.flPhone.setOnClickListener(
v -> {
+ if(locUser!=null&&(locUser.getUserType()+"").equals("2")){
+ ToastX.showShortToast("副号不支持修改手机号");
+ return;
+ }
+
if (bean != null && bean.getPhoneBind() == false) {
Intent intent = new Intent(UserInfoActivity.this, ChangeAccoutActionActivity.class);
intent.putExtra("type", ChangeAccoutActionActivity.TYPE_BIND_PHONE);
@@ -895,7 +900,8 @@ public class UserInfoActivity extends BaseActivity {
public void onSuccess(Result feedbackResp) {
bean = feedbackResp.data;
//只有这是个参数允许切换
- binding.tvPhone.setText(bean.getAreaCode() + "" + bean.getPhone());
+ if(!loginBean.getUserType().equals("2"))
+ binding.tvPhone.setText(bean.getAreaCode()+""+bean.getPhone());
}
@@ -980,6 +986,9 @@ public class UserInfoActivity extends BaseActivity {
@Override
public void onSuccess(Result feedbackResp) {
locUser = feedbackResp.data;
+ if(feedbackResp.data.getUserType().equals("2")) {
+ binding.tvPhone.setText(locUser.getUser_mail());
+ }
changeIndex(feedbackResp.data);
}
diff --git a/app/src/main/java/com/hbl/lewan/model/AccountsBean.java b/app/src/main/java/com/hbl/lewan/model/AccountsBean.java
index c89f140..1f037e9 100644
--- a/app/src/main/java/com/hbl/lewan/model/AccountsBean.java
+++ b/app/src/main/java/com/hbl/lewan/model/AccountsBean.java
@@ -13,6 +13,22 @@ public class AccountsBean {
private String phone;
private String nickname;
private String avatar;
+ private String nwId;
+
+ public AccountsBean() {
+ }
+
+ public AccountsBean(int userId) {
+ this.userId = userId;
+ }
+
+ public String getNwId() {
+ return nwId;
+ }
+
+ public void setNwId(String nwId) {
+ this.nwId = nwId;
+ }
public int getUserId() {
return userId;
diff --git a/app/src/main/java/com/hbl/lewan/network/ApiService.java b/app/src/main/java/com/hbl/lewan/network/ApiService.java
index c175e92..9cdacf0 100644
--- a/app/src/main/java/com/hbl/lewan/network/ApiService.java
+++ b/app/src/main/java/com/hbl/lewan/network/ApiService.java
@@ -1,7 +1,6 @@
package com.hbl.lewan.network;
-import com.blankj.utilcode.util.LogUtils;
import com.hbl.lewan.BuildConfig;
import com.hbl.lewan.model.AccountsBean;
import com.hbl.lewan.model.ActivityMsgBean;
@@ -71,13 +70,11 @@ import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketGroupBean;
import com.netease.yunxin.kit.chatkit.ui.model.TransferBean;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.reactivex.Observable;
import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.DELETE;
import retrofit2.http.Field;
@@ -1211,6 +1208,13 @@ public interface ApiService {
Observable>> withdraw(@Query("page") int page, @Query("size") int size);
+
+ @POST("/group/switch")
+ Observable groupSwitch(@Body Map requestBody);
+
+
+
+
}
diff --git a/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java
index e76372c..5961179 100644
--- a/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java
+++ b/app/src/main/java/com/hbl/lewan/redpack/ReceiveRedPacketActivity.java
@@ -29,6 +29,7 @@ import com.hbl.lewan.utils.GsonUtils;
import com.hbl.lewan.utils.ImageCacheLoader;
import com.hbl.lewan.utils.LogUtils;
import com.hbl.lewan.wallet.WalletInfoActivity;
+import com.hbl.lewan.wallet.WalletInfoNewActivity;
import com.netease.nimlib.sdk.NIMClient;
import com.netease.nimlib.sdk.uinfo.UserService;
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
@@ -331,9 +332,9 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
viewBinding.toWalletTv.setText(R.string.ddfglq_txt);
// titleTipsTvuser.setText(String.format("1个红包共%s%.2f",getString(R.string.danwei_txt), redpacketBean.getAmount() / 100f));
if (redpacketBean.getCoinType() == 0) {
- viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) + AppUtils.getQian(redpacketGroupBean.getAmount()) + getTypeName() + "，等待对方领取");
+ viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) + AppUtils.getQian(redpacketBean.getAmount()) + getTypeName() + "，等待对方领取");
} else {
- viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) +AppUtils.getQian(redpacketGroupBean.getAmount()) + getTypeName() + "，等待对方领取");
+ viewBinding.titleTipsTvuser.setText(getString(R.string.red_envelope_amount_txt) +AppUtils.getQian(redpacketBean.getAmount()) + getTypeName() + "，等待对方领取");
}
} else if (redpacketBean.getStatus() == 1) {
@@ -348,7 +349,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
viewBinding.toWalletTv.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ReceiveRedPacketActivity.this, WalletInfoActivity.class);
+ Intent intent = new Intent(ReceiveRedPacketActivity.this, WalletInfoNewActivity.class);
intent.putExtra("isG", redpacketBean.getCoinType().equals(0));
startActivity(intent);
@@ -359,7 +360,7 @@ public class ReceiveRedPacketActivity extends BaseActivity implements View.OnCli
}
viewBinding.endLy.setVisibility(View.GONE);
- viewBinding.priceTv.setText(AppUtils.getQian(redpacketGroupBean.getAmount()) + getTypeName());
+ viewBinding.priceTv.setText(AppUtils.getQian(redpacketBean.getAmount()) + getTypeName());
viewBinding.timeTv.setText(redpacketBean.getReceiveTime() + "");
if ((redpacketBean.getReceiverUid() + "").equals(IMKitClient.account())) {
diff --git a/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java b/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java
index 150ccce..d4ea8d8 100644
--- a/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java
+++ b/app/src/main/java/com/hbl/lewan/redpack/SendGiftRedPacketActivity.java
@@ -319,12 +319,13 @@ public class SendGiftRedPacketActivity extends BaseActivity {
}
} else {
- if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.SINGLE_MAX_MONEY) {
-// ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.SINGLE_MAX_MONEY));
- ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.SINGLE_MAX_MONEY);
- return;
- }
+// if (Float.parseFloat(viewBinding.numberHintEt.getText().toString().trim()) > IMUIKitConfig.SINGLE_MAX_MONEY) {
+//// ToastUtils.showShort(String.format(getString(R.string.max_red_packet_tips_txt),getString(R.string.danwei_txt),Const.SINGLE_MAX_MONEY));
+// ToastX.showShortToast(getString(R.string.dghbjebndy_txt) + " " + IMUIKitConfig.SINGLE_MAX_MONEY);
+//
+// return;
+// }
}
if (walletBean != null) {
if (Float.parseFloat(viewBinding.numberTv.getText().toString().trim()) > (walletBean.getGiftCoin() / 100f)) {
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 8f67615..739de53 100644
--- a/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java
+++ b/app/src/main/java/com/hbl/lewan/redpack/SendRedPacketActivity.java
@@ -172,7 +172,17 @@ public class SendRedPacketActivity extends BaseActivity {
// this.setTitle(getString(R.string.fshb_txt));
if (isGroup) {
// viewBinding.jintLeftTv.setText(R.string.zjine_txt);
- viewBinding.tipsTv.setVisibility(View.VISIBLE);
+
+ if(getIntent().getBooleanExtra("is_zhuanshu",false)){
+ isPinShouQi = false;
+ userInfo = (UserInfo) getIntent().getSerializableExtra("user_Bean");
+ viewBinding.tipsTv.setVisibility(View.GONE);
+ viewBinding.zhuanshuNextIv.setVisibility(View.GONE);
+ viewBinding.zhuanshuLy.setEnabled(false);
+ }else{
+ viewBinding.tipsTv.setVisibility(View.VISIBLE);
+ }
+
changeType();
diff --git a/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java b/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java
index 3cc4049..c596249 100644
--- a/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java
+++ b/app/src/main/java/com/hbl/lewan/redpack/TransferAccountsActivity.java
@@ -75,7 +75,7 @@ public class TransferAccountsActivity extends BaseActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
- getWindow().setStatusBarColor(getResources().getColor(R.color.color_fffafa));
+ getWindow().setStatusBarColor(getResources().getColor(R.color.white));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_fffafa));
super.onCreate(savedInstanceState);
viewBinding = ActivityTransferAccountsBinding.inflate(getLayoutInflater());
diff --git a/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java b/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java
index 3e03112..0970b2e 100644
--- a/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java
+++ b/app/src/main/java/com/hbl/lewan/redpack/TransferInfoActivity.java
@@ -61,7 +61,7 @@ public class TransferInfoActivity extends BaseActivity
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
- getWindow().setStatusBarColor(getResources().getColor(R.color.color_fcfcfc));
+ getWindow().setStatusBarColor(getResources().getColor(R.color.white));
getWindow().setNavigationBarColor(getResources().getColor(R.color.color_white));
super.onCreate(savedInstanceState);
viewBinding = ActivityTransferInfoBinding.inflate(getLayoutInflater());
diff --git a/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java b/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java
index 2e14013..00f6b66 100644
--- a/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java
+++ b/app/src/main/java/com/hbl/lewan/utils/QRCodeScheme.java
@@ -66,7 +66,7 @@ public class QRCodeScheme {
* 构造指定群聊的加群2维码的字符串。
*
* @param gid 群id
- * @param sharedByUid 行动码分享者的uid
+ * @param sharedByUid 二维码分享者的uid
* @return 将用于生成2维码的字符串
*/
public static String constructJoinGroupCodeStr(@NonNull String gid, @NonNull String sharedByUid) {
@@ -76,7 +76,7 @@ public class QRCodeScheme {
/**
* 解析2维码内容。
*
- * @param qrcodeStr 扫描出的原始行动码字符串
+ * @param qrcodeStr 扫描出的原始二维码字符串
* @return 无论能否成功解析，都会返回QRCodeData对象
*/
public static QRCodeData parseCodeData(String qrcodeStr){
@@ -97,7 +97,7 @@ public class QRCodeScheme {
String scheme = qrcodeStr.substring(0, qrcodeStr.lastIndexOf("/") + 1);
// 2维码内容
String value = qrcodeStr.substring(qrcodeStr.lastIndexOf("/") + 1);
- LogUtils.i("行动码是啥："+scheme+";;"+value);
+ LogUtils.i("二维码是啥："+scheme+";;"+value);
// 设置
d.setScheme(scheme).setValue(value).setUserId(uid);
}
diff --git a/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java b/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
index ae69951..ae23106 100644
--- a/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
+++ b/app/src/main/java/com/hbl/lewan/utils/ShareDateUtils.java
@@ -110,7 +110,7 @@ public class ShareDateUtils {
@Override
public void onSuccess(@Nullable List param) {
for (ConversationInfo conversationInfo : param) {
- LogUtils.i("用户信息：" + GsonUtils.beanToJSONString(conversationInfo));
+// LogUtils.i("用户信息：" + GsonUtils.beanToJSONString(conversationInfo));
if (conversationInfo.getTeamInfo() != null) {
titleUsers.add(new UserShareBean(conversationInfo.getTeamInfo()));
@@ -152,7 +152,7 @@ public class ShareDateUtils {
@Override
public void onSuccess(@Nullable List param) {
for (FriendInfo conversationInfo : param) {
- LogUtils.i("用户信息1：" + GsonUtils.beanToJSONString(conversationInfo));
+// LogUtils.i("用户信息1：" + GsonUtils.beanToJSONString(conversationInfo));
boolean isAt = false;
for (int i = 0; i < titleUsers.size(); i++) {
if (titleUsers.get(i).getFriendInfo() != null) {
diff --git a/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java b/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java
index 81a3a82..9a77f07 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java
+++ b/app/src/main/java/com/hbl/lewan/wallet/BindWeChatOrAliPayActivity.java
@@ -353,7 +353,7 @@ public class BindWeChatOrAliPayActivity extends BaseActivity {
String stsCredentialsBean;
private void toShangchuanAli(File file) {
- showLoadingDialog();
+ showLoadingDialog("正在上传图片");
Api.getInstance().stsCredentials1()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
diff --git a/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java b/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java
index a14733c..4377ef9 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java
+++ b/app/src/main/java/com/hbl/lewan/wallet/MyWalletActivity.java
@@ -14,7 +14,10 @@ import com.hbl.lewan.R;
import com.hbl.lewan.databinding.ActivityMywalletBinding;
import com.hbl.lewan.databinding.ActivityWalletInfoNewBinding;
import com.hbl.lewan.dialog.ActionConfirmDialog;
+import com.hbl.lewan.main.mine.AccoutListActivity;
+import com.hbl.lewan.main.mine.BuyAccountActivity;
import com.hbl.lewan.main.mine.ChangeAccoutActionActivity;
+import com.hbl.lewan.model.AccountsBean;
import com.hbl.lewan.model.BindBean;
import com.hbl.lewan.model.LoginBean;
import com.hbl.lewan.model.WalletBean;
@@ -30,6 +33,8 @@ import com.netease.yunxin.kit.common.ui.activities.BaseActivity;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.corekit.im.IMKitClient;
+import java.util.List;
+
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -59,6 +64,48 @@ public class MyWalletActivity extends BaseActivity {
bindInfo();
}
+
+
+ private void checkAccounts() {
+ Api.getInstance().accounts()
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new BaseObserver<>() {
+ @Override
+ public void onSuccess(Result> feedbackResp) {
+ if(feedbackResp.data!=null && feedbackResp.data.size()>1){
+// startActivity(new Intent(MyWalletActivity.this, AccoutListActivity.class));
+ viewBinding.gmfhLy.setVisibility(View.GONE);
+ viewBinding.gmfhLine.setVisibility(View.GONE);
+ }else{
+ viewBinding.gmfhLy.setVisibility(View.VISIBLE);
+ viewBinding.gmfhLine.setVisibility(View.VISIBLE);
+
+// ActionConfirmDialog actionConfirmDialog = new ActionConfirmDialog(getActivity(), "当前没有副号，是否需要购买", "取消","购买",true);
+// actionConfirmDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
+// @Override
+// public void toSumbit() {
+// startActivity(new Intent(getActivity(), BuyAccountActivity.class));
+// }
+//
+// @Override
+// public void toCancel() {
+//
+// }
+// });
+// actionConfirmDialog.show();
+ }
+ }
+
+ @Override
+ public void onError(int code, String msg) {
+ LogUtils.i("获取到的错误:" + code + "" + msg);
+ ToastX.showShortToast(msg);
+
+ }
+ });
+ }
+
LoginBean locUser;
private void getUserInfo(int type) {
@@ -111,6 +158,8 @@ public class MyWalletActivity extends BaseActivity {
protected void onResume() {
super.onResume();
getWallet();
+ checkAccounts();
+
}
private void bindInfo() {
@@ -134,7 +183,12 @@ public class MyWalletActivity extends BaseActivity {
protected void initView() {
viewBinding.contactListActivityTitleBar.getBackImageView().setOnClickListener(v -> finish());
-
+ viewBinding.gmfhBt.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ startActivity(new Intent(MyWalletActivity.this, BuyAccountActivity.class));
+ }
+ });
viewBinding.lqmxBt.setOnClickListener(v -> {
if (bindBean != null) {
if (!bindBean.getPhoneBind()) {
diff --git a/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java b/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java
index 3bd2784..da1a29a 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java
+++ b/app/src/main/java/com/hbl/lewan/wallet/PaySettingActivity.java
@@ -79,10 +79,19 @@ public class PaySettingActivity extends BaseActivity implements SelectPayTypeDia
viewBinding.mianmiSc.setChecked(DataUtils.get(PaySettingActivity.this, "hasMianMi", false));
viewBinding.zhiwenSc.setChecked(DataUtils.get(PaySettingActivity.this, "hasFinger", false));
viewBinding.mianmiV.setOnClickListener(v -> {
+ if(loginBean!=null&&(loginBean.getUserType()+"").equals("2")){
+ ToastX.showShortToast("副号不支持修改密码");
+ return;
+ }
+
+
if (bean != null && !bean.getPayPasswordSet()) {
showDialogPay();
return;
}
+
+
+
boolean isCheck = DataUtils.get(PaySettingActivity.this, "hasMianMi", false);
if (isCheck) {
@@ -205,6 +214,8 @@ public class PaySettingActivity extends BaseActivity implements SelectPayTypeDia
}
+
+
private void showDialogPay() {
com.netease.yunxin.kit.chatkit.ui.dialog.ActionConfirmDialog actionDialog = new com.netease.yunxin.kit.chatkit.ui.dialog.ActionConfirmDialog(PaySettingActivity.this,
@@ -325,6 +336,10 @@ public class PaySettingActivity extends BaseActivity implements SelectPayTypeDia
@Override
protected void onResume() {
super.onResume();
+
+ loginBean = DataUtils.getLocUserInfo();
+
+
bindInfo(IMKitClient.account());
}
diff --git a/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java b/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java
index 5e12636..9f79bec 100644
--- a/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java
+++ b/app/src/main/java/com/hbl/lewan/wallet/TiXianActivity.java
@@ -276,6 +276,7 @@ public class TiXianActivity extends BaseActivity {
bankBean =aliPayBeans.get(0);
}else{
viewBinding.shoukuanBt.setText("");
+ bankBean = null;
}
if(tiXianConfBean!=null) {
viewBinding.tipsTv.setText(Html.fromHtml("单笔提现手续费" + tiXianConfBean.getBaseFee() + "元
提现费率" + tiXianConfBean.getFeeRate() + "%
预计到账时间2小时以内"));
@@ -291,6 +292,8 @@ public class TiXianActivity extends BaseActivity {
bankBean =bankBeans.get(0);
}else{
viewBinding.shoukuanBt.setText("");
+ bankBean = null;
+
}
if(tiXianConfBean!=null) {
viewBinding.tipsTv.setText(Html.fromHtml("单笔提现手续费" + tiXianConfBean.getBaseFee() + "元
提现费率" + tiXianConfBean.getFeeRate() + "%
预计到账时间2小时以内"));
diff --git a/app/src/main/res/drawable/pass_word_bg1.xml b/app/src/main/res/drawable/pass_word_bg1.xml
new file mode 100644
index 0000000..dfa1cb7
--- /dev/null
+++ b/app/src/main/res/drawable/pass_word_bg1.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_dialog_bg222.xml b/app/src/main/res/drawable/shape_dialog_bg222.xml
new file mode 100644
index 0000000..2a53222
--- /dev/null
+++ b/app/src/main/res/drawable/shape_dialog_bg222.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_base_chatsetting.xml b/app/src/main/res/layout/activity_base_chatsetting.xml
index 00cde0b..842c296 100644
--- a/app/src/main/res/layout/activity_base_chatsetting.xml
+++ b/app/src/main/res/layout/activity_base_chatsetting.xml
@@ -182,7 +182,7 @@
+
+
+
+
+
+
+
+
+
+ android:textSize="@dimen/sp_14" />
@@ -32,67 +31,83 @@
app:layout_constraintTop_toTopOf="parent"
app:titleText="我的钱包"
app:titleTextColor="@android:color/black" />
-
-
-
-
-
-
-
+ android:background="@mipmap/qianbao_top_float_bg"
+ android:orientation="vertical">
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_20"
+ android:text="我的零钱"
+ android:textColor="#ffffffff"
+ android:textSize="14sp" />
+ android:id="@+id/jinbi_yue_tv"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/dp_20"
+ android:layout_marginTop="@dimen/dp_15"
+ android:textColor="#fffcf0a1"
+ android:textSize="30sp" />
+
+
+
+
+
+
+
-
+
+
@@ -223,7 +239,36 @@
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:background="#D8D8D8" />
+
+
+
+
+
+ />
diff --git a/app/src/main/res/layout/activity_team_members1.xml b/app/src/main/res/layout/activity_team_members1.xml
new file mode 100644
index 0000000..bc2f662
--- /dev/null
+++ b/app/src/main/res/layout/activity_team_members1.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_transfer_accounts.xml b/app/src/main/res/layout/activity_transfer_accounts.xml
index d1f4370..b0b85ef 100644
--- a/app/src/main/res/layout/activity_transfer_accounts.xml
+++ b/app/src/main/res/layout/activity_transfer_accounts.xml
@@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/st"
- android:background="@color/color_fffafa"
+ android:background="@color/white"
app:titleText="@string/zhuanzhang_title_txt"
tools:ignore="MissingConstraints" />
@@ -215,6 +215,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
+ android:visibility="gone"
android:layout_marginRight="@dimen/dp_30"
android:orientation="horizontal">
@@ -242,6 +243,7 @@
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_30"
+ android:visibility="gone"
android:orientation="horizontal">
diff --git a/app/src/main/res/layout/activity_transfer_info.xml b/app/src/main/res/layout/activity_transfer_info.xml
index 8e13520..3e1f018 100644
--- a/app/src/main/res/layout/activity_transfer_info.xml
+++ b/app/src/main/res/layout/activity_transfer_info.xml
@@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:titleText="@string/zhuanzhang_title_txt"
- android:background="@color/color_fcfcfc"
+ android:background="@color/white"
tools:ignore="MissingConstraints" />
@@ -122,7 +122,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="50dp"
- android:text="@string/transfer_instructions_txt"
+ android:text="转账说明"
android:textColor="#7E7B84"
android:textSize="14sp" />
@@ -156,7 +156,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="50dp"
- android:text="@string/transfer_time_txt"
+ android:text="转账时间"
android:textColor="#7E7B84"
android:textSize="14sp" />
@@ -204,7 +204,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:minHeight="50dp"
- android:text="赠送说明"
+ android:text="转账说明"
android:textColor="@color/color_333333"
android:textSize="14sp" />
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 84ded80..faef7c6 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -13,7 +13,7 @@
@@ -35,9 +35,8 @@
android:layout_height="@dimen/dp_106"
app:es_shape_type="rectangle"
app:ease_radius="10dp"
- android:visibility="gone"
- android:layout_centerHorizontal="true"
- android:layout_marginTop="@dimen/dp_200"
+ android:visibility="visible"
+ android:layout_centerInParent="true"
android:src="@mipmap/ic_launche" />
@@ -59,7 +58,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
- android:background="@mipmap/start_login1"
+ android:background="@drawable/bg_topup_btn"
android:gravity="center"
android:text="@string/login_txt"
android:textColor="@color/color_white"
@@ -70,9 +69,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_10"
+ android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
- android:background="@mipmap/start_reg1"
+ android:background="@drawable/button_true_bg1"
android:gravity="center"
android:text="@string/reg_txt"
android:textColor="@color/white"
diff --git a/app/src/main/res/layout/bottom_sheet_layout_conversation.xml b/app/src/main/res/layout/bottom_sheet_layout_conversation.xml
index 5e2fa05..7dee494 100644
--- a/app/src/main/res/layout/bottom_sheet_layout_conversation.xml
+++ b/app/src/main/res/layout/bottom_sheet_layout_conversation.xml
@@ -17,7 +17,19 @@
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="vertical">
+
+
diff --git a/app/src/main/res/layout/dialog_pay_finger.xml b/app/src/main/res/layout/dialog_pay_finger.xml
index f3d27f5..39f5938 100644
--- a/app/src/main/res/layout/dialog_pay_finger.xml
+++ b/app/src/main/res/layout/dialog_pay_finger.xml
@@ -119,6 +119,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
+ android:visibility="gone"
android:background="@color/transparent"
android:gravity="center_vertical"
android:text="@string/species_txt"
diff --git a/app/src/main/res/layout/fragment_chat.xml b/app/src/main/res/layout/fragment_chat.xml
index 4ab1223..ca09164 100644
--- a/app/src/main/res/layout/fragment_chat.xml
+++ b/app/src/main/res/layout/fragment_chat.xml
@@ -12,10 +12,9 @@
diff --git a/app/src/main/res/layout/fragment_mine_new.xml b/app/src/main/res/layout/fragment_mine_new.xml
index 1911c96..1b10fe5 100644
--- a/app/src/main/res/layout/fragment_mine_new.xml
+++ b/app/src/main/res/layout/fragment_mine_new.xml
@@ -25,10 +25,9 @@
@@ -174,17 +173,16 @@
+
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index dea09d3..c8b4e9f 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -20,10 +20,12 @@
app:es_shape_type="round"
android:src="@mipmap/ic_launche"/>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/team_members_view_holder2.xml b/app/src/main/res/layout/team_members_view_holder2.xml
new file mode 100644
index 0000000..bc6eb08
--- /dev/null
+++ b/app/src/main/res/layout/team_members_view_holder2.xml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-xxhdpi/add_accouts_img.png b/app/src/main/res/mipmap-xxhdpi/add_accouts_img.png
new file mode 100644
index 0000000..16c245f
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/add_accouts_img.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/goumaifuhao.png b/app/src/main/res/mipmap-xxhdpi/goumaifuhao.png
new file mode 100644
index 0000000..a6e9b16
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/goumaifuhao.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/hbkz_red_img1.png b/app/src/main/res/mipmap-xxhdpi/hbkz_red_img1.png
new file mode 100644
index 0000000..7c91426
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/hbkz_red_img1.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/qianbao_top_float_bg.png b/app/src/main/res/mipmap-xxhdpi/qianbao_top_float_bg.png
index 536bd4c..9423f03 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/qianbao_top_float_bg.png and b/app/src/main/res/mipmap-xxhdpi/qianbao_top_float_bg.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_welcome_bg.png b/app/src/main/res/mipmap-xxxhdpi/ic_welcome_bg.png
index 2be0cbe..2aa328c 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_welcome_bg.png and b/app/src/main/res/mipmap-xxxhdpi/ic_welcome_bg.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index add59ea..a011e4f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -169,7 +169,7 @@
删除
邀请
- 行动码
+ 二维码
搜索
启用
添加
@@ -221,15 +221,15 @@
简体中文
英语
日语
- 使用此行动码或链接来添加好友！
+ 使用此二维码或链接来添加好友！
复制链接
分享
保存
- 刷新行动码
- 行动码已成功保存到系统相册！
- 行动码保存失败！
- 行动码生成失败！
- 行动码分享成功
+ 刷新二维码
+ 二维码已成功保存到系统相册！
+ 二维码保存失败！
+ 二维码生成失败！
+ 二维码分享成功
无效的2维码！
乐玩账号
刷新成功
@@ -239,7 +239,7 @@
个性签名
电话号码
允许他人通过账号添加
- 我的行动码
+ 我的二维码
设置头像与封面
个人资料封面
开启相机
@@ -257,8 +257,8 @@
允许通过群聊方式添加我
黑名单
请设置乐玩账号
- MM账户ID支持英文、数字、下划线
- 请输入MM账户
+ 乐玩账户ID支持英文、数字、下划线
+ 请输入乐玩账户
每月只可修改一次，请谨慎修改！
您暂时不能修改MMID
MMID一个月只可修改一次，您将于%s年%s月%s日才可修改！
@@ -314,7 +314,7 @@
拉黑后好友将进入黑名单您将不再收到对方消息
没有可分享的对象
账号不合法，IM鉴权失败
- 扫描行动码，轻松加好友或启动其他功能！
+ 扫描二维码，轻松加好友或启动其他功能！
不支持的2维码内容！
授权登录
淘乐町门店设备登录
@@ -363,15 +363,15 @@
塞金币进红包
未领取的红包，将于24小时退回
点击选择赠送对象
- 赠送数量
- 赠送给:%s
+ 金额
+ 转账给:%s
手续费
%dcash]]>
%d积分]]>
统计支付数量
当前cash余额不足
当前礼品积分余额不足
- （选填）输入赠送说明
+ （选填）转账说明
发起赠送
24小时内未领取，赠送数量将被自动领取
24小时内未领取，赠送数量将被自动领取
@@ -414,19 +414,19 @@
获取钱包信息失败
塞礼品积分进红包
[礼品积分赠送]
- 赠送数量不能为空
+ 转账金额不能为空
收款数量不能为空
赠送数量不能小于0.01
收款数量不能为空不能小于0.01
获取钱包信息失败
- 确定要退还赠送吗？
- 您确定要退还%s的赠送吗？
+ 确定要退还转账吗？
+ 您确定要退还%s的转账吗？
退还
- 您的Cash被冻结，如需解冻请联系客服
+ 您的余额被冻结，如需解冻请联系客服
联系客服
- 1天内对方未领取，赠送数量将自动打到对方的余额
+ 1天内对方未领取，转账将自动打到对方的余额
待%s收款
%s已收款
%s已自动领取
@@ -441,7 +441,7 @@
已退还
已退还到对方余额
系统已自动退还
- 赠送
+ 转账
发红包
个
[短影音消息]
@@ -500,9 +500,9 @@
红包-退还
红包-来自
红包-我发给
- Cash赠送-退还
- Cash赠送-来自
- Cash赠送-我发给
+ 转账-退还
+ 转账-来自
+ 转账-我发给
群红包-退还
群红包
群红包-我发给
@@ -583,7 +583,7 @@
群名称
自动添加成员
成员在收到邀请后立即被添加至群。您可以关闭此设置仅仅允许接收邀请的成员加入群。
- 使用群链接 行动码让用户加入此群
+ 使用群链接 二维码让用户加入此群
是否允许群内添加好友
允许
不允许
@@ -605,13 +605,13 @@
请先阅读并同意《免密支付协议》
我已阅读并同意
免密支付协议
- 封锁
- 解封
+ 加入黑名单
+ 解除黑名单
收款-来自
- 行动码收款-來自
+ 二维码收款-來自
赠送-给
- 行动码付款-给
+ 二维码付款-给
加入群聊
进入群聊
@@ -648,9 +648,9 @@
最多选择三个
聊天记录被清除后无法恢复，确认要继续吗？
请设置群名称
- 向 %s Cash赠送
+ 向 %s 转账
向 %s 礼品积分赠送
- 来自 %s 的Cash赠送
+ 来自 %s 的转账
来自 %s 的礼品积分赠送
扫一扫
收款
@@ -687,7 +687,7 @@
设置密码
去修改
忘记支付密码
- 行动码收付款
+ 二维码收付款
付款码付款
付款码收款
确认暂停使用付款码免密支付吗
@@ -708,7 +708,7 @@
我的礼金
禮金余额
铜币明细
- 扫描行动码
+ 扫描二维码
已超时，请重新支付
更换绑定手机号
已绑手机号
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java
index 2603ce6..3e416b9 100644
--- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java
@@ -100,16 +100,27 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
if (Integer.parseInt(circleShareBean.data.getStatus()) > 0) {
ChatDataUtils.set(binding.bigLy.getContext(), "redpack_" + circleShareBean.data.getId(), Integer.parseInt(circleShareBean.data.getStatus()));
}
+ try {
if (ChatDataUtils.get(binding.bigLy.getContext(), "redpack_" + circleShareBean.data.getId(), 0) > 0) {
circleShareBean.data.setStatus(ChatDataUtils.get(binding.bigLy.getContext(), "redpack_" + circleShareBean.data.getId(), 0) + "");
}
- int status = ChatDataUtils.get(binding.bigLy.getContext(), "redpack_" + circleShareBean.data.getId(), 0);
+ }catch (Exception e){
+ circleShareBean.data.setStatus("0");
+ }
+ int status = 0;
+ try {
+ status = ChatDataUtils.get(binding.bigLy.getContext(), "redpack_" + circleShareBean.data.getId(), 0);
+ }catch (ClassCastException e){
+ status = 0;
+ }
+
+ int finalStatus = status;
RxBus.getInstance().toObservable(RxHongBaoBean.class)
.subscribeOn(rx.schedulers.Schedulers.io())
.unsubscribeOn(rx.schedulers.Schedulers.io())
.subscribe(changeImageViewBean -> {//回顶部
- if (status < 1) {
+ if (finalStatus < 1) {
if (changeImageViewBean.id.equals(circleShareBean.data.getId())) {
changeInfo(circleShareBean.data, binding, message, null, null);
if(!TextUtils.isEmpty(circleShareBean.data.getReceiverUid())){//专属红包收款人才需要网络更新
@@ -372,14 +383,18 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder {
LogUtils.i("红包类型", "名片获取到的数据红包类型1：" + GsonUtils.beanToJSONString(data));
if (data.getCoinType().equals("0")) {
- binding.mingpianTv.setText("拼手气红包");
+ if(TextUtils.isEmpty(data.getGroupId())){
+ binding.mingpianTv.setText("红包");
+ }else {
+ binding.mingpianTv.setText("拼手气红包");
- if(!TextUtils.isEmpty(data.getReceiverUid())){
- LogUtils.i("红包类型", "名片获取到的数据红包类型2：" + GsonUtils.beanToJSONString(data));
- binding.mingpianTv.setText("专属红包");
- getTeamInfos(binding.itemTitleTv,data.getGroupId(),data.getReceiverUid());
+ if (!TextUtils.isEmpty(data.getReceiverUid())&&!data.getReceiverUid().equals("(null)")) {
+ LogUtils.i("红包类型", "名片获取到的数据红包类型2：" + GsonUtils.beanToJSONString(data));
+ binding.mingpianTv.setText("专属红包");
+ getTeamInfos(binding.itemTitleTv, data.getGroupId(), data.getReceiverUid());
// binding.itemTitleTv.setText("给"+data.getReceiverUid()+"的专属红包");
+ }
}
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/TransferViewHolder.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/TransferViewHolder.java
index 2f397b0..5668d49 100644
--- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/TransferViewHolder.java
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/TransferViewHolder.java
@@ -71,29 +71,29 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
Log.i("名片", "名片获取到的数据0：" + name);
Log.i("名片", "名片获取到的数据2：" + GsonUtils.beanToJSONString(circleShareBean));
// binding.itemTitleTv.setVisibility(View.INVISIBLE);//去掉title
-// if (message.getMessageData().getMessage().getFromAccount().equals(IMKitClient.account())) {
-// NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getSessionId());
-// if (user != null) {
-// binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang_txt), user.getName()));
-// }
-// if (IMKitClient.account().equals(circleShareBean.data.getReceiverUid() + "")) {
-// NimUserInfo user1 = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getFromAccount());
-// if (user != null) {
-// binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang1_txt), user1.getName()));
-// }
-// }
-// } else {
-// NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getFromAccount());
-// if (user != null) {
-// binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang1_txt), user.getName()));
-// }
-// if (IMKitClient.account().equals(circleShareBean.data.getSenderUid() + "")) {
-// NimUserInfo user1 = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getFromAccount());
-// if (user != null) {
-// binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang_txt), user1.getName()));
-// }
-// }
-// }
+ if (message.getMessageData().getMessage().getFromAccount().equals(IMKitClient.account())) {
+ NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getSessionId());
+ if (user != null) {
+ binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang_txt), user.getName()));
+ }
+ if (IMKitClient.account().equals(circleShareBean.data.getReceiverUid() + "")) {
+ NimUserInfo user1 = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getFromAccount());
+ if (user != null) {
+ binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang1_txt), user1.getName()));
+ }
+ }
+ } else {
+ NimUserInfo user = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getFromAccount());
+ if (user != null) {
+ binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang1_txt), user.getName()));
+ }
+ if (IMKitClient.account().equals(circleShareBean.data.getSenderUid() + "")) {
+ NimUserInfo user1 = NIMClient.getService(UserService.class).getUserInfo(message.getMessageData().getMessage().getFromAccount());
+ if (user != null) {
+ binding.itemTitleTv.setText(String.format(binding.itemTitleTv.getResources().getString(R.string.xiangshuizhuanzhang_txt), user1.getName()));
+ }
+ }
+ }
binding.itemNumberTv.setText(String.format("%.2f", Integer.parseInt(circleShareBean.data.getAmount()) / 100f));
@@ -155,10 +155,12 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
}
private void changeInfo(ChatMessageBean message, TransferBean1 circleShareBean, TransferViewheadBinding binding) {
- FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) binding.bigLy.getLayoutParams();
+// FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) binding.bigLy.getLayoutParams();
if (circleShareBean.getCoinType().equals("0")) {
- layoutParams.height = dip2px(binding.bigLy.getContext(), 79);
- binding.mingpianTv.setText(binding.mingpianTv.getResources().getString(R.string.jinbizhuanzhang_des_txt));
+// layoutParams.height = dip2px(binding.bigLy.getContext(), 79);
+// binding.mingpianTv.setText(binding.mingpianTv.getResources().getString(R.string.jinbizhuanzhang_des_txt));
+ binding.mingpianTv.setText("钱包转账");
+
if (Integer.parseInt(circleShareBean.getStatus()) > 0) {
binding.bigLy.setBackgroundResource(R.drawable.zhuanzhang_f_g);
} else {
@@ -166,7 +168,7 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
}
} else {
- layoutParams.height = dip2px(binding.bigLy.getContext(), 92);
+// layoutParams.height = dip2px(binding.bigLy.getContext(), 92);
binding.mingpianTv.setText(binding.mingpianTv.getResources().getString(R.string.jinbizhuanzhang_des_txt1));
if (Integer.parseInt(circleShareBean.getStatus()) > 0) {
binding.bigLy.setBackgroundResource(R.drawable.zhuanzhang_f_s);
@@ -175,7 +177,7 @@ public class TransferViewHolder extends ChatBaseMessageViewHolder {
}
}
- binding.bigLy.setLayoutParams(layoutParams);
+// binding.bigLy.setLayoutParams(layoutParams);
switch (circleShareBean.getStatus()) {
case "0":
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java
index 013b3ad..6779040 100644
--- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/fun/view/input/FunBottomActionFactory.java
@@ -80,19 +80,23 @@ public class FunBottomActionFactory {
// R.drawable.ic_location1,
// R.string.chat_message_location));
// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_ALBUMS, R.drawable.ic_action_share_albums, R.string.sharealbums_txt));
-// if (getConfig(IMKitClient.getApplicationContext(), "redpkg_score", false)) { //积分赠送
-// //礼品积分红包
-// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_REP_PACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
+// if (sessionType == SessionTypeEnum.P2P) {
+//// if (getConfig(IMKitClient.getApplicationContext(), "redpkg_score", false)) { //积分赠送
+// //礼品积分红包
+//// }
// }
//赠送功能入口
-// if (sessionType == SessionTypeEnum.P2P) {
+ if (sessionType == SessionTypeEnum.P2P) {
// if (getConfig(IMKitClient.getApplicationContext(), "transfer_score", false)) { //积分赠送
// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER, R.drawable.ic_action_tur, R.string.zhuanzhang_txtq));
// }
-//// if (getConfig(IMKitClient.getApplicationContext(), "transfer_cash", false)) { //cash赠送
-//// actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER_CASH, R.drawable.ic_action_tur, R.string.zhuanzhang_cash_txtq));
-//// }
-// }
+ if (getConfig(IMKitClient.getApplicationContext(), "transfer_cash", false)) { //cash赠送
+
+ actions.add(new ActionItem(ActionConstants.ACTION_TYPE_REP_PACKET, R.drawable.ic_action_red_packet, R.string.hongbao_txt));
+
+ actions.add(new ActionItem(ActionConstants.ACTION_TYPE_TRANSFER_CASH, R.drawable.ic_action_tur, R.string.zhuanzhang_cash_txtq));
+ }
+ }
// actions.add(
// new ActionItem(
// ActionConstants.ACTION_TYPE_FILE, R.drawable.ic_send_file, R.string.chat_message_file));
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/SwitchGroupBean.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/SwitchGroupBean.java
new file mode 100644
index 0000000..72b0adf
--- /dev/null
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/model/SwitchGroupBean.java
@@ -0,0 +1,58 @@
+package com.netease.yunxin.kit.chatkit.ui.model;
+
+/**
+ * **********************
+ *
+ * @Author bug machine
+ * 创建时间： 2025/5/13 14:36
+ * 用途
+ * **********************
+ */
+public class SwitchGroupBean {
+
+ private int id;
+ private String groupId;
+ private Long userUid;
+ private int allowSend;
+ private int allowGrab;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public String getGroupId() {
+ return groupId;
+ }
+
+ public void setGroupId(String groupId) {
+ this.groupId = groupId;
+ }
+
+ public Long getUserUid() {
+ return userUid;
+ }
+
+ public void setUserUid(Long userUid) {
+ this.userUid = userUid;
+ }
+
+ public int getAllowSend() {
+ return allowSend;
+ }
+
+ public void setAllowSend(int allowSend) {
+ this.allowSend = allowSend;
+ }
+
+ public int getAllowGrab() {
+ return allowGrab;
+ }
+
+ public void setAllowGrab(int allowGrab) {
+ this.allowGrab = allowGrab;
+ }
+}
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
index 04b8eba..be15fa2 100644
--- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java
@@ -4,6 +4,7 @@ package com.netease.yunxin.kit.chatkit.ui.network;
import com.netease.yunxin.kit.chatkit.ui.model.BindBean;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketGroupBean;
+import com.netease.yunxin.kit.chatkit.ui.model.SwitchGroupBean;
import com.netease.yunxin.kit.chatkit.ui.model.TransferBean;
import com.netease.yunxin.kit.chatkit.ui.model.UserAlbumBean1;
@@ -142,6 +143,12 @@ public interface ApiService {
*/
@GET("/album/user/{userId}")
Observable>> getUserAlbums(@Path("userId") String userId);
+
+ /**
+ * 群红包开关列表
+ */
+ @GET("/group/{groupId}/switches")
+ Observable>> groupSwitches(@Path("groupId") String page);
}
diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/fragment/ChatBaseFragment.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/fragment/ChatBaseFragment.java
index 6288376..68d1bac 100644
--- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/fragment/ChatBaseFragment.java
+++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/page/fragment/ChatBaseFragment.java
@@ -142,6 +142,7 @@ import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketBean1;
import com.netease.yunxin.kit.chatkit.ui.model.RedpacketGroupBean;
import com.netease.yunxin.kit.chatkit.ui.model.RxBusToVoom;
+import com.netease.yunxin.kit.chatkit.ui.model.SwitchGroupBean;
import com.netease.yunxin.kit.chatkit.ui.model.TransferBean;
import com.netease.yunxin.kit.chatkit.ui.model.TransferShareBean;
import com.netease.yunxin.kit.chatkit.ui.model.UserAlbumBean1;
@@ -163,10 +164,13 @@ import com.netease.yunxin.kit.chatkit.ui.view.message.audio.ChatMessageAudioCont
import com.netease.yunxin.kit.chatkit.ui.view.popmenu.ChatPopMenu;
import com.netease.yunxin.kit.chatkit.ui.view.popmenu.IChatPopMenuClickListener;
import com.netease.yunxin.kit.chatkit.utils.SendMediaHelper;
+import com.netease.yunxin.kit.common.ui.action.ActionItem;
import com.netease.yunxin.kit.common.ui.dialog.ChoiceListener;
import com.netease.yunxin.kit.common.ui.dialog.CommonChoiceDialog;
+import com.netease.yunxin.kit.common.ui.dialog.ListAlertDialog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
import com.netease.yunxin.kit.common.ui.utils.ToastX;
+import com.netease.yunxin.kit.common.ui.viewholder.BaseBean;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;
import com.netease.yunxin.kit.common.ui.viewmodel.LoadStatus;
import com.netease.yunxin.kit.common.ui.widgets.BackTitleBar;
@@ -296,6 +300,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
public boolean isGuanFang;
public int isManage = 0;
+
@Nullable
@Override
public View onCreateView(
@@ -852,12 +857,8 @@ public abstract class ChatBaseFragment extends BaseFragment {
showDialogBlack(getString(R.string.no_to_black_hongbao_tv));
return;
}
+ checkCanSendRed(false,null);
- Intent intent = new Intent();
- intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendRedPacketActivity");
- intent.putExtra("receiverUid", sessionID);
- intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
- startActivityForResult(intent, 456);
}
}
} else {
@@ -975,6 +976,75 @@ public abstract class ChatBaseFragment extends BaseFragment {
return sessionType;
}
};
+ private void checkCanSendRed(boolean isZhuanShu,UserInfo userInfo){
+
+ Api.getInstance().groupSwitches(sessionID)
+ .subscribeOn(Schedulers.io())
+ .observeOn(AndroidSchedulers.mainThread())
+ .subscribe(new BaseObserver>>() {
+ @Override
+ public void onSuccess(Result> feedbackResp) {
+ if(getSwitchValue(feedbackResp.data)){
+ toNextSendGroup(isZhuanShu,userInfo);
+ }else{
+// ToastX.showShortToast("无此权限，请联系管理员");
+ ActionConfirmDialog actionDialog = new ActionConfirmDialog(getActivity(),
+ "无此权限，请联系管理员", false);
+ actionDialog.setOnToActionListener(new ActionConfirmDialog.OnToActionListener() {
+ @Override
+ public void toSumbit() {
+
+ }
+
+ @Override
+ public void toCancel() {
+
+ }
+ });
+ actionDialog.show();
+
+ }
+ }
+
+ @Override
+ public void onError(int code, String msg) {
+ ToastX.showShortToast(msg);
+ }
+ });
+ }
+ public boolean getSwitchValue(List< SwitchGroupBean > switchGroupBeans) {
+ if (switchGroupBeans != null && switchGroupBeans.size() > 0) {
+ boolean isIn = false;
+ for (SwitchGroupBean s : switchGroupBeans) {
+ if (IMKitClient.account().equals(s.getUserUid()+"")) {
+ return s.getAllowSend() == 1;
+ }
+
+ }
+ if (!isIn) {
+ return true;
+ }
+ }
+ return true;
+ }
+
+ private void toNextSendGroup(boolean isZhuanShu, UserInfo userInfo) {
+ if(isZhuanShu){
+ Intent intent = new Intent();
+ intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendRedPacketActivity");
+ intent.putExtra("receiverUid", sessionID);
+ intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
+ intent.putExtra("user_Bean",userInfo);
+ intent.putExtra("is_zhuanshu",true);
+ startActivityForResult(intent, 456);
+ }else{
+ Intent intent = new Intent();
+ intent.setClassName(getContext(), "com.hbl.lewan.redpack.SendRedPacketActivity");
+ intent.putExtra("receiverUid", sessionID);
+ intent.putExtra("isGroup", sessionType != SessionTypeEnum.P2P);
+ startActivityForResult(intent, 456);
+ }
+ }
private void getUserAlbums() {
Api.getInstance().getUserAlbums(IMKitClient.account())
@@ -1622,21 +1692,21 @@ public abstract class ChatBaseFragment extends BaseFragment {
chatView.getMessageListView().getLocationOnScreen(location);
if ((sessionType == SessionTypeEnum.SUPER_TEAM || sessionType == SessionTypeEnum.Team)) {
- NIMClient.getService(TeamService.class).queryTeamMember(sessionID,messageBean.getMessageData().getFromUser().getAccount()).setCallback(new RequestCallback() {
+ NIMClient.getService(TeamService.class).queryTeamMember(sessionID, messageBean.getMessageData().getFromUser().getAccount()).setCallback(new RequestCallback() {
@Override
public void onSuccess(TeamMember members) {
// Log.i("LAILIAOLIAO","LAILIAOLIAO 乱七八糟："+GsonUtils.beanToJSONString(members));
- if(members!=null){
- if(members.getType() == TeamMemberType.Manager){
- popMenu.show(view, messageBean, location[1],isManage,2,members.isMute());
+ if (members != null) {
+ if (members.getType() == TeamMemberType.Manager) {
+ popMenu.show(view, messageBean, location[1], isManage, 2, members.isMute());
- }else if(members.getType() == TeamMemberType.Owner){
- popMenu.show(view, messageBean, location[1],isManage,1,members.isMute());
- }else {
- popMenu.show(view, messageBean, location[1],isManage,0,members.isMute());
+ } else if (members.getType() == TeamMemberType.Owner) {
+ popMenu.show(view, messageBean, location[1], isManage, 1, members.isMute());
+ } else {
+ popMenu.show(view, messageBean, location[1], isManage, 0, members.isMute());
}
- }else{
- popMenu.show(view, messageBean, location[1],isManage,0,members.isMute());
+ } else {
+ popMenu.show(view, messageBean, location[1], isManage, 0, members.isMute());
}
}
@@ -1657,8 +1727,8 @@ public abstract class ChatBaseFragment extends BaseFragment {
});
- }else{
- popMenu.show(view, messageBean, location[1],0,0,false);
+ } else {
+ popMenu.show(view, messageBean, location[1], 0, 0, false);
}
}
@@ -1697,7 +1767,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
//如果是群，且群不允许群内添加好友 当前登录用户不是群主，以及userid 也不是群主 直接跳过
if ((sessionType == SessionTypeEnum.SUPER_TEAM || sessionType == SessionTypeEnum.Team)) {
- if(teamInfo!=null&&isManage>0){
+ if (teamInfo != null && isManage > 0) {
XKitRouter.withKey(getUserInfoRoutePath())
.withContext(view.getContext())
.withParam(
@@ -1778,23 +1848,8 @@ public abstract class ChatBaseFragment extends BaseFragment {
public boolean onUserIconLongClick(View view, int position, ChatMessageBean messageBean) {
if (delegateListener == null
|| !delegateListener.onUserIconLongClick(view, position, messageBean)) {
- if (aitManager != null && sessionType == SessionTypeEnum.Team) {
- String account = messageBean.getMessageData().getMessage().getFromAccount();
- UserInfo userInfo = messageBean.getMessageData().getFromUser();
- if (!TextUtils.equals(account, IMKitClient.account())) {
- if (userInfo == null) {
- userInfo = new UserInfo(account, account, null);
- }
- String name = MessageHelper.getTeamAitName(aitManager.getTid(), userInfo);
- if (TextUtils.isEmpty(name)) {
- if (messageBean.getMessageData().getFromUser() != null) {
- name = messageBean.getMessageData().getFromUser().getName();
- } else {
- name = account;
- }
- }
- aitManager.insertReplyAit(account, name);
- }
+ if ( sessionType == SessionTypeEnum.Team) {
+ showStickDialog(view, position, messageBean);
}
}
return true;
@@ -1915,6 +1970,60 @@ public abstract class ChatBaseFragment extends BaseFragment {
}
};
+
+ private void showStickDialog(View view, int position, ChatMessageBean messageBean) {
+
+ ListAlertDialog alertDialog = new ListAlertDialog();
+ alertDialog.setContent(generateDialogContent(messageBean));
+ alertDialog.setTitleVisibility(View.GONE);
+ alertDialog.setDialogWidth(getResources().getDimension(R.dimen.alert_dialog_width));
+ alertDialog.setItemClickListener(
+ action -> {
+ if (TextUtils.equals(action, "at_user")) {
+
+ String account = messageBean.getMessageData().getMessage().getFromAccount();
+ UserInfo userInfo = messageBean.getMessageData().getFromUser();
+ if (!TextUtils.equals(account, IMKitClient.account())) {
+ if (userInfo == null) {
+ userInfo = new UserInfo(account, account, null);
+ }
+ String name = MessageHelper.getTeamAitName(aitManager.getTid(), userInfo);
+ if (TextUtils.isEmpty(name)) {
+ if (messageBean.getMessageData().getFromUser() != null) {
+ name = messageBean.getMessageData().getFromUser().getName();
+ } else {
+ name = account;
+ }
+ }
+ aitManager.insertReplyAit(account, name);
+ }
+ } else if (TextUtils.equals(action, "zhuanshu_hb")) {
+ checkCanSendRed(true,messageBean.getMessageData().getFromUser());
+
+ }
+ alertDialog.dismiss();
+ });
+ alertDialog.show(getParentFragmentManager());
+
+ }
+
+
+ protected List generateDialogContent(ChatMessageBean messageBean) {
+ List contentList = new ArrayList<>();
+ if(aitManager != null) {
+ ActionItem stick =
+ new ActionItem("at_user",
+ 0, R.string.at_ta_txt);
+ contentList.add(stick);
+ }
+ ActionItem delete =
+ new ActionItem("zhuanshu_hb", 0, R.string.zhuanshuhongbao_txt);
+ contentList.add(delete);
+ return contentList;
+ }
+
+
+
protected void loadReplyInfo(String uuid, boolean addAit) {
if (TextUtils.isEmpty(uuid)) {
return;
@@ -2421,13 +2530,13 @@ public abstract class ChatBaseFragment extends BaseFragment {
@Override
public boolean onJinYan(ChatMessageBean messageInfo) {
- toJinyan(messageInfo,true);
+ toJinyan(messageInfo, true);
return IChatPopMenuClickListener.super.onJinYan(messageInfo);
}
@Override
public boolean onJieChuJinYan(ChatMessageBean messageInfo) {
- toJinyan(messageInfo,false);
+ toJinyan(messageInfo, false);
return IChatPopMenuClickListener.super.onJieChuJinYan(messageInfo);
}
@@ -2436,7 +2545,7 @@ public abstract class ChatBaseFragment extends BaseFragment {
private void toJinyan(ChatMessageBean messageInfo, boolean isMute) {
TeamService v2TeamService = NIMClient.getService(TeamService.class);
- v2TeamService.muteTeamMember(sessionID, messageInfo.getMessageData().getFromUser().getAccount(),isMute);
+ v2TeamService.muteTeamMember(sessionID, messageInfo.getMessageData().getFromUser().getAccount(), isMute);
}
@@ -2568,7 +2677,6 @@ public abstract class ChatBaseFragment extends BaseFragment {
result -> onForwardMessage(result, SessionTypeEnum.Team));
-
forwardTeamLauncher1 =
registerForActivityResult(
new ActivityResultContracts.StartActivityForResult(),
@@ -2662,23 +2770,23 @@ public abstract class ChatBaseFragment extends BaseFragment {
LinearLayoutManager layoutManager = (LinearLayoutManager) chatView.getMessageListView().getLayoutManager();
int lastPosition = layoutManager.findLastCompletelyVisibleItemPosition();
/**当我滑动到了上面 有新消息进来 不要顶上来 只有停留在顶部的时候才自动滑动到底部*/
- if (lastPosition==chatView.getMessageListView().getMessageAdapter().getMessageList().size()-1) {
+ if (lastPosition == chatView.getMessageListView().getMessageAdapter().getMessageList().size() - 1) {
chatView.appendMessageList(listFetchResult.getData());
- }else{
- chatView.appendMessageList(listFetchResult.getData(),false);
+ } else {
+ chatView.appendMessageList(listFetchResult.getData(), false);
}
/**
* 群聊禁言和解除禁言实时更新底部UI
*/
- if(sessionType == SessionTypeEnum.Team||sessionType == SessionTypeEnum.SUPER_TEAM) {
+ if (sessionType == SessionTypeEnum.Team || sessionType == SessionTypeEnum.SUPER_TEAM) {
for (ChatMessageBean chatMessageBean : listFetchResult.getData()) {
if (chatMessageBean.getMessageData().getMessage().getAttachment() instanceof NotificationAttachment) {
NotificationAttachment attachment =
(NotificationAttachment) chatMessageBean.getMessageData().getMessage().getAttachment();
- if(attachment.getType() == NotificationType.MuteTeamMember||attachment.getType() ==NotificationType.SUPER_TEAM_MUTE_TLIST){
- MuteMemberAttachment muteMemberAttachment = (MuteMemberAttachment) attachment;
- if(muteMemberAttachment.getTargets().contains(IMKitClient.account())){
+ if (attachment.getType() == NotificationType.MuteTeamMember || attachment.getType() == NotificationType.SUPER_TEAM_MUTE_TLIST) {
+ MuteMemberAttachment muteMemberAttachment = (MuteMemberAttachment) attachment;
+ if (muteMemberAttachment.getTargets().contains(IMKitClient.account())) {
RxBus.getInstance().post(-99999);
}
}
diff --git a/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_f_g.png b/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_f_g.png
index 82be945..683ce88 100644
Binary files a/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_f_g.png and b/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_f_g.png differ
diff --git a/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_t_g.png b/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_t_g.png
index b16e979..3b44556 100644
Binary files a/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_t_g.png and b/chatkit-ui/src/main/res/drawable-xxhdpi/zhuanzhang_t_g.png differ
diff --git a/chatkit-ui/src/main/res/layout/dialog_action_confirm.xml b/chatkit-ui/src/main/res/layout/dialog_action_confirm.xml
index 4b7e82c..9b19bed 100644
--- a/chatkit-ui/src/main/res/layout/dialog_action_confirm.xml
+++ b/chatkit-ui/src/main/res/layout/dialog_action_confirm.xml
@@ -36,6 +36,8 @@
Custom
Points Bonus
Points Give away
- Cash Give away
+ 转账
Business card
Sending location
Share Album
@@ -243,7 +243,7 @@
Recording will stop after %d \"
Please enter the chat content
Click to start recording
- [Give away]
+ [转账]
Taomenggo chat Cash Give away
Give away to %s
Give away from %s
@@ -332,5 +332,7 @@
Forward to %s and other %d people
Forward to %s and other %d group
您已被禁言
+ 专属红包
+ \@TA
\ No newline at end of file
diff --git a/chatkit-ui/src/main/res/values-ja/strings.xml b/chatkit-ui/src/main/res/values-ja/strings.xml
index a4fd222..a7e04bf 100644
--- a/chatkit-ui/src/main/res/values-ja/strings.xml
+++ b/chatkit-ui/src/main/res/values-ja/strings.xml
@@ -218,7 +218,7 @@
カスタマイズ済み
ポイントボーナス
ポイント贈与
- Cash転送
+ 转账
名刺
送信場所
アルバムを共有
@@ -244,7 +244,7 @@
チャットの内容を入力してください
クリックして録音を開始します
- [転送]
+ [转账]
桃蒙郷Cash転送
%s に転送
%s からの転送
@@ -333,5 +333,7 @@
轉發給:%s等%d人
轉發給:%s等%d群
您已被禁言
+ 专属红包
+ \@TA
\ No newline at end of file
diff --git a/chatkit-ui/src/main/res/values-zh/strings.xml b/chatkit-ui/src/main/res/values-zh/strings.xml
index 306cac2..70c34b4 100644
--- a/chatkit-ui/src/main/res/values-zh/strings.xml
+++ b/chatkit-ui/src/main/res/values-zh/strings.xml
@@ -217,7 +217,7 @@
自定义
红包
积分赠送
- Cash 赠送
+ 转账
名片
发送位置
分享相册
@@ -243,13 +243,13 @@
%d \" 后将停止录音
请输入聊天内容
点击开始录音
- [赠送]
- MM Cash赠送
- 向 %s 赠送
- 来自 %s 的赠送
+ [转账]
+ 转账
+ 向 %s 转账
+ 来自 %s 的转账
MM 礼品积分赠送
恭喜发财，大吉大利
- 待領取
+ 待领取
已领取
已退还
已领取
@@ -333,5 +333,7 @@
转发给:%s等%d人
转发给:%s等%d群
您已被禁言
+ 专属红包
+ \@TA
\ No newline at end of file
diff --git a/chatkit-ui/src/main/res/values/colors.xml b/chatkit-ui/src/main/res/values/colors.xml
index 1867ca4..16f4ec6 100644
--- a/chatkit-ui/src/main/res/values/colors.xml
+++ b/chatkit-ui/src/main/res/values/colors.xml
@@ -87,7 +87,7 @@
#0077F6
#E4E4E4
#6B3689
- #ffcad8
+ #8DE776
#f4f4f4
#fcfcfc
#7F7B81
diff --git a/chatkit-ui/src/main/res/values/dimens.xml b/chatkit-ui/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..d5c0e18
--- /dev/null
+++ b/chatkit-ui/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+
+
+ 188dp
+
\ No newline at end of file
diff --git a/chatkit-ui/src/main/res/values/strings.xml b/chatkit-ui/src/main/res/values/strings.xml
index da8aaf9..e9ccca9 100644
--- a/chatkit-ui/src/main/res/values/strings.xml
+++ b/chatkit-ui/src/main/res/values/strings.xml
@@ -217,7 +217,7 @@
自訂
紅包
積分贈送
- Cash贈送
+ 转账
名片
發送位置
分享相簿
@@ -243,21 +243,21 @@
請輸入聊天內容
點擊開始錄音
- [贈送]
- MM Cash贈送
- 向 %s 贈送
- 來自 %s 的贈送
+ [转账]
+ 转账
+ 向 %s 转账
+ 来自 %s 的转账
MM 禮品積分贈送
恭喜發財，大吉大利
- 待領取
- 已領取
- 已退還
- 已領取
- 已退還
- 已過期
- 紅包
+ 待领取
+ 已领取
+ 已退还
+ 已领取
+ 已退还
+ 已过期
+ 红包
MM 禮品積分紅包
- [紅包]
+ [红包]
待領取
查看領取詳情
%s 發出的紅包
@@ -292,7 +292,7 @@
最近聯繫
特別關心
點擊領取
- 不能向黑名單用戶贈送
+ 不能向黑名单用户转账
無法向黑名單用戶發送紅包
無法向黑名單用戶發送名片
屏蔽中，恢復對話請取消屏蔽
@@ -332,4 +332,6 @@
轉發給:%s等%d人
轉發給:%s等%d群
您已被禁言
+ 专属红包
+ \@TA
\ No newline at end of file
diff --git a/contactkit-ui/src/main/res-fun/layout/fun_add_friend_activity.xml b/contactkit-ui/src/main/res-fun/layout/fun_add_friend_activity.xml
index e0f9eab..3fb3f6d 100644
--- a/contactkit-ui/src/main/res-fun/layout/fun_add_friend_activity.xml
+++ b/contactkit-ui/src/main/res-fun/layout/fun_add_friend_activity.xml
@@ -165,7 +165,7 @@
android:background="@null"
android:hint="@string/add_friend_searchphone_hint"
android:imeOptions="actionSearch"
- android:inputType="phone"
+ android:inputType="text"
android:paddingLeft="@dimen/dimen_20_dp"
android:singleLine="true"
android:textColor="@color/color_333333"
diff --git a/contactkit-ui/src/main/res/values-zh/strings.xml b/contactkit-ui/src/main/res/values-zh/strings.xml
index d03b105..c4201b9 100644
--- a/contactkit-ui/src/main/res/values-zh/strings.xml
+++ b/contactkit-ui/src/main/res/values-zh/strings.xml
@@ -141,7 +141,7 @@
查找结果
新增
最少保留一位好友
- 行动码
+ 二维码
邀请网址
你们还没有聊过哦~
[短影音消息]
diff --git a/contactkit-ui/src/main/res/values/strings.xml b/contactkit-ui/src/main/res/values/strings.xml
index 5f9b3c3..d4af524 100644
--- a/contactkit-ui/src/main/res/values/strings.xml
+++ b/contactkit-ui/src/main/res/values/strings.xml
@@ -146,7 +146,7 @@
你們還沒聊過喔~
[短影音訊息]
[名片]
- [贈送]
+ [转账]
[紅包]
[相簿]
[幫忙代付]
diff --git a/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/normal/viewholder/ConversationBaseViewHolder.java b/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/normal/viewholder/ConversationBaseViewHolder.java
index 28961da..4228c02 100644
--- a/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/normal/viewholder/ConversationBaseViewHolder.java
+++ b/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/normal/viewholder/ConversationBaseViewHolder.java
@@ -66,8 +66,8 @@ public class ConversationBaseViewHolder extends BaseViewHolder
}
viewBinding.contentLayout.setOnClickListener(v -> itemListener.onClick(v, data, position));
-// viewBinding.contentLayout.setOnLongClickListener(
-// v -> itemListener.onLongClick(v, data, position));
+ viewBinding.contentLayout.setOnLongClickListener(
+ v -> itemListener.onLongClick(v, data, position));
viewBinding.avatarLayout.setOnClickListener(v -> itemListener.onAvatarClick(v, data, position));
viewBinding.avatarLayout.setOnLongClickListener(
v -> itemListener.onAvatarLongClick(v, data, position));
diff --git a/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/ConversationBaseFragment.java b/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/ConversationBaseFragment.java
index 6344727..aeebc3e 100644
--- a/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/ConversationBaseFragment.java
+++ b/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/ConversationBaseFragment.java
@@ -26,6 +26,7 @@ import com.netease.yunxin.kit.chatkit.model.ConversationInfo;
import com.netease.yunxin.kit.common.ui.action.ActionItem;
import com.netease.yunxin.kit.common.ui.dialog.ListAlertDialog;
import com.netease.yunxin.kit.common.ui.fragments.BaseFragment;
+import com.netease.yunxin.kit.common.ui.utils.ToastX;
import com.netease.yunxin.kit.common.ui.viewholder.BaseBean;
import com.netease.yunxin.kit.common.ui.viewholder.ViewHolderClickListener;
import com.netease.yunxin.kit.common.ui.viewmodel.FetchResult;
@@ -161,6 +162,7 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
new ViewHolderClickListener() {
@Override
public boolean onClick(View v, BaseBean data, int position) {
+// ToastX.showShortToast("111111111");
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -184,6 +186,8 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
@Override
public boolean onAvatarClick(View v, BaseBean data, int position) {
+// ToastX.showShortToast("222222222222");
+
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -207,6 +211,8 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
@Override
public boolean onLongClick(View v, BaseBean data, int position) {
+// ToastX.showShortToast("333333333333");
+
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -227,6 +233,8 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
@Override
public boolean onAvatarLongClick(View v, BaseBean data, int position) {
+// ToastX.showShortToast("444444444444");
+
boolean result = false;
if (ConversationKitClient.getConversationUIConfig() != null
&& ConversationKitClient.getConversationUIConfig().itemClickListener != null
@@ -456,11 +464,12 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
viewModel.deleteConversation(2, dataBean);
} else if (TextUtils.equals(action, ConversationConstant.Action.ACTION_HIDE)) {
viewModel.deleteConversation(1, dataBean);
-// if (dataBean.infoData.isStickTop()) {
-// viewModel.removeStick((ConversationBean) data);
-// } else {
-// viewModel.addStickTop((ConversationBean) data);
-// }
+ } else if(TextUtils.equals(action,ConversationConstant.Action.ACTION_STICK)){
+ if (dataBean.infoData.isStickTop()) {
+ viewModel.removeStick((ConversationBean) data);
+ } else {
+ viewModel.addStickTop((ConversationBean) data);
+ }
}
alertDialog.dismiss();
});
@@ -488,15 +497,16 @@ public abstract class ConversationBaseFragment extends BaseFragment implements I
protected List generateDialogContent(boolean isStick) {
List contentList = new ArrayList<>();
-// ActionItem stick =
-// new ActionItem(
-// ConversationConstant.Action.ACTION_STICK,
-// 0,
-// (isStick ? R.string.cancel_stick_title : R.string.stick_title));
+ ActionItem stick =
+ new ActionItem(
+ ConversationConstant.Action.ACTION_STICK,
+ 0,
+ (isStick ? R.string.cancel_stick_title : R.string.stick_title));
ActionItem hide =
new ActionItem(ConversationConstant.Action.ACTION_HIDE, 0, R.string.hide_title);
ActionItem delete =
new ActionItem(ConversationConstant.Action.ACTION_DELETE, 0, R.string.delete_title);
+ contentList.add(stick);
contentList.add(hide);
contentList.add(delete);
return contentList;
diff --git a/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/viewmodel/ConversationViewModel.java b/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/viewmodel/ConversationViewModel.java
index 11de251..aab1d8b 100644
--- a/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/viewmodel/ConversationViewModel.java
+++ b/conversationkit-ui/src/main/java/com/netease/yunxin/kit/conversationkit/ui/page/viewmodel/ConversationViewModel.java
@@ -435,7 +435,7 @@ public class ConversationViewModel extends BaseViewModel {
}
public void addStickTop(ConversationBean data) {
-
+ LogUtils.i("LAILIAOLIAO","数据是啥："+ data.infoData.getContactId()+";"+data.infoData.getSessionType());
ConversationRepoAll.addStickTop(
data.infoData.getContactId(),
data.infoData.getSessionType(),
@@ -470,6 +470,8 @@ public class ConversationViewModel extends BaseViewModel {
}
public void removeStick(ConversationBean data) {
+ LogUtils.i("LAILIAOLIAO","数据是啥removeStick："+ data.infoData.getContactId()+";"+data.infoData.getSessionType());
+
ConversationRepoAll.removeStickTop(
data.infoData.getContactId(),
data.infoData.getSessionType(),
diff --git a/conversationkit-ui/src/main/res-fun/drawable/fun_conversation_view_holder_selector.xml b/conversationkit-ui/src/main/res-fun/drawable/fun_conversation_view_holder_selector.xml
index 3745d2c..63fe5fa 100644
--- a/conversationkit-ui/src/main/res-fun/drawable/fun_conversation_view_holder_selector.xml
+++ b/conversationkit-ui/src/main/res-fun/drawable/fun_conversation_view_holder_selector.xml
@@ -7,7 +7,7 @@
-