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

[Modify]谷歌下架原因排查

Browse Source
This commit is contained in:
wushaocheng
2023-03-09 16:10:26 +08:00
parent 941dc7b100
commit c2c3f29839
24 changed files with 21 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
View File

@@ -59,18 +59,9 @@ public class Constants {
public static final String KEY_POSITION = "position";
public static final String CHARGE_WX = "wx";
public static final String CHARGE_ALIPAY = "alipay_v2";
public static final String CHARGE_UNION_PAY = "fastpay";
public static final String CHARGE_WX_MP = "wx_mp";
public static final String QUESTION_MARK = "?";
public static final int PAGE_TYPE_AV_ROOM_ACTIVITY = 100;
public static final int PAGE_TYPE_USER_INFO_ACTIVITY = 101;
public static final int PAGE_TYPE_MAIN_FRAGMENT = 102;
public static final String KEY_ROOM_IS_SHOW_ONLINE = "is_show_online";
public static final String KEY_ROOM_INFO = "key_room_info";
/**
* 房间相关Key设置

8
core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java
View File

@@ -10,8 +10,6 @@ import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods;
import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo;
import com.yizhuan.xchat_android_core.pay.bean.PayRecordId;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_core.pay.bean.WxPayType;
import java.util.List;
import io.reactivex.Single;
@@ -38,8 +36,8 @@ public interface IPayModel extends IModel {
Single<WalletInfo> getWalletInfo();
/*
获取充值产品列表
1,支付宝
2，微信公众号充值
1,facebook
2，line公众号充值
3，苹果充值
*/
@@ -93,8 +91,6 @@ public interface IPayModel extends IModel {
Single<String> getSmsBindAli();
Single<WxPayType> getWxpayType();
/**
* 是否首次充值
*/

18
core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java
View File

@@ -6,8 +6,8 @@ import android.content.Context;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
import com.yizhuan.xchat_android_core.R;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.R;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.base.BaseModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
@@ -19,7 +19,6 @@ import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods;
import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo;
import com.yizhuan.xchat_android_core.pay.bean.PayRecordId;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_core.pay.bean.WxPayType;
import com.yizhuan.xchat_android_core.pay.event.ChargeCustomNotificationEvent;
import com.yizhuan.xchat_android_core.pay.event.FirstRechargeEvent;
import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent;
@@ -373,13 +372,6 @@ public class PayModel extends BaseModel implements IPayModel {
});
}
@Override
public Single<WxPayType> getWxpayType() {
return api.getWxpayType()
.compose(RxHelper.handleBeanData())
.compose(RxHelper.handleSchedulers());
}
/**
* 主要是为了兼容旧版的walletInfo
*
@@ -615,14 +607,6 @@ public class PayModel extends BaseModel implements IPayModel {
@GET("/chargeRecord/isFirstCharge")
Single<ServiceResult<Boolean>> apiIsFirstCharge();
/**
* 获取微信支付方式
*
* @return
*/
@GET("/charge/wxpay/type")
Single<ServiceResult<WxPayType>> getWxpayType();
/**
* 钻石转赠
*

2
core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java
View File

@@ -11,7 +11,7 @@ import java.io.Serializable;
public class ChargeBean implements Serializable{
/*
channelType:1支付宝微信公众号充值3苹果充值
channelType:1google2公众号充值3苹果充值
"chargeProdId": 1, //充值产品ID
"prodName": ResUtil.getString(R.string.pay_bean_chargebean_01), //产品显示名称
"money": 6, //产品价格（单位：元）

2
core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java
View File

@@ -36,7 +36,7 @@ public class WalletInfo implements Parcelable {
/** 可转赠的钻石 */
private double canGiveGoldNum;
/** 1：默认支付宝，2：默认微信 */
/** 1：默认line，2：默认facebook */
private int defaultPay;
public WalletInfo() {

33
core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WxPayType.java
View File

@@ -1,33 +0,0 @@
package com.yizhuan.xchat_android_core.pay.bean;
public class WxPayType {
private String wxPayType;
//微信小程序对应的appId
private String wxminiAppid;
//微信小程序原始id
private String wxminiId;
public String getWxPayType() {
return wxPayType;
}
public void setWxPayType(String wxPayType) {
this.wxPayType = wxPayType;
}
public String getWxminiAppid() {
return wxminiAppid;
}
public void setWxminiAppid(String wxminiAppid) {
this.wxminiAppid = wxminiAppid;
}
public String getWxminiId() {
return wxminiId;
}
public void setWxminiId(String wxminiId) {
this.wxminiId = wxminiId;
}
}

24
core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java
View File

@@ -263,14 +263,14 @@ public class ShareModel extends BaseModel implements IShareModel {
sp.setText(XChatConstants.SHARE_FAMILY_TEXT);
sp.setTitle(XChatConstants.SHARE_FAMILY_TITLE + "“" + title + "”");
sp.setImageUrl(familyIcon);
//QQ空间分享
sp.setSite(XChatConstants.SHARE_FAMILY_TEXT);
final String siteUrl = shareLink + "?shareUid=" + String.valueOf(AuthModel.get().getCurrentUid())
+ "&familyId=" + familyId;
sp.setSiteUrl(siteUrl);
//QQ分享
sp.setTitleUrl(siteUrl);
//微信朋友圈分享
sp.setUrl(siteUrl);
sp.setShareType(Platform.SHARE_WEBPAGE);
@@ -313,9 +313,9 @@ public class ShareModel extends BaseModel implements IShareModel {
final String siteUrl = shareLink + "?shareUid=" + String.valueOf(AuthModel.get().getCurrentUid())
+ "&familyId=" + familyId;
sp.setSiteUrl(siteUrl);
//QQ分享
sp.setTitleUrl(siteUrl);
//微信朋友圈分享
sp.setUrl(siteUrl);
sp.setShareType(Platform.SHARE_WEBPAGE);
@@ -409,15 +409,7 @@ public class ShareModel extends BaseModel implements IShareModel {
//无UI API
final String shareLink = UriProvider.IM_SERVER_URL + XChatConstants.SHARE_TEAM_URL;
Platform.ShareParams sp = new Platform.ShareParams();
// sp.setText(XChatConstants.SHARE_TEAM_TEXT);
// sp.setTitle(XChatConstants.SHARE_TEAM_TITLE);
sp.setImageUrl(url);
//QQ空间分享
// sp.setSiteUrl(shareLink);
//QQ分享
// sp.setTitleUrl(shareLink);
//微信朋友圈分享
// sp.setUrl(shareLink);
sp.setSite(XChatConstants.SHARE_TEAM_TEXT);
@@ -477,12 +469,12 @@ public class ShareModel extends BaseModel implements IShareModel {
sp.setText(info.getContent());
sp.setImageUrl(info.getImageUrl());
String siteUrl = info.getSiteUrl();
//QQ空间分享
sp.setSite(info.getTitle());
sp.setSiteUrl(siteUrl);
//QQ分享
sp.setTitleUrl(siteUrl);
//微信朋友圈分享
sp.setUrl(siteUrl);
sp.setShareType(Platform.SHARE_WEBPAGE);
platform.setPlatformActionListener(new PlatformActionListener() {

18
core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java
View File

@@ -16,19 +16,11 @@ public interface StatisticsProtocol {
String EVENT_RECONNECTION_ROOM_CHAT = "String EVENT_reconnection_room_chat";//断网重连聊天室
String USER_KICKED_EVENT = "user_kicked_String EVENT";//用户被踢
String EVENT_LOGIN_QQ_CLICK = "login_qq_click";//点击qq登录
String EVENT_LOGIN_WX_CLICK = "login_wx_click";//点击微信登录
String EVENT_LOGIN_PHONE_CLICK = "login_phone_click";//点击手机号登录
String EVENT_LOGIN_PHONE_REGISTER_CLICK = "login_phone register_click";//手机立即注册按钮
String EVENT_LOGIN_REGISTRATION_FAILED_CLICK = "login_registration_failed";//注册失败
String EVENT_LOGIN_FAILED_CLICK = "login_failed";//登录失败
String EVENT_LOGIN_REPARI_SUCCESS_CLICK = "login_repari_success_click";//用户完善资料
String EVENT_EXCHANGE_CLICK = "exchange_click";// 我的礼物/我的钻石 兑换钻石
String EVENT_ACCOUNT_WITHDRAW_CLICK = "account_withdraw_click";// 提现按钮
String EVENT_RECHARGE_CLICK = "recharge_click";// 钻石充值
String EVENT_ROOM_INPUT_BOX_CLICK = "room_input_box_click";// 底部文字输入框点击
String EVENT_ROOM_SWITCH_KTV_CLICK = "room_switch_ktv_click";// 切换KTV模式
String EVENT_ROOM_OPEN_PLATOON_CLICK = "room_open_platoon_click";// 开启排麦模式
@@ -177,16 +169,6 @@ public interface StatisticsProtocol {
String MENTOR_PUSH_JUMP = "mentor_push_jump";//抢徒弟全局推送-点击跳转
String GLOBAL_PUSH_JUMP = "global_push_jump";//抢徒弟全局推送-点击跳转
//模厅暗号
String EVENT_HALL_ADDMEMBERS_USERID_CLICK = "hall_addMembers_userid_click";//添加成员-PekoID
String EVENT_HALL_ADDMEMBERS_WX_CLICK = "hall_addMembers_wx_click";//添加成员-微信导入
String EVENT_HALL_ADDMEMBERS_QQ_CLICK = "hall_addMembers_qq_click";//添加成员-QQ导入
String EVENT_HALL_PASSWORD_SHARE_WX = "hall_password_share_wx";//分享暗号到微信
String EVENT_HALL_PASSWORD_SHARE_QQ = "hall_password_share_qq";//分享暗号到QQ
String EVENT_JION_HALL_PASSWORD_EVENT = "jion_hall_password_String EVENT";//通过暗号加入厅
String EVENT_ROOM_MY_HALL_CLICK = "room_my_hall_click"; // 厅管理入口
String EVENT_ROOM_RECOMMEND_CLICK = "room_recommend_click"; // 我要上推荐

2
core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java
View File

@@ -168,7 +168,7 @@ public class UserInfo implements Serializable {
private boolean isBindPasswd;
//是否设置支付密码
private boolean isBindPaymentPwd;
//1微信2qq3手机
//1line2facebook3手机
private int bindType;
/**
* 模厅ID