moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

点对点聊天推送跳转到聊天页，fix充值页，升级云信sdk至7.8.4

Browse Source
This commit is contained in:
oujunhui
2020-08-17 19:45:50 +08:00
parent 8dc56141ed
commit 04d48cc826
6 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/AndroidManifest.xml
View File

@@ -197,7 +197,15 @@
<intent-filter>
<action android:name="com.heytap.mcs.action.RECEIVE_MCS_MESSAGE" />
</intent-filter>
</service><!-- 云信集成oppo推送 end -->
</service>
<service android:name=".push.OppoPushService"
android:permission="com.coloros.mcs.permission.SEND_MCS_MESSAGE">
<intent-filter>
<action android:name="com.coloros.mcs.action.RECEIVE_MCS_MESSAGE"/>
</intent-filter>
</service>
<!-- 云信集成oppo推送 end -->
<!-- 云信集成华为推送 start -->
<service

3
app/src/main/java/com/yizhuan/erban/NimMiddleActivity.java
View File

@@ -14,8 +14,10 @@ import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum;
import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.home.activity.UserMatchActivity;
import com.yizhuan.erban.home.fragment.CommunityNoticeAct;
import com.yizhuan.erban.radish.signin.SignInActivity;
import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity;
import com.yizhuan.erban.utils.PushMessageHandler;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
@@ -130,6 +132,7 @@ public class NimMiddleActivity extends BaseActivity {
LogUtils.i( "MsgTypeEnum.notification");
}else if (imMessage.getMsgType() == MsgTypeEnum.text){
LogUtils.i( "MsgTypeEnum.text");
NimP2PMessageActivity.start(this, imMessage.getFromAccount() + "");
}
}
finish();

6
app/src/main/java/com/yizhuan/erban/push/OppoAppPushService.java Normal file
View File

@@ -0,0 +1,6 @@
package com.yizhuan.erban.push;
import com.netease.nimlib.sdk.mixpush.OppoAppPushMessageService;
public class OppoAppPushService extends OppoAppPushMessageService {
}

6
app/src/main/java/com/yizhuan/erban/push/OppoPushService.java Normal file
View File

@@ -0,0 +1,6 @@
package com.yizhuan.erban.push;
import com.netease.nimlib.sdk.mixpush.OppoPushMessageService;
public class OppoPushService extends OppoPushMessageService {
}

41
app/src/main/java/com/yizhuan/erban/ui/pay/ChargeActivity.java
View File

@@ -103,8 +103,6 @@ public class ChargeActivity extends BaseActivity {
bindViews();
setListener();
initiate();
// 默认选中微信
selectPayChannelDisplay(Constants.CHARGE_WX);
}
private void setListener() {
@@ -142,12 +140,17 @@ public class ChargeActivity extends BaseActivity {
tv_type_second = findViewById(R.id.tv_type_second);
}
public void selectPayChannelDisplay(String payChannel) {
public void selectPayChannelDisplay(String payChannel,int defaultPay) {
this.payChannel = payChannel;
boolean selectWeChatPay = (Objects.equals(this.payChannel, Constants.CHARGE_WX));
boolean selectAliPay = (Objects.equals(this.payChannel, Constants.CHARGE_ALIPAY));
iv_sel_first.setSelected(selectWeChatPay);
iv_sel_second.setSelected(selectAliPay);
if (defaultPay == 1) {
iv_sel_first.setSelected(selectAliPay);
iv_sel_second.setSelected(selectWeChatPay);
}else {
iv_sel_first.setSelected(selectWeChatPay);
iv_sel_second.setSelected(selectAliPay);
}
}
@@ -193,15 +196,15 @@ public class ChargeActivity extends BaseActivity {
list.get(i).isSelected = position == i;
}
mChargeAdapter.notifyDataSetChanged();
int money = mSelectChargeBean.getMoney();
if (money >= 30000) {
// 大于 3w 的时候，隐藏微信支付的选项
ll_type_first.setVisibility(View.GONE);
// 默认选中支付宝支付的选项
selectPayChannelDisplay(Constants.CHARGE_ALIPAY);
} else {
ll_type_first.setVisibility(View.VISIBLE);
}
// int money = mSelectChargeBean.getMoney();
// if (money >= 30000) {
// // 大于 3w 的时候，隐藏微信支付的选项
// ll_type_first.setVisibility(View.GONE);
// // 默认选中支付宝支付的选项
// selectPayChannelDisplay(Constants.CHARGE_ALIPAY);
// } else {
// ll_type_first.setVisibility(View.VISIBLE);
// }
});
onLoadingData();
onRefreshing();
@@ -457,12 +460,14 @@ public class ChargeActivity extends BaseActivity {
tv_type_first.setText(walletInfo.getDefaultPay() == 1?"支付宝":"微信");
tv_type_second.setText(walletInfo.getDefaultPay() == 1?"微信":"支付宝");
payChannel = walletInfo.getDefaultPay() == 1?Constants.CHARGE_ALIPAY:Constants.CHARGE_WX;
int defaultPay = walletInfo.getDefaultPay();
selectPayChannelDisplay(payChannel,defaultPay);
if (walletInfo.getDefaultPay() == 1){
ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY));
ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX));
ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY,defaultPay));
ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX,defaultPay));
}else {
ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX));
ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY));
ll_type_first.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_WX,defaultPay));
ll_type_second.setOnClickListener(v -> selectPayChannelDisplay(Constants.CHARGE_ALIPAY,defaultPay));
}
}

2
nim_uikit/build.gradle
View File

@@ -45,7 +45,7 @@ def base_recyclerview_helper = "2.9.49-androidx"
def ShortcutBadger = "1.1.17"
def ConstraintLayoutVersion = "1.1.3"
def GlideTransformationsVersion = "3.0.1"
def NimNetVersion = "7.8.1"
def NimNetVersion = "7.8.4"
def glideVersion = "4.11.0"
dependencies {