From a2cf18a8408cb8d75cff136c3646ddaa384ea22c Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Sat, 9 May 2020 18:51:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2SDK=20key=EF=BC=8CUI=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/ShareSDK.xml | 16 +-- .../com/yizhuan/erban/base/BaseLoginAct.java | 7 +- .../erban/ui/login/AccountValidator.java | 19 ++-- .../erban/ui/user/UserInfoActivity.java | 105 +++++++++++++----- .../user/adapter/UserInfoDynamicAdapter.java | 25 +++-- .../res/drawable-xhdpi/default_avatar.webp | Bin 1152 -> 3962 bytes app/src/main/res/drawable/bg_splash.xml | 2 +- .../res/layout/act_quick_pass.xml | 48 +++++--- .../erban/upgrade/AppUpgradeHelper.java | 2 +- .../XChatConstants.java | 14 +-- 10 files changed, 156 insertions(+), 82 deletions(-) diff --git a/app/src/main/assets/ShareSDK.xml b/app/src/main/assets/ShareSDK.xml index dbf42c54d..e41755fba 100644 --- a/app/src/main/assets/ShareSDK.xml +++ b/app/src/main/assets/ShareSDK.xml @@ -66,8 +66,8 @@ diff --git a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java index 09c436780..c33f75ef3 100644 --- a/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java +++ b/app/src/main/java/com/yizhuan/erban/base/BaseLoginAct.java @@ -198,9 +198,12 @@ public abstract class BaseLoginAct extends BaseActivity { protected void qqLogin() { // 易盾保护 token - String yiDunToken = watchman.getToken(XChatConstants.YI_DUN_BUSINESS_ID); +// String yiDunToken = watchman.getToken(XChatConstants.YI_DUN_BUSINESS_ID); // 数美天网 deviceId - String shuMeiDeviceId = SmAntiFraud.getDeviceId(); +// String shuMeiDeviceId = SmAntiFraud.getDeviceId(); + String yiDunToken = ""; + String shuMeiDeviceId = ""; + getDialogManager().showProgressDialog(this, "请稍后"); AuthModel.get() .qqLogin(yiDunToken, shuMeiDeviceId) diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java b/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java index 9a876de90..3665476c3 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/AccountValidator.java @@ -52,14 +52,17 @@ public class AccountValidator { public boolean isValid(@NonNull CharSequence text) { if (!TextUtils.isEmpty(text)) { char c = text.charAt(0); - if (!(c == '1')) { - errorMessage = "手机号码错误"; - return false; - } - if(!MobileNumberUtils.isChinaInternalNumber(text) && !MobileNumberUtils.isChinaMobileNumber(text) && !MobileNumberUtils.isChinaTelecomNumber(text) && !MobileNumberUtils.isChinaUnicomNumber(text)){ - errorMessage = "请填写正确的手机号码"; - return false; - } +// if (!(c == '1')) { +// errorMessage = "手机号码错误"; +// return false; +// } +// if(!MobileNumberUtils.isChinaInternalNumber(text) && !MobileNumberUtils.isChinaMobileNumber(text) && !MobileNumberUtils.isChinaTelecomNumber(text) && !MobileNumberUtils.isChinaUnicomNumber(text)){ +// errorMessage = "请填写正确的手机号码"; +// return false; +// } +// if (text.length() == 7) { +// return true; +// } } else { errorMessage = "手机号不能为空！"; return false; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java index b8948bf69..3fd28323b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/UserInfoActivity.java @@ -3,7 +3,6 @@ package com.yizhuan.erban.ui.user; import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; -import android.graphics.Color; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.text.TextUtils; @@ -21,6 +20,7 @@ import com.jude.rollviewpager.hintview.TextHintView; import com.netease.nim.uikit.impl.cache.NimUserInfoCache; import com.netease.nimlib.sdk.RequestCallbackWrapper; import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; +import com.trello.rxlifecycle2.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.avroom.ButtonItemFactory; @@ -28,6 +28,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.common.widget.dialog.CommonPopupDialog; import com.yizhuan.erban.common.widget.dialog.DialogManager; +import com.yizhuan.erban.community.helper.ShareDynamicHelper; import com.yizhuan.erban.databinding.ActivityUserInfoBinding; import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity; @@ -44,14 +45,13 @@ import com.yizhuan.erban.utils.RegexUtil; import com.yizhuan.xchat_android_constants.XChatConstants; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.praise.PraiseModel; import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; import com.yizhuan.xchat_android_core.statistic.StatisticManager; import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol; import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; @@ -62,6 +62,7 @@ import com.yizhuan.xchat_android_core.user.bean.UserPhoto; import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; import com.yizhuan.xchat_android_core.utils.StarUtils; import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.SizeUtils; @@ -73,6 +74,7 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** * create by lvzebiao on 2018/8/31 @@ -124,21 +126,20 @@ public class UserInfoActivity extends BaseBindingActivity list) { mBinding.rvDynamic.setLayoutManager(new LinearLayoutManager(this)); - UserInfoDynamicAdapter dynamicAdapter= new UserInfoDynamicAdapter(this,identityState); + UserInfoDynamicAdapter dynamicAdapter = new UserInfoDynamicAdapter(this,identityState); dynamicAdapter.setNewData(list); dynamicAdapter.setEnableLoadMore(false); + dynamicAdapter.setOnItemChildClickListener((baseQuickAdapter, view, pos) -> { + WorldDynamicBean bean = dynamicAdapter.getItem(pos); + if (bean == null) { + return; + } + if (view.getId() == R.id.iv_more) { + List list_adapter = new ArrayList<>(); + if (!UserModel.get().isMyseft(bean.getUid())) { + ButtonItem item = new ButtonItem("举报", () -> { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_REPORT_MOMENTS, + "举报动态-区分-动态广场"); + UIHelper.showReportPage(this, bean.getUid(), + XChatConstants.REPORT_TYPE_DYNAMIC_SQUARE); + }); + list_adapter.add(item); + } + if (UserModel.get().isMyseft(bean.getUid()) || + isThisWorldOwner(bean)) { + ButtonItem item = new ButtonItem("删除", () -> deleteDynamic(pos,dynamicAdapter)); + list_adapter.add(item); + } + getDialogManager().showCommonPopupDialog(list_adapter, "取消"); + } else if (view.getId() == R.id.ll_share) { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_SHARE_MOMENTS, + "分享动态-区分-动态广场"); + new ShareDynamicHelper(this).share(bean); + } + }); mBinding.rvDynamic.setAdapter(dynamicAdapter); } @@ -600,7 +629,6 @@ public class UserInfoActivity extends BaseBindingActivity 0) { - if (current != null) { - if (current.getUid() == roomInfo.getUid()) { - toast("已经和对方在同一个房间"); - return; - } - } - AVRoomActivity.start(this, roomInfo.getUid(), roomInfo.getType()); - } else { - toast("对方不在房间内"); - } + /** + * 判断自己是不是该世界的创始人 + */ + private boolean isThisWorldOwner(WorldDynamicBean bean) { + return bean != null && bean.getWorldUid() == AuthModel.get().getCurrentUid(); } - public void onGetUserRoomFail(String msg) { - getDialogManager().dismissDialog(); - toast(msg); + private void deleteDynamic(int pos,UserInfoDynamicAdapter adapter) { + StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_DELETE_MOMENTS, + "删除动态-区分-动态广场"); + getDialogManager().showOkCancelWithTitleDialog("删除后不可恢复，确定删除该动态吗?", + new DialogManager.OkCancelDialogListener() { + @Override + public void onOk() { + WorldDynamicBean bean = adapter.getItem(pos); + if (bean == null) { + return; + } + DynamicModel.get().delete(bean.getWorldId(), bean.getDynamicId()) + .compose(bindUntilEvent(ActivityEvent.DESTROY)) + .subscribe(new DontWarnObserver() { + @Override + public void accept(String s, String error) { + super.accept(s, error); + if (error != null) { + toast(error); + } else { + toast("删除成功"); + if (pos < adapter.getData().size()) { + if (Objects.equals(bean, adapter.getItem(pos))) { + adapter.remove(pos); + } + } + } + } + }); + + } + }); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java index eca5847aa..8f8ec5a2d 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/UserInfoDynamicAdapter.java @@ -122,8 +122,6 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter { + if (item.getDynamicId() == 0){ + return; + } StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_WORLD_COMMENT_MOMENTS, "点击列表评论按钮-区分-小世界客态页"); //1.3.1新埋点 @@ -174,19 +178,24 @@ public class UserInfoDynamicAdapter extends BaseQuickAdapter - DynamicDetailActivity.start(context, item.getDynamicId(), worldId, - helper.getAdapterPosition(), false, 1); + if (item.getDynamicId() != 0){ + helper.addOnClickListener(R.id.iv_more).addOnClickListener(R.id.ll_share); + } + + View.OnClickListener toDetailListener = v -> { + if (item.getDynamicId() == 0){ + return; + } + DynamicDetailActivity.start(context, item.getDynamicId(), worldId, + helper.getAdapterPosition(), false, 1); + }; if (etvContent.mTv != null) { etvContent.mTv.setOnClickListener(toDetailListener); } - //跳转去详情 helper.itemView.setOnClickListener(toDetailListener); - helper.addOnClickListener(R.id.iv_more) - .addOnClickListener(R.id.ll_share); } diff --git a/app/src/main/res/drawable-xhdpi/default_avatar.webp b/app/src/main/res/drawable-xhdpi/default_avatar.webp index 8c3bf89be78d1ed164e4c8860bf0b9a070c72d44..b84c19747a42f6c5df2e9b2cb26980c6d006b57a 100644 GIT binary patch literal 3962 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 - + diff --git a/app/src/module_quick_pass/res/layout/act_quick_pass.xml b/app/src/module_quick_pass/res/layout/act_quick_pass.xml index 91a36cec9..58de84c08 100644 --- a/app/src/module_quick_pass/res/layout/act_quick_pass.xml +++ b/app/src/module_quick_pass/res/layout/act_quick_pass.xml @@ -72,31 +72,45 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/tv_protocol"> - + android:textColor="@color/white" + android:text="QQ" + android:textSize="@dimen/dp_11" + android:gravity="center" + android:drawablePadding="@dimen/dp_15" + tools:visibility="visible"/> - - + android:textColor="@color/white" + android:text="微信" + android:textSize="@dimen/dp_11" + android:gravity="center" + android:drawablePadding="@dimen/dp_15" + tools:visibility="visible" /> diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java index 04542c643..1f8ce267d 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java @@ -25,7 +25,7 @@ public class AppUpgradeHelper { @SuppressLint("CheckResult") public static void checkAppUpgrade(RxAppCompatActivity activity, boolean isUserAuto, boolean isPush) { - + if (isPush) { //如果是后台推送，统一拦截 } else { diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java index 45c1e0b03..7f932d59f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java @@ -51,19 +51,17 @@ public class XChatConstants { /** * 云信 key (DEBUG) */ -// public static final String NIM_KEY_DEBUG = "2c375581f900a7b4ea3922fa7643f307"; - public static final String NIM_KEY_DEBUG = "86bdf1285efb4419fe4a58b0046d2095";//6bdf1285efb4419fe4a58b0046d2095 09bde8b3d86b98a6612bc3fc92709799 86bdf1285efb4419fe4a58b0046d2095 + public static final String NIM_KEY_DEBUG = "86bdf1285efb4419fe4a58b0046d2095";//已更换 /** * 云信 key (RELEASE) */ -// public static final String NIM_KEY_RELEASE = "ca46478c438dda51d25306f52fe7506b"; - public static final String NIM_KEY_RELEASE = "86bdf1285efb4419fe4a58b0046d2095"; + public static final String NIM_KEY_RELEASE = "d79bd64673cf9e8e29208f3205e3563f";//已更换 /** * 网易易盾 productNumber */ - public static final String YI_DUN_PRODUCT_NUMBER = "YD00313347064620"; + public static final String YI_DUN_PRODUCT_NUMBER = "YD00313347064620";//已更换 /** * 网易易盾 业务 ID 注册 @@ -82,7 +80,7 @@ public class XChatConstants { /** * 声网 key */ - public static final String AGORA_KEY = "c5f1fa4878d141f99f3e86ec59f619d9"; + public static final String AGORA_KEY = "04d48cdbfd4547b3933a59e7acb0ae55"; //已更换 /** * 七牛 access_url @@ -97,12 +95,12 @@ public class XChatConstants { /** * 七牛 access_key */ - public static final String QINIU_ACCESS_KEY = "_yrUANU6t3YGhNXZzdMNt03EhqDKUvFZ3oSbAAKJ"; + public static final String QINIU_ACCESS_KEY = "7c9eC45DhG3qVtyRXuQe17SZfEmELLtGK2umzTc1";//已更换 /** * 七牛 secret_key */ - public static final String QINIU_SECRET_KEY = "PJ-NZ_qc0cabSebH2A9eYsodgRMFqV3tOFbP2Grr"; + public static final String QINIU_SECRET_KEY = "t3sAMF3u6kFXJ9PCs3YxRzsu";//已更换 /** * 阿里云日志空间名字