1.宝箱相关逻辑

2.关闭第三方推送
3.去掉读取手机信息权限
This commit is contained in:
huangjian
2020-05-05 17:06:10 +08:00
parent 3f8705a812
commit 72c6569fc1
24 changed files with 459 additions and 672 deletions

View File

@@ -301,5 +301,26 @@ public class UriProvider {
public static String getPersonalCharismaRank() {
return JAVA_WEB_URL.concat("/accompany/modules/charm/index.html");
}
/**
* 宝箱排行
*
*/
public static String getBoxRank() {
return JAVA_WEB_URL.concat("/accompany/modules/rank/index.html#/wishingWellRank");
}
/**
* 宝箱帮助
*
*/
public static String getBoxHelp() {
return JAVA_WEB_URL.concat("/accompany/modules/rank/index.html#/wishingWellRule");
}
/**
* 宝箱记录
*
*/
public static String getBoxHistory() {
return JAVA_WEB_URL.concat("/accompany/modules/rank/index.html#/wishingWellRecord");
}
}

View File

@@ -1273,8 +1273,8 @@ public class AuthModel extends BaseModel implements IAuthModel {
//更新消息提醒配置
initNotificationConfig();
Log.e(TAG, "onSuccess: ready to open push");
NIMClient.getService(MixPushService.class).enable(true).setCallback(new RequestCallbackWrapper<Void>() {
//暂时关闭云信第三方推送,以后再开
NIMClient.getService(MixPushService.class).enable(false).setCallback(new RequestCallbackWrapper<Void>() {
@Override
public void onResult(int code, Void result, Throwable exception) {
Log.e(TAG, "onResult() called with: code = [" + code + "], result = [" + result + "], exception = [" + exception + "]");

View File

@@ -57,11 +57,11 @@ public class BoxModel extends BaseModel implements IBoxModel {
}
@Override
public Single<OpenBoxResult> openBox(int keyNum, boolean sendMessage) {
public Single<OpenBoxResult> openBox(int boxType,int keyNum, boolean sendMessage) {
if (AvRoomDataManager.get().mCurrentRoomInfo == null) {
return Single.error(new Throwable("当前房间信息为空."));
}
return api.openBox(keyNum, sendMessage, AuthModel.get().getCurrentUid(),
return api.openBox(boxType,keyNum, sendMessage, AuthModel.get().getCurrentUid(),
AvRoomDataManager.get().mCurrentRoomInfo.getUid())
.compose(RxHelper.handleSchedulers())
.flatMap(openBoxResultServiceResult -> {
@@ -110,8 +110,8 @@ public class BoxModel extends BaseModel implements IBoxModel {
}
@Override
public Single<KeyInfo> getKeyInfo() {
return api.getKeyInfo(AuthModel.get().getCurrentUid())
public Single<KeyInfo> getKeyInfo(int boxType) {
return api.getKeyInfo(boxType,AuthModel.get().getCurrentUid())
.compose(RxHelper.handleSchedulers())
.compose(RxHelper.handleBeanData());
}
@@ -138,7 +138,7 @@ public class BoxModel extends BaseModel implements IBoxModel {
@Override
public Single<OpenBoxHonourResult> openHonourBox(long uid, boolean sendMessage, long roomUid,
int keyNum, String ticket) {
int keyNum, String ticket) {
return api.openHonourBox(uid, sendMessage, roomUid, keyNum, ticket)
.compose(RxHelper.handleSchedulers())
.compose(RxHelper.handleBeanData());
@@ -184,7 +184,8 @@ public class BoxModel extends BaseModel implements IBoxModel {
*/
@FormUrlEncoded
@POST("box/draw")
Single<ServiceResult<OpenBoxResult>> openBox(@Field("keyNum") int keyNum,
Single<ServiceResult<OpenBoxResult>> openBox(@Field("boxType") int boxType,
@Field("keyNum") int keyNum,
@Field("sendMessage") boolean sendMessage,
@Field("uid") long uid,
@Field("roomUid") long roomUid);
@@ -208,7 +209,8 @@ public class BoxModel extends BaseModel implements IBoxModel {
* @return
*/
@GET("box/userkey")
Single<ServiceResult<KeyInfo>> getKeyInfo(@Query("uid") long uid);
Single<ServiceResult<KeyInfo>> getKeyInfo(@Query("boxType") int boxType,
@Query("uid") long uid);
/**
* 获取开箱子配置图片
@@ -244,10 +246,10 @@ public class BoxModel extends BaseModel implements IBoxModel {
@FormUrlEncoded
@POST("box/diamond/draw")
Single<ServiceResult<OpenBoxHonourResult>> openHonourBox(@Field("uid") long uid,
@Field("sendMessage") boolean sendMessage,
@Field("roomUid") long roomUid,
@Field("keyNum") int keyNum,
@Field("ticket") String ticket);
@Field("sendMessage") boolean sendMessage,
@Field("roomUid") long roomUid,
@Field("keyNum") int keyNum,
@Field("ticket") String ticket);
/**
* 购买钻石宝箱钥匙
@@ -255,8 +257,8 @@ public class BoxModel extends BaseModel implements IBoxModel {
@FormUrlEncoded
@POST("box/diamond/buykey")
Single<ServiceResult<HonourBuyKeyResultInfo>> buyHonourKey(@Field("uid") long uid,
@Field("keyNum") int keyNum,
@Field("ticket") String ticket);
@Field("keyNum") int keyNum,
@Field("ticket") String ticket);
/**
* 至尊蛋本期奖池

View File

@@ -31,7 +31,7 @@ public interface IBoxModel extends IModel {
* @param sendMessage
* @return
*/
Single<OpenBoxResult> openBox(int keyNum, boolean sendMessage);
Single<OpenBoxResult> openBox(int boxType,int keyNum, boolean sendMessage);
/**
* 获取中奖记录
@@ -60,7 +60,7 @@ public interface IBoxModel extends IModel {
*
* @return
*/
Single<KeyInfo> getKeyInfo();
Single<KeyInfo> getKeyInfo(int boxType);
/**
* 获取奖品列表