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

1.bug fix

Browse Source 
2.金币->钻石
This commit is contained in:
huangjian
2020-05-07 16:39:56 +08:00
parent 2590fdeefa
commit 7514a6458f
110 changed files with 283 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -151,7 +151,7 @@ public class XChatConstants {
/**
* 分享房间标题
*/
public static final String SHARE_ROOM_TITLE = "上66星球，轻松寻觅对的TA";
public static final String SHARE_ROOM_TITLE = "听声音玩游戏交朋友，来66星球";
/**
* 分享房间 URL

2
core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java
View File

@@ -17,7 +17,7 @@ public class NobleBillListInfo {
/**
* uid : 91222
* optStr : 开通皇帝贵族
* payStr : -1200000金币
* payStr : -1200000钻石
* recordTime : 1516072923000
*/

2
core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java
View File

@@ -17,7 +17,7 @@ public class BaseDecoration implements Serializable {
private int renewPrice;//续费价格
private int originalPrice;//原价
private boolean goldSale;//是否支持金币购买
private boolean goldSale;//是否支持钻石购买
private boolean radishSale;//是否支持萝卜购买
private int radishPrice;//萝卜购买价格

2
core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java
View File

@@ -5,6 +5,6 @@ package com.yizhuan.xchat_android_core.decoration.bean;
* create by lvzebiao @2019/3/22
*/
public interface CurrencyType {
int GOLD = 0; //金币
int GOLD = 0; //钻石
int RADISH = 1; //萝卜
}

6
core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java
View File

@@ -127,7 +127,7 @@ public class CarModel extends BaseModel implements ICarModel {
/**
* 购买此座驾V2
*
* @param currencyType 支付货币类型：0金币，1萝卜
* @param currencyType 支付货币类型：0钻石，1萝卜
*/
@Override
public Single<String> buyThisCarV2(long carId, int currencyType) {
@@ -190,7 +190,7 @@ public class CarModel extends BaseModel implements ICarModel {
*
* @param targetUid 赠送人
* @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType}
* 支付货币类型：0金币，1萝卜
* 支付货币类型：0钻石，1萝卜
* @return
*/
@Override
@@ -232,7 +232,7 @@ public class CarModel extends BaseModel implements ICarModel {
* 购买/续费该座驾V2
*
* @param uid 用户的uid
* @param currencyType 支付货币类型：0金币，1萝卜
* @param currencyType 支付货币类型：0钻石，1萝卜
* @param carId 座驾的id，id!=0 表示购买这个carId的座驾
* @return - carInfo只有carId是有用的，
*/

2
core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java
View File

@@ -61,7 +61,7 @@ public interface ICarModel extends IModel {
/**
* 购买此座驾V2
*
* @param currencyType 支付货币类型：0金币，1萝卜
* @param currencyType 支付货币类型：0钻石，1萝卜
*/
Single<String> buyThisCarV2(long carId, int currencyType);

6
core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java
View File

@@ -236,7 +236,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel {
* 赠送头饰
*
* @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType}
* 支付货币类型：0金币，1萝卜
* 支付货币类型：0钻石，1萝卜
*/
@Override
public Single<String> sendHeadWearV2(int currencyType, String headwearId, String targetUid) {
@@ -346,7 +346,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel {
*
* @param uid
* @param headwearId
* @param currencyType 支付货币类型：0金币，1萝卜
* @param currencyType 支付货币类型：0钻石，1萝卜
* @return
*/
@POST("headwear/v2/buy")
@@ -371,7 +371,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel {
/**
* 赠送头饰V2
*
* @param currencyType 支付货币类型：0金币，1萝卜
* @param currencyType 支付货币类型：0钻石，1萝卜
*/
@POST("headwear/v2/headwear/donate")
Single<ServiceResult<String>> sendHeadWearV2(@Query("uid") String uid,

4
core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java
View File

@@ -73,7 +73,7 @@ public interface IHeadwearModel extends IModel {
* 购买/续费头饰V2
*
* @param headwearId
* @param currencyType 支付货币类型：0金币，1萝卜
* @param currencyType 支付货币类型：0钻石，1萝卜
* @return
*/
Single<String> buyHeadWearV2(long headwearId, int currencyType);
@@ -90,7 +90,7 @@ public interface IHeadwearModel extends IModel {
* 赠送头饰
*
* @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType}
* 支付货币类型：0金币，1萝卜
* 支付货币类型：0钻石，1萝卜
*/
Single<String> sendHeadWearV2(int currencyType, String headwearId, String targetUid);
}

4
core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java
View File

@@ -14,7 +14,7 @@ import lombok.Data;
public class GiftInfo implements Serializable {
/**
* 金币礼物
* 钻石礼物
*/
public final static int CONSUME_TYPE_GOLD = 1;
@@ -67,7 +67,7 @@ public class GiftInfo implements Serializable {
private boolean isSendMsg;
/**
* 消费类型，1：金币礼物，2：萝卜礼物
* 消费类型，1：钻石礼物，2：萝卜礼物
*/
private int consumeType;

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java
View File

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.Getter;
/**
* 金币瓜分
* 钻石瓜分
* create by lvzebiao @2019/3/29
*/
public class CarveUpGoldAttachment extends CustomAttachment {

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.im.custom.bean;
/**
* 瓜分金币，二级，房间公屏
* 瓜分钻石，二级，房间公屏
* create by lvzebiao @2019/3/29
*/
public class CarveUpGoldSecondLevelAttachment extends CarveUpGoldAttachment {

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java
View File

@@ -1,7 +1,7 @@
package com.yizhuan.xchat_android_core.im.custom.bean;
/**
* 瓜分金币，三级，房间公屏+小秘书
* 瓜分钻石，三级，房间公屏+小秘书
* create by lvzebiao @2019/3/29
*/
public class CarveUpGoldThirdLevelAttachment extends CarveUpGoldAttachment {

4
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java
View File

@@ -253,8 +253,8 @@ public class CustomAttachment implements MsgAttachment {
//签到
public static final int CUSTOM_MSG_SIGN_IN = 41;
public static final int CUSTOM_MSG_SUB_JUMP_SIGN_IN_ACTIVITY = 411;//提醒，点击跳转到签到界面
public static final int CUSTOM_MSG_SUB_CARVE_UP_GOLD_SECOND_LEVEL = 412;//瓜分金币，第二等级，有房间公屏通知
public static final int CUSTOM_MSG_SUB_CARVE_UP_GOLD_THIRD_LEVEL = 413;//瓜分金币，第三等级，房间公屏+小秘书
public static final int CUSTOM_MSG_SUB_CARVE_UP_GOLD_SECOND_LEVEL = 412;//瓜分钻石，第二等级，有房间公屏通知
public static final int CUSTOM_MSG_SUB_CARVE_UP_GOLD_THIRD_LEVEL = 413;//瓜分钻石，第三等级，房间公屏+小秘书
//礼物值
public static final int CUSTOM_MSG_ROOM_GIFT_VALUE = 42;

2
core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java
View File

@@ -46,7 +46,7 @@ public class RouterType {
public static final int DECORATION = 8;
/**
* 9-家族金币 传参：家族 id(FamilyId) 跳转到家族金币页面;
* 9-家族钻石 传参：家族 id(FamilyId) 跳转到家族钻石页面;
*/
public static final int SYS_MSG = 9;

4
core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java
View File

@@ -26,8 +26,8 @@ public class InitInfo implements Serializable {
private NobleResourceComponent nobleResource;
private List<MonsterInitInfo> monsters;
private double exchangeGoldRate;// 钻石兑换金币比率
private double exchangeRate;// 钻石兑换金币比率
private double exchangeGoldRate;// 钻石兑换钻石比率
private double exchangeRate;// 钻石兑换钻石比率
private TaxInfo tax;//提现手续费
/**

2
core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java
View File

@@ -55,7 +55,7 @@ public class MagicInfo implements Serializable {
private String impactValue;
/**
* 消费类型，1：金币礼物，2：萝卜礼物
* 消费类型，1：钻石礼物，2：萝卜礼物
*/
private int consumeType = GiftInfo.CONSUME_TYPE_GOLD;

2
core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java
View File

@@ -15,7 +15,7 @@ public class MonsterHuntingReward {
/**
* 奖品类型
* @see #REWARD_GOLD 金币
* @see #REWARD_GOLD 钻石
* @see #REWARD_ACCOUNT 靓号
* @see #REWARD_CAR 座驾
* @see #REWARD_PHYSICAL 实物

8
core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java
View File

@@ -19,19 +19,19 @@ public class NobleRight implements Serializable {
*/
private String name;
/**
* 开通的金币
* 开通的钻石
*/
private int openGold;
/**
* 续费贵族的金币
* 续费贵族的钻石
*/
private int renewGold;
/**
* 开通返还的金币
* 开通返还的钻石
*/
private int openReturn;
/**
* 续费返回的金币
* 续费返回的钻石
*/
private int renewReturn;
/**

68
core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java
View File

@@ -11,8 +11,10 @@ import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.NinePatchDrawable;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -64,18 +66,18 @@ public class NobleUtil {
return targetPath;
}
public static String getNobleLevel(ChatRoomMessage chatRoomMessage){
public static String getNobleLevel(ChatRoomMessage chatRoomMessage) {
if (chatRoomMessage == null) return null;
String account="";
String account = "";
try {
account = ExtensionUtil.getAccount(chatRoomMessage);
}catch (NullPointerException e){
account="";
} catch (NullPointerException e) {
account = "";
}
if (TextUtils.isEmpty(account)) return null;
Map<String, Object> map = ExtensionUtil.getExtension(chatRoomMessage, account);
if (map == null) return null;
return getLevel(map.get(NobleResourceType.KEY_LEVEL));
return getLevel(map.get(NobleResourceType.KEY_LEVEL));
}
public static void loadResource(String name, final ImageView imageView, int defaultResId) {
@@ -139,13 +141,16 @@ public class NobleUtil {
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
if (url.equals(imageView.getTag())) {
List<Drawable> split = ImageSplitter.splits(url, resource);
AnimationDrawable animationDrawable=new AnimationDrawable();
AnimationDrawable animationDrawable = new AnimationDrawable();
for (int i = 0; i < split.size(); i++) {
animationDrawable.addFrame(split.get(i),200);
animationDrawable.addFrame(split.get(i), 200);
}
imageView.setImageDrawable(animationDrawable);
animationDrawable.setOneShot(false);
animationDrawable.start();
imageView.post(() -> {
imageView.setImageDrawable(animationDrawable);
animationDrawable.setOneShot(false);
animationDrawable.start();
});
}
return false;
}
@@ -167,13 +172,16 @@ public class NobleUtil {
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
List<Drawable> split = ImageSplitter.split(resource);
AnimationDrawable animationDrawable=new AnimationDrawable();
AnimationDrawable animationDrawable = new AnimationDrawable();
for (int i = 0; i < split.size(); i++) {
animationDrawable.addFrame(split.get(i),200);
animationDrawable.addFrame(split.get(i), 200);
}
imageView.setImageDrawable(animationDrawable);
animationDrawable.setOneShot(false);
animationDrawable.start();
imageView.post(() -> {
imageView.setImageDrawable(animationDrawable);
animationDrawable.setOneShot(false);
animationDrawable.start();
});
return false;
}
}).submit();
@@ -205,13 +213,16 @@ public class NobleUtil {
return false;
}
List<Drawable> split = ImageSplitter.split(resource);
AnimationDrawable animationDrawable=new AnimationDrawable();
AnimationDrawable animationDrawable = new AnimationDrawable();
for (int i = 0; i < split.size(); i++) {
animationDrawable.addFrame(split.get(i), 200);
}
imageView.setImageDrawable(animationDrawable);
animationDrawable.setOneShot(false);
animationDrawable.start();
imageView.post(() -> {
imageView.setImageDrawable(animationDrawable);
animationDrawable.setOneShot(false);
animationDrawable.start();
});
return false;
}
}).submit();
@@ -232,9 +243,9 @@ public class NobleUtil {
@Override
public boolean onResourceReady(Bitmap resource, Object model, Target<Bitmap> target, DataSource dataSource, boolean isFirstResource) {
List<Drawable> split = ImageSplitter.split(resource);
AnimationDrawable animationDrawable=new AnimationDrawable();
AnimationDrawable animationDrawable = new AnimationDrawable();
for (int i = 0; i < split.size(); i++) {
animationDrawable.addFrame(split.get(i),200);
animationDrawable.addFrame(split.get(i), 200);
}
imageView.setImageDrawable(animationDrawable);
animationDrawable.setOneShot(false);
@@ -471,7 +482,6 @@ public class NobleUtil {
}
public static void loadResource(final Context context, String name, View view) {
String resourcePath = NobleDataManager.get().getResourcePath();
if (TextUtils.isEmpty(resourcePath) || TextUtils.isEmpty(name)) return;
@@ -558,6 +568,7 @@ public class NobleUtil {
}
return (String) map.get(type);
}
/**
* 该等级是否有权限做这个操作 / 获取这个资源
*
@@ -645,8 +656,8 @@ public class NobleUtil {
String account;
try {
account = ExtensionUtil.getAccount(chatRoomMessage);
}catch (NullPointerException e){
account="";
} catch (NullPointerException e) {
account = "";
}
if (TextUtils.isEmpty(account)) return "";
@@ -712,8 +723,10 @@ public class NobleUtil {
if (extension == null || extension.get(type) == null) return "";
return extension.get(type).toString();
}
/**
* 是否为官方
*
* @return -
*/
public static boolean getIsOfficial(String type, ChatRoomMessage chatRoomMessage) {
@@ -737,7 +750,8 @@ public class NobleUtil {
}
/**
*是否为新人
* 是否为新人
*
* @return -
*/
public static boolean getIsNewUser(String type, ChatRoomMessage chatRoomMessage, String acooount) {
@@ -745,8 +759,10 @@ public class NobleUtil {
if (extension == null || extension.get(type) == null) return false;
return (boolean) extension.get(type);
}
/**
*是否为新人
* 是否为新人
*
* @return -
*/
public static boolean getIsNewUser(String type, ChatRoomMessage chatRoomMessage) {

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

@@ -197,7 +197,7 @@ public class PayModel extends BaseModel implements IPayModel {
}
/**
* 钻石兑换金币
* 钻石兑换钻石
* @param diamondNum 钻石数
* @param hammerNum 得到的锤子数
* @param pwd 支付密码
@@ -300,7 +300,7 @@ public class PayModel extends BaseModel implements IPayModel {
/**
* 减少本地缓存的金币，同时设置WalletInfo到旧版的逻辑中
* 减少本地缓存的钻石，同时设置WalletInfo到旧版的逻辑中
*
* @param price -
*/

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

@@ -11,9 +11,9 @@ public class ChargeBean implements Serializable{
/*
channelType:1支付宝微信公众号充值3苹果充值
"chargeProdId": 1, //充值产品ID
"prodName": "600金币", //产品显示名称
"prodName": "600钻石", //产品显示名称
"money": 6, //产品价格（单位：元）
"giftGoldNum": 20, //赠送金币数量
"giftGoldNum": 20, //赠送钻石数量
"channel": "wx" //充值渠道
*/

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

@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_core.pay.bean;
import lombok.Data;
/**
* 金币赠送的每一项
* 钻石赠送的每一项
* create by lvzebiao @2019/12/1
*/
@Data

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

@@ -4,7 +4,7 @@ import android.os.Parcel;
import android.os.Parcelable;
/**
* 金币实体
* 钻石实体
*
* @author Administrator
* @date 2017/7/20 0020
@@ -12,19 +12,19 @@ import android.os.Parcelable;
public class WalletInfo implements Parcelable {
public long uid;
/** 总金币（贵族+普通）数量 */
/** 总钻石（贵族+普通）数量 */
public double golds;
/** 钻石数量 */
public double diamonds;
/** 预扣款（押金） */
public double depositNum;
public int amount;
/** 普通的金币 */
/** 普通的钻石 */
public double chargeGoldNum;
/** 贵族金币 */
/** 贵族钻石 */
public double nobleGoldNum;
/**
* true 显示金币转赠 false 隐藏金币转赠
* true 显示钻石转赠 false 隐藏钻石转赠
*/
private boolean sendGold;

2
core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java
View File

@@ -3,7 +3,7 @@ package com.yizhuan.xchat_android_core.pay.event;
import com.yizhuan.xchat_android_core.base.BaseBusEvent;
/**
* 赠送金币成功的事件
* 赠送钻石成功的事件
* create by lvzebiao @2019/12/1
*/
public class SendGoldSuccessEvent extends BaseBusEvent<Integer> {

6
core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java
View File

@@ -61,7 +61,7 @@ public class SignInModel extends BaseModel implements ISignInModel {
}
/**
* 瓜分金币
* 瓜分钻石
*/
@Override
public Single<SignDrawInfo> signDraw() {
@@ -82,7 +82,7 @@ public class SignInModel extends BaseModel implements ISignInModel {
}
/**
* 瓜分金币通知栏
* 瓜分钻石通知栏
*/
@Override
public Single<List<DrawNoticeInfo>> drawNotice() {
@@ -108,7 +108,7 @@ public class SignInModel extends BaseModel implements ISignInModel {
/**
* 获取签到分享图片
* @param shareType
* 1普通，2领取礼物，3瓜分金币
* 1普通，2领取礼物，3瓜分钻石
*/
@Override
public Single<String> getShareImage(int shareType, @Nullable String day, @Nullable String reward) {

2
core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java
View File

@@ -5,5 +5,5 @@ import lombok.Data;
@Data
public class DrawNoticeInfo {
private String erbanNo;
private int goldNum; //瓜分的金币数
private int goldNum; //瓜分的钻石数
}

6
core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java
View File

@@ -29,11 +29,11 @@ public class SignDetailInfo {
private int isSignRemind; // 是否开启签到提醒（0未开启，1已开启）
private int isSign; // 今天是否已签到（0未签到，1已签到）
private int isDrawGold; // 是否开启瓜分金币按钮（0不开启，1开启未瓜分，2开启已瓜分）
private int drawGoldNum; // 瓜分到的金币数（当isDrawGold不为2时，此字段为空）
private int isDrawGold; // 是否开启瓜分钻石按钮（0不开启，1开启未瓜分，2开启已瓜分）
private int drawGoldNum; // 瓜分到的钻石数（当isDrawGold不为2时，此字段为空）
private int showGoldNum; // 展示奖池金额数
private int totalDay; //累积签到n天
private String drawGoldDate; // 瓜分金币时间
private String drawGoldDate; // 瓜分钻石时间
private String signPrizeName; // 今天签到获取的奖品名
private int signPrizeNum; // 今日签到获取的奖品数量
private int todaySignDay; // 第n天签到

2
core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java
View File

@@ -19,7 +19,7 @@ public class SignDrawInfo {
private long uid;
private long roundId; // 当前轮数id
private long round; // 当前轮数
private long goldNum; // 瓜分的金币数
private long goldNum; // 瓜分的钻石数
private long goldPoolId; // 瓜分到的奖池奖品id
private int level; // 瓜分到的奖品等级
private long createTime;

2
core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java
View File

@@ -48,7 +48,7 @@ public class PrizeAnim {
public static PrizeAnim formatDrawGold(SignDrawInfo signDrawInfo) {
PrizeAnim prizeAnim = new PrizeAnim();
prizeAnim.setPrizeName("金币x" + signDrawInfo.getGoldNum());
prizeAnim.setPrizeName("钻石x" + signDrawInfo.getGoldNum());
prizeAnim.setSignDays(28);
return prizeAnim;
}

2
core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java
View File

@@ -38,7 +38,7 @@ public class TaskInfo {
* name : 每日签到
* current : 0
* target : 1
* description : 瓜分百万金币
* description : 瓜分百万钻石
* status : 0
* skipType : 1
* routerType : 26

2
core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java
View File

@@ -102,7 +102,7 @@ public class GiftValueMrg {
return;
}
if (!giftValueCommonUpdate.isGoldGift()) {
//不是金币礼物就返回
//不是钻石礼物就返回
return;
}
RoomGiftValue roomGiftValue = giftValueCommonUpdate.getRoomGiftValue();

8
core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java
View File

@@ -127,7 +127,7 @@ public class PkModel extends BaseModel implements IPkModel {
case RoomEvent.RECEIVE_GIFT:
GiftReceiveInfo giftReceiveInfo = roomEvent.getGiftReceiveInfo();
if (giftReceiveInfo == null || !isGoldGift(giftReceiveInfo.getGift())) {
//金币礼物才算分数
//钻石礼物才算分数
return;
}
teamId = getTeamIdInPKMemberList(String.valueOf(giftReceiveInfo.getTargetUid()));
@@ -143,7 +143,7 @@ public class PkModel extends BaseModel implements IPkModel {
case RoomEvent.RECEIVE_MULTI_GIFT:
MultiGiftReceiveInfo multiGiftReceiveInfo = roomEvent.getMultiGiftReceiveInfo();
if (multiGiftReceiveInfo == null || !isGoldGift(multiGiftReceiveInfo.getGift())) {
//金币礼物才算分数
//钻石礼物才算分数
return;
}
for (Long aLong : multiGiftReceiveInfo.getTargetUids()) {
@@ -161,7 +161,7 @@ public class PkModel extends BaseModel implements IPkModel {
case RoomEvent.RECEIVE_GIFT_TO_MULTI:
GiftMultiReceiverInfo giftMultiReceiverInfo = roomEvent.getGiftMultiReceiverInfo();
if (giftMultiReceiverInfo == null || !isGoldGift(giftMultiReceiverInfo.getGift())) {
//金币礼物才算分数
//钻石礼物才算分数
return;
}
for (GiftReceiver receiver : giftMultiReceiverInfo.getTargetUsers()) {
@@ -214,7 +214,7 @@ public class PkModel extends BaseModel implements IPkModel {
}
/**
* 判断是否是金币礼物
* 判断是否是钻石礼物
* @param giftInfo
* @return
*/

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

@@ -26,9 +26,9 @@ public class StatisticsProtocol {
EVENT_LOGIN_REPARI_SUCCESS_CLICK("login_repari_success_click"),//用户完善资料
EVENT_EXCHANGE_CLICK("exchange_click"),// 我的礼物/我的金币 兑换金币
EVENT_EXCHANGE_CLICK("exchange_click"),// 我的礼物/我的钻石 兑换钻石
EVENT_ACCOUNT_WITHDRAW_CLICK("account_withdraw_click"),// 提现按钮
EVENT_RECHARGE_CLICK("recharge_click"),// 金币充值
EVENT_RECHARGE_CLICK("recharge_click"),// 钻石充值
EVENT_ROOM_INPUT_BOX_CLICK("room_input_box_click"),// 底部文字输入框点击
EVENT_ROOM_SWITCH_KTV_CLICK("room_switch_ktv_click"),// 切换KTV模式
@@ -158,7 +158,7 @@ public class StatisticsProtocol {
game_homepage_lunkyroom("game_homepage_lunkyroom"),//首页声控福利房
//师徒
FIND_APPRENTICE_ENTRANCE("find_apprentice_entrance"),//收个徒弟赢金币
FIND_APPRENTICE_ENTRANCE("find_apprentice_entrance"),//收个徒弟赢钻石
MENTOR_GO_TO_THE_APPRENTICE("mentor_go_to_the_apprentice"),//去收徒
MENTOR_RANKING_LIST("mentor_ranking_list"),//名师排行榜
MENTOR_DISENGAGEMENT("mentor_disengagement"),//解除关系

4
core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java
View File

@@ -24,7 +24,7 @@ public class SharedPreferenceUtils {
preferences = context.getSharedPreferences(XChatConstants.XCHAT_SHARE_PREFERENCE_NAME, Context.MODE_PRIVATE);
}
// 耳伴金币兑率
// 耳伴钻石兑率
public static void setExchangeGoldRate(double exchangeGoldRate) {
put(KEY_EXCHANGE_GOLD_RATE, Double.toString(exchangeGoldRate));
}
@@ -33,7 +33,7 @@ public class SharedPreferenceUtils {
return Double.parseDouble((String) get(KEY_EXCHANGE_GOLD_RATE, "0"));
}
// 哈哈金币兑率
// 哈哈钻石兑率
public static void setExchangeRate(double exchangeRate) {
put(KEY_EXCHANGE_RATE, Double.toString(exchangeRate));
}

2
core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java
View File

@@ -5,7 +5,7 @@ package com.yizhuan.xchat_android_core.utils.net;
*/
public class BalanceNotEnoughExeption extends Exception {
public final static int code = 2103;//金币不足错误码
public final static int code = 2103;//钻石不足错误码
public BalanceNotEnoughExeption(String message) {
super(message);
}

1
core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java
View File

@@ -5,6 +5,7 @@ import android.text.TextUtils;
import com.google.gson.JsonElement;
import com.orhanobut.logger.Logger;
import com.trello.rxlifecycle2.LifecycleProvider;
import com.trello.rxlifecycle2.android.ActivityEvent;
import com.trello.rxlifecycle2.android.FragmentEvent;

2
core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/manager/PublicChatHallDataManager.java
View File

@@ -177,7 +177,7 @@ public class PublicChatHallDataManager {
if (giftInfo == null) {
giftInfo = GiftModel.get().findGiftInfoById(giftReceiveInfo.getGiftId());
}
// 要大于等于66金币的时候才有动画效果
// 要大于等于66钻石的时候才有动画效果
if (giftInfo.getGoldPrice() * giftReceiveInfo.getGiftNum() >= 66) {
EventBus.getDefault()
.post(new PublicChatHallPlayGiftAnimationEvent()

2
core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java
View File

@@ -6,7 +6,7 @@ import java.util.List;
public class OpenBoxHonourResult implements Serializable {
private List<PrizeInfo> prizeItemList;
private int remainKeyNum;
private int spendGold;// 花费金币数(能量值)
private int spendGold;// 花费钻石数(能量值)
public List<PrizeInfo> getPrizeItemList() {
return prizeItemList;