yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_new' into develop_home

Browse Source
This commit is contained in:
oujunhui
2020-05-07 17:47:51 +08:00
parent c95def88c9 412b24e3a5
commit 5687fc4aa5
110 changed files with 283 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -613,7 +613,7 @@
android:screenOrientation="portrait" />
<activity
android:name=".ui.wallet.ExchangeGoldActivity"
android:label="兑换金币"
android:label="兑换钻石"
android:screenOrientation="portrait" />
<activity
android:name=".ui.setting.SettingActivity"

2
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -414,7 +414,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
HallDataManager.get().mainNimOnCreate();
//签到
NimUIKit.registerMsgItemViewHolder(OpenSignInAttachment.class, SignInNoticeMsgViewHolder.class);
//瓜分金币 三级
//瓜分钻石 三级
NimUIKit.registerMsgItemViewHolder(CarveUpGoldThirdLevelAttachment.class, MsgViewHolderText.class);
// 话匣子
// NimUIKit.registerMsgItemViewHolder(ChatterBoxAttachment.class, MVHChatterBoxStart.class);

3
app/src/main/java/com/yizhuan/erban/avroom/activity/AVRoomActivity.java
View File

@@ -544,8 +544,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
mRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
Logger.i("进入房间成功：" + mRoomInfo.getRoomId());
dismissDialog();
getMvpPresenter().getMonster();
//getMvpPresenter().getMonster();
startGame();
}

6
app/src/main/java/com/yizhuan/erban/avroom/adapter/MicroViewAdapter.java
View File

@@ -115,12 +115,12 @@ public class MicroViewAdapter extends BaseMicroViewAdapter {
@Override
public int getItemViewType(int position) {
RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
// RoomInfo roomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (position == 0) return TYPE_BOSS;
// 新秀房，牌照房展示老板位
if (roomInfo != null && (roomInfo.getIsPermitRoom() == 1 || roomInfo.getIsPermitRoom() == 3) && position == 8)
return TYPE_KING;
//if (roomInfo != null && (roomInfo.getIsPermitRoom() == 1 || roomInfo.getIsPermitRoom() == 3) && position == 8)
// return TYPE_KING;
return TYPE_NORMAL;
}

10
app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
View File

@@ -738,7 +738,7 @@ public class MessageView extends FrameLayout {
}
} else if (first == CustomAttachment.CUSTOM_MSG_SIGN_IN
&& second == CustomAttachment.CUSTOM_MSG_SUB_CARVE_UP_GOLD_SECOND_LEVEL) {
//二级瓜分金币
//二级瓜分钻石
// 清除聊天背景
clearBackground(tvContent);
setCarveUpGoldMsg(chatRoomMessage, tvContent);
@@ -1598,13 +1598,13 @@ public class MessageView extends FrameLayout {
senderNick = UserInfoHelper.getUserDisplayName(auctionAttachment.getAuctionInfo().getCurMaxUid() + "");
String voiceActorNick = UserInfoHelper.getUserDisplayName(auctionAttachment.getAuctionInfo().getAuctUid() + "");
builder.append(senderNick, new ForegroundColorSpan(roomTipNickColor))
.append(" 以" + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + "金币拍下 ")
.append(" 以" + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + "钻石拍下 ")
.append(voiceActorNick, new ForegroundColorSpan(roomTipNickColor));
} else
builder.append("房主 结束了竞拍，当前暂无人出价", new ForegroundColorSpan(roomTipNickColor));
} else {
builder.append(senderNick, new ForegroundColorSpan(roomTipNickColor))
.append(" 出价" + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + "金币");
.append(" 出价" + auctionAttachment.getAuctionInfo().getRivals().get(0).getAuctMoney() + "钻石");
}
tvContent.setText(builder.build());
}
@@ -2105,7 +2105,7 @@ public class MessageView extends FrameLayout {
}
/**
* 瓜分金币的消息，二级和三级都有
* 瓜分钻石的消息，二级和三级都有
*
* @param chatRoomMessage
* @param tvContent
@@ -2120,7 +2120,7 @@ public class MessageView extends FrameLayout {
.append("【签到瓜分百万】哇塞，恭喜 ", new ForegroundColorSpan(greyColor))
.append(attachment.getNick() + " ", new ForegroundColorSpan(roomTipColor))
.append("签到获得 ", new ForegroundColorSpan(greyColor))
.append(attachment.getGoldNum() + "金币", new ForegroundColorSpan(roomTipColor))
.append(attachment.getGoldNum() + "钻石", new ForegroundColorSpan(roomTipColor))
.append("！", new ForegroundColorSpan(greyColor));
tvContent.setText(text.build());
}

2
app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java
View File

@@ -127,6 +127,6 @@ public class BillGiftIncomeGroupActivity extends BaseMvpActivity<IBillGiftIncome
@Override
public void navigatorSelected(int position) {
showRightOption(position == 0); // 金币礼物显示充值按钮
showRightOption(position == 0); // 钻石礼物显示充值按钮
}
}

2
app/src/main/java/com/yizhuan/erban/bills/adapter/ChargeBillsAdapter.java
View File

@@ -25,7 +25,7 @@ public class ChargeBillsAdapter extends BillBaseAdapter {
if (expendInfo == null) {
return;
}
baseViewHolder.setText(R.id.tv_gold, "充值" + expendInfo.getGoldNum() + "金币")
baseViewHolder.setText(R.id.tv_gold, "充值" + expendInfo.getGoldNum() + "钻石")
.setText(R.id.tv_money, expendInfo.getShowStr())
.setText(R.id.tv_charge_time, TimeUtils.getYearMonthDayHourMinuteSecond(expendInfo.getRecordTime()));
}

2
app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawRedBillsAdapter.java
View File

@@ -24,7 +24,7 @@ public class WithdrawRedBillsAdapter extends BillBaseAdapter {
public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) {
RedBagInfo redBagInfo = billItemEntity.mRedBagInfo;
if (redBagInfo == null) return;
baseViewHolder.setText(R.id.tv_diamondNum, "提现" + redBagInfo.getPacketNum() + "金币")
baseViewHolder.setText(R.id.tv_diamondNum, "提现" + redBagInfo.getPacketNum() + "钻石")
.setText(R.id.tv_date, TimeUtils.getYearMonthDayHourMinuteSecond(redBagInfo.getCreateTime()))
// .setText(R.id.tv_money, "+" + redBagInfo.getMoney() + "元")
;

2
app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java
View File

@@ -23,7 +23,7 @@ public class BillGiftIncomeGroupNavigatorAdapter extends CommonNavigatorAdapter
private List<String> mTitleList = new ArrayList<>();
public BillGiftIncomeGroupNavigatorAdapter() {
mTitleList.add("金币礼物");
mTitleList.add("钻石礼物");
mTitleList.add("萝卜礼物");
}
@Override

4
app/src/main/java/com/yizhuan/erban/decoration/view/DecorationStoreActivity.java
View File

@@ -347,7 +347,7 @@ public class DecorationStoreActivity extends BaseBindingActivity<ActivityDecorat
if (bean.isGoldSale()) {
price.append(isRenewPrice ? String.valueOf(bean.getRenewPrice()) : String.valueOf(bean.getPrice()));
price.append("金币");
price.append("钻石");
}
if (bean.isGoldAndRadishSale())
@@ -368,7 +368,7 @@ public class DecorationStoreActivity extends BaseBindingActivity<ActivityDecorat
if (bean.isGoldSale()) {
price.append(bean.getOriginalPrice());
price.append("金币");
price.append("钻石");
}
if (bean.isGoldAndRadishSale())

2
app/src/main/java/com/yizhuan/erban/decoration/view/MyHeadWearFragment.java
View File

@@ -1,5 +1,6 @@
package com.yizhuan.erban.decoration.view;
import android.annotation.SuppressLint;
import android.app.Activity;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.util.Log;
@@ -111,6 +112,7 @@ public class MyHeadWearFragment extends BaseBindingFragment<FrgMyDecorationCommo
getChildFragmentManager().beginTransaction().replace(status.getId(), fragment, STATUS_TAG).commitAllowingStateLoss();
}
@SuppressLint("CheckResult")
private void setUsedStatus(int position) {
HeadWearInfo headWearInfo = shopAdapter.getData().get(position);

2
app/src/main/java/com/yizhuan/erban/home/fragment/FindFragment.java
View File

@@ -261,7 +261,7 @@ public class FindFragment extends BaseMvpFragment<IFindFragmentView, FindFragmen
} else if (id == llMentoringRelationship.getId()) {
MentoringRelationshipActivity.start(mContext);
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.FIND_APPRENTICE_ENTRANCE, "收个徒弟赢金币");
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.FIND_APPRENTICE_ENTRANCE, "收个徒弟赢钻石");
}
}

6
app/src/main/java/com/yizhuan/erban/monsterhunting/MonsterHuntingActivity.java
View File

@@ -480,7 +480,7 @@ public class MonsterHuntingActivity extends BaseBindingActivity<ActivityMonsterH
monsterInfo.getAttackSvg(),
monsterInfo.getDefeatSvg());
// 更新自己的金币
// 更新自己的钻石
viewModel.updateMyGold();
// 更新魔法礼物列表
updateMagicList();
@@ -532,8 +532,8 @@ public class MonsterHuntingActivity extends BaseBindingActivity<ActivityMonsterH
}
private void updateMyGoldInternalFail() {
// Toast.makeText(this, "获取金币失败，请重试！", Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort("获取金币失败，请重试！");
// Toast.makeText(this, "获取钻石失败，请重试！", Toast.LENGTH_SHORT).show();
SingleToastUtil.showToastShort("获取钻石失败，请重试！");
}
private void updateMonsterInfo(MonsterInfo monsterInfo) {

4
app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java
View File

@@ -55,7 +55,7 @@ public class PrizeAnimUiHelper {
*/
public final static int TYPE_REWARD_PAGE = 3;
/**
* 瓜分金币
* 瓜分钻石
*/
public final static int TYPE_DRAW_GOLD = 4;
@BindView(R.id.iv_reward_bg)
@@ -251,7 +251,7 @@ public class PrizeAnimUiHelper {
int shareType = SignInModel.SHARE_TYPE_REWARD; // 累计奖励
if (mType == TYPE_DRAW_GOLD)
shareType = SignInModel.SHARE_TYPE_DRAW_GOLD; // 瓜分金币
shareType = SignInModel.SHARE_TYPE_DRAW_GOLD; // 瓜分钻石
dialogManager.showProgressDialog(context, "", true);
new SignInModel().getShareImage(shareType, day, reward)

8
app/src/main/java/com/yizhuan/erban/radish/signin/SignInActivity.java
View File

@@ -351,7 +351,7 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
"签到成功-发现页");
if (count > 0) {
setGoldPool((int) count);
toast("签到成功，奖金池已增加" + count + "金币");
toast("签到成功，奖金池已增加" + count + "钻石");
}
getMvpPresenter().getSignDetail();
}
@@ -533,7 +533,7 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
private void setSignOption(SignDetailInfo signDetailInfo) {
if (signDetailInfo.getIsDrawGold() == SignDetailInfo.FLAG_DRAW_GOLD_OPEN_DRAW) {
tvSignInOp.setBackgroundResource(R.drawable.bg_draw_gold);
tvSignInOp.setText("本次瓜分获得" + signDetailInfo.getDrawGoldNum() + "金币");
tvSignInOp.setText("本次瓜分获得" + signDetailInfo.getDrawGoldNum() + "钻石");
tvSignInOp.setTextSize(15);
tvSignInOp.setEnabled(false);
setDrawOption(signDetailInfo.getDrawGoldNum());
@@ -565,7 +565,7 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
private void setDrawOption(long gold) {
tvSignInOp.setBackgroundResource(R.drawable.bg_draw_gold);
String firstPath = "本次瓜分获得";
String tips = firstPath + gold + "金币";
String tips = firstPath + gold + "钻石";
SpannableString spannableString = new SpannableString(tips);
ForegroundColorSpan colorSpan = new ForegroundColorSpan(Color.parseColor("#9B40FC"));
@@ -741,7 +741,7 @@ public class SignInActivity extends BaseMvpActivity<ISignInView, SignInPresenter
@Override
public void certificated() {
showDialog();
getMvpPresenter().signDraw(); // 瓜分金币
getMvpPresenter().signDraw(); // 瓜分钻石
}
});

6
app/src/main/java/com/yizhuan/erban/radish/signin/adpter/RewardTotalNoticeAdapter.java
View File

@@ -176,10 +176,10 @@ public class RewardTotalNoticeAdapter{
showView(true, vFourth, 28, "已领取\n28天", true);
} else if (mSignDetailInfo.getIsDrawGold() == SignDetailInfo.FLAG_DRAW_GOLD_OPEN_UN_DRAW) { // 能瓜分但未瓜分
showView(false, vFourth, 28, "瓜分金币\n28天", mSignDetailInfo != null && mSignDetailInfo.getTotalDay() >= 28);
showView(false, vFourth, 28, "瓜分钻石\n28天", mSignDetailInfo != null && mSignDetailInfo.getTotalDay() >= 28);
} else if (mSignDetailInfo.getIsDrawGold() == SignDetailInfo.FLAG_DRAW_GOLD_UN_OPEN) { // 不可瓜分
showView(false, vFourth, 28, "瓜分金币\n28天", false);
showView(false, vFourth, 28, "瓜分钻石\n28天", false);
}
}
@@ -188,7 +188,7 @@ public class RewardTotalNoticeAdapter{
// showView(true, vFourth, 28, "已领取\n28天");
//
// } else
// showView(false, vFourth, 28, "瓜分金币\n28天");
// showView(false, vFourth, 28, "瓜分钻石\n28天");
}

4
app/src/main/java/com/yizhuan/erban/radish/signin/view/CarveUpGoldAdapter.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
/**
* create by lvzebiao @2019/3/14
* 瓜分金币的消息轮播器
* 瓜分钻石的消息轮播器
*/
public class CarveUpGoldAdapter extends BetterMarqueeView.Adapter<CarveUpGoldAdapter.MessageViewHolder>{
@@ -52,7 +52,7 @@ public class CarveUpGoldAdapter extends BetterMarqueeView.Adapter<CarveUpGoldAda
return;
String first = "ID" + info.getErbanNo() + "瓜分";
String second = String.valueOf(info.getGoldNum()) + "金币";
String second = String.valueOf(info.getGoldNum()) + "钻石";
String third = "!";
SpannableString spannableString = new SpannableString(first + second + third);

2
app/src/main/java/com/yizhuan/erban/radish/signin/view/SignInDialog.java
View File

@@ -177,7 +177,7 @@ public class SignInDialog extends AppCompatDialog {
long addGoldNum = signInfo.getSignGoldNum();
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.EVENT_SIGN_SUCCESS,
"签到成功-弹框");
SingleToastUtil.showToast("签到成功，奖金池已增加" + addGoldNum + "金币");
SingleToastUtil.showToast("签到成功，奖金池已增加" + addGoldNum + "钻石");
//启动播放动画
long newPoolNumber = addGoldNum + detailInfo.getShowGoldNum();
rtvGoldPool.setText(NumberFormatUtil.formatCommaInt(newPoolNumber), true);

2
app/src/main/java/com/yizhuan/erban/ui/gift/dialog/MagicInfoVm.java
View File

@@ -27,7 +27,7 @@ public class MagicInfoVm extends BaseItem<MagicInfo> {
public MagicInfoVm(Context context, MagicInfo data, boolean select) {
super(context, data);
this.isSelect.set(select);
this.goldText.set(data.getPrice() + "金币");
this.goldText.set(data.getPrice() + "钻石");
}
@Override

4
app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderText.java
View File

@@ -71,14 +71,14 @@ public class MsgViewHolderText extends MsgViewHolderBase {
awardAttachment = (AssistantAttachment) attachment;
text = awardAttachment.msg;
} else if (attachment instanceof CarveUpGoldThirdLevelAttachment) {
//瓜分金币 三级
//瓜分钻石 三级
CarveUpGoldThirdLevelAttachment cuAttachment = (CarveUpGoldThirdLevelAttachment) attachment;
int appColor = context.getResources().getColor(R.color.appColor);
SpannableBuilder builder = new SpannableBuilder()
.append("【签到瓜分百万】哇塞，恭喜 ")
.append(cuAttachment.getNick() + " ", new ForegroundColorSpan(appColor))
.append("签到获得 ")
.append(cuAttachment.getGoldNum() + "金币", new ForegroundColorSpan(appColor))
.append(cuAttachment.getGoldNum() + "钻石", new ForegroundColorSpan(appColor))
.append("！");
text = builder.build();
} else if (attachment instanceof VoiceBottleShakeHeartAttachment) {

2
app/src/main/java/com/yizhuan/erban/ui/pay/ChargeAdapter.java
View File

@@ -27,7 +27,7 @@ public class ChargeAdapter extends BaseQuickAdapter<ChargeBean, BaseViewHolder>
baseViewHolder.setVisible(R.id.ll_gold_charge, !TextUtils.isEmpty(chargeBean.getProdName()));
baseViewHolder
.setText(R.id.tv_money_gold, chargeBean.prodName.replace("金币", ""))
.setText(R.id.tv_money_gold, chargeBean.prodName.replace("钻石", ""))
.setText(R.id.cb_money, mContext.getString(R.string.charge_number, chargeBean.money));

2
app/src/main/java/com/yizhuan/erban/ui/pay/ChargeDialog.java
View File

@@ -52,7 +52,7 @@ public class ChargeDialog extends Dialog implements View.OnClickListener{
private void initView() {
goldText = (TextView) findViewById(R.id.gold_text);
btnIKnow = (Button) findViewById(R.id.btn_charge);
goldText.setText(gold + "金币");
goldText.setText(gold + "钻石");
}
@Override

12
app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java
View File

@@ -48,7 +48,7 @@ public class ExchangeGoldActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_exchange_gold);
initTitleBar("金币兑换");
initTitleBar("钻石兑换");
walletInfo = PayModel.get().getCurrentWalletInfo();
initView();
updateView();
@@ -101,7 +101,7 @@ public class ExchangeGoldActivity extends BaseActivity {
exchangeJewNumber.setHint(String.format("请输入兑换的钻石数量 (最多可兑换%1$s)", result + ""));
jewNumber.setText(getString(R.string.jewel_format, FormatUtils.formatBigDecimal(walletNum.getDiamondNum())));
goldNumber.setText(getString(R.string.gold_format, FormatUtils.formatBigDecimal(walletNum.getDiamondNum())));
exchangeGoldNumber.setText("0金币");
exchangeGoldNumber.setText("0钻石");
// tvExchangeHammarNum.setText("0锤子");
changeResultNumStyle();
PayModel.get().setCurrentWalletInfo(walletNum);
@@ -129,7 +129,7 @@ public class ExchangeGoldActivity extends BaseActivity {
Long value = Long.parseLong(str);
if (isTenMultiple(value)) {
int result = (int) (value * SharedPreferenceUtils.getExchangeGoldRate());
exchangeGoldNumber.setText(result + "金币");
exchangeGoldNumber.setText(result + "钻石");
// tvExchangeHammarNum.setText((result/1000*2) + "锤子");
changeResultNumStyle();
if (walletInfo != null && value <= walletInfo.getDiamondNum()) {
@@ -138,14 +138,14 @@ public class ExchangeGoldActivity extends BaseActivity {
tvInputTip.setVisibility(View.GONE);
exchangeJewNumber.setTextColor(getResources().getColor(R.color.text_tertiary));
} else {
exchangeGoldNumber.setText("0金币");
exchangeGoldNumber.setText("0钻石");
// tvExchangeHammarNum.setText("0锤子");
changeResultNumStyle();
tvInputTip.setVisibility(View.VISIBLE);
exchangeJewNumber.setTextColor(getResources().getColor(R.color.color_FF3852));
}
} else {
exchangeGoldNumber.setText("0金币");
exchangeGoldNumber.setText("0钻石");
// tvExchangeHammarNum.setText("0锤子");
changeResultNumStyle();
tvInputTip.setVisibility(View.GONE);
@@ -183,7 +183,7 @@ public class ExchangeGoldActivity extends BaseActivity {
// } else {
// tvExchangeHammarNum.setTextColor(getResources().getColor(R.color.text_color_primary));
// }
if ("0金币".equals(exchangeGoldNumber.getText().toString())) {
if ("0钻石".equals(exchangeGoldNumber.getText().toString())) {
exchangeGoldNumber.setTextColor(getResources().getColor(R.color.text_color_secondary));
} else {
exchangeGoldNumber.setTextColor(getResources().getColor(R.color.text_color_primary));

2
app/src/main/java/com/yizhuan/erban/ui/wallet/JewelActivity.java
View File

@@ -131,7 +131,7 @@ public class JewelActivity extends BaseActivity {
StatisticManager.Instance().onEvent(context,
StatisticsProtocol.Event.EVENT_EXCHANGE_CLICK,
"我的礼物/我的金币 兑换金币",
"我的礼物/我的钻石 兑换钻石",
null);
});
tvJewelTiXian.setOnClickListener(v -> {

4
app/src/main/java/com/yizhuan/erban/ui/wallet/WalletGoldActivity.java
View File

@@ -45,7 +45,7 @@ public class WalletGoldActivity extends BaseBindingActivity<ActivityWalletGoldBi
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
EventBus.getDefault().register(this);
initTitleBar("我的金币");
initTitleBar("我的钻石");
}
@Override
@@ -122,7 +122,7 @@ public class WalletGoldActivity extends BaseBindingActivity<ActivityWalletGoldBi
StatisticManager.Instance().onEvent(context,
StatisticsProtocol.Event.EVENT_RECHARGE_CLICK,
"金币充值",
"钻石充值",
null);
break;

2
app/src/main/java/com/yizhuan/erban/ui/wallet/WalletGoldFragment.java
View File

@@ -24,7 +24,7 @@ import org.greenrobot.eventbus.ThreadMode;
/**
* 金币页面
* 钻石页面
*
* @author Administrator
* @date 2017/7/3

4
app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldActivity.java
View File

@@ -108,7 +108,7 @@ public class SendGoldActivity extends BaseActivity {
.subscribe();
initRvGoldList();
initView();
//获取金币转赠列表
//获取钻石转赠列表
model.getGiveItemList()
.compose(bindUntilEvent(ActivityEvent.DESTROY))
.subscribe(new DontWarnObserver<List<GiveInfo>>() {
@@ -243,7 +243,7 @@ public class SendGoldActivity extends BaseActivity {
SpannableBuilder builder = new SpannableBuilder();
builder.append("转赠")
.append(String.valueOf(sendGoldValue), new ForegroundColorSpan(getResources().getColor(R.color.color_FE4C62)))
.append("金币？");
.append("钻石？");
tvSendNumber.setText(builder.build());
getDialogManager().showOkCancelCustomDialog(confirmSendGoldView, false, () -> {
hideIME();

2
app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java
View File

@@ -529,7 +529,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene
private WalletInfo goldWalletInfo;
private int itemType = ITEM_TYPE_GOLD;
private static final int ITEM_TYPE_GOLD = 0; // 金币
private static final int ITEM_TYPE_GOLD = 0; // 钻石
private static final int ITEM_TYPE_RADISH = 1; // 萝卜
private void setGoldOrRadishText(IItem lastSelectedItem) {

4
app/src/main/java/com/yizhuan/erban/ui/widget/MagicAdapter.java
View File

@@ -126,8 +126,8 @@ public class MagicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
.into(ivMagicIcon);
// 魔法名字
tvMagicName.setText(mMagicInfo.getName());
// 魔法金币
String gold = mMagicInfo.getPrice() + "金币";
// 魔法钻石
String gold = mMagicInfo.getPrice() + "钻石";
if (mMagicInfo.getMagicType() == MagicInfo.MONSTER_MAGIC) {
gold = String.format(Locale.getDefault(),
context.getString(R.string.format_monster_hunting_magic_value),

2
app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java
View File

@@ -33,7 +33,7 @@ public class PassWordFragment extends DialogFragment {
public final static int TYPE_DEFALUT = 0;
/**
* 金币转赠
* 钻石转赠
*/
public final static int TYPE_SEND_GOLD = 1;

2
app/src/main/res/layout/activity_cd_key_charge.xml
View File

@@ -57,7 +57,7 @@
android:layout_marginTop="5dp"
android:layout_centerInParent="true"
android:background="@drawable/shape_semi_round_gray_solid"
android:text="兑换金币"
android:text="兑换钻石"
android:textColor="#1A1A1A"
android:textSize="16dp" />
</LinearLayout>

4
app/src/main/res/layout/activity_decoration_store.xml
View File

@@ -211,7 +211,7 @@
android:layout_height="wrap_content"
android:textColor="@color/color_333333"
android:textSize="14sp"
tools:text="3000金币/30000萝卜(7天)"/>
tools:text="3000钻石/30000萝卜(7天)"/>
<TextView
android:id="@+id/tv_original_price"
@@ -219,7 +219,7 @@
android:layout_height="wrap_content"
android:textColor="@color/color_999999"
android:textSize="11sp"
tools:text="3000金币/30000萝卜(7天)"/>
tools:text="3000钻石/30000萝卜(7天)"/>
</LinearLayout>
<TextView

4
app/src/main/res/layout/activity_exchange_gold.xml
View File

@@ -62,7 +62,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="6dp"
android:layout_weight="1"
android:text="金币余额"
android:text="钻石余额"
android:textColor="#FF3852"
android:textSize="@dimen/font_normal" />
@@ -208,7 +208,7 @@
android:layout_marginLeft="15dp"
android:textColor="@color/text_tertiary"
android:textSize="@dimen/font_medium"
tools:text="0金币" />
tools:text="0钻石" />
</RelativeLayout>
<View

2
app/src/main/res/layout/activity_jewel.xml
View File

@@ -161,7 +161,7 @@
android:layout_marginRight="23dp"
android:background="@drawable/shape_semi_round_gray_solid"
android:gravity="center"
android:text="兑换金币"
android:text="兑换钻石"
android:textColor="@color/text_primary"
android:textSize="15dp" />

2
app/src/main/res/layout/activity_monster_hunting.xml
View File

@@ -197,7 +197,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:gravity="center"
android:text="0金币"
android:text="0钻石"
android:textColor="@color/white"
android:textSize="@dimen/font_medium" />

2
app/src/main/res/layout/activity_patriarch_mode.xml
View File

@@ -76,7 +76,7 @@
android:layout_marginTop="10dp"
android:drawableLeft="@drawable/shape_pm_point"
android:drawablePadding="10dp"
android:text="限制使用金币充值功能"
android:text="限制使用钻石充值功能"
android:textColor="@color/color_999999"
android:textSize="14sp" />

4
app/src/main/res/layout/activity_send_gold.xml
View File

@@ -64,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:text="金币余额"
android:text="钻石余额"
android:textColor="@color/color_333333"
android:textSize="14sp" />
@@ -86,7 +86,7 @@
tools:text="264.00" />
<TextView
android:text="(不含贵族金币)"
android:text="(不含贵族钻石)"
android:textColor="@color/color_999999"
android:textSize="@dimen/dp_14"
app:layout_constraintTop_toBottomOf="@id/tv_wall_gold_remain"

16
app/src/main/res/layout/activity_wallet_gold.xml
View File

@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:text="金币总额"
android:text="钻石总额"
android:textColor="@color/color_333333"
android:textSize="14sp" />
@@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:gravity="center"
android:text="含贵族金币"
android:text="含贵族钻石"
android:textColor="@color/color_B3B3B3"
android:textSize="12sp" />
@@ -100,7 +100,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:layout_weight="1"
android:text="金币余额"
android:text="钻石余额"
android:textColor="@color/text_primary"
android:textSize="@dimen/font_large" />
@@ -132,7 +132,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="7dp"
android:text="贵族金币"
android:text="贵族钻石"
android:textColor="@color/text_primary"
android:textSize="@dimen/font_large" />
@@ -183,7 +183,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="28dp"
android:text="金币不足？"
android:text="钻石不足？"
android:textColor="@color/color_999999"
android:textSize="13sp" />
@@ -193,7 +193,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="28dp"
android:text="前往【我的钻石】兑换金币>"
android:text="前往【我的钻石】兑换钻石>"
android:textColor="@color/appColor"
android:textSize="13sp"
android:onClick="@{click}" />
@@ -209,7 +209,7 @@
android:background="@drawable/shape_semi_round_gray_solid"
android:gravity="center"
android:onClick="@{click}"
android:text="金币充值"
android:text="钻石充值"
android:textColor="@color/color_333333"
android:textSize="@dimen/font_larger" />
@@ -224,7 +224,7 @@
android:background="@drawable/shape_semi_round_gray_solid"
android:gravity="center"
android:onClick="@{click}"
android:text="金币转赠"
android:text="钻石转赠"
tools:visibility="visible"
android:visibility="gone"
android:textColor="@color/color_333333"

2
app/src/main/res/layout/charge_dialog.xml
View File

@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:textColor="@color/appColor"
android:textSize="16dp"
android:text="20金币"
android:text="20钻石"
android:textStyle="bold"
/>

6
app/src/main/res/layout/dialog_bottom_auction_plus.xml
View File

@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawablePadding="5dp"
android:text="0金币"
android:text="0钻石"
android:textColor="@color/text_primary"
android:textSize="@dimen/font_larger" />
@@ -87,7 +87,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawablePadding="5dp"
android:text="0金币"
android:text="0钻石"
android:textColor="@color/text_primary"
android:textSize="@dimen/font_larger" />
@@ -165,7 +165,7 @@
android:id="@+id/tv_price_need"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0金币以上"
android:text="0钻石以上"
android:textColor="@color/text_primary"
android:textSize="@dimen/font_normal" />

2
app/src/main/res/layout/dialog_bottom_gift.xml
View File

@@ -249,7 +249,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/dp_15"
android:text="0金币"
android:text="0钻石"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />

2
app/src/main/res/layout/dialog_bottom_magic.xml
View File

@@ -63,7 +63,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="10dp"
android:gravity="left|center_vertical"
android:text="0金币"
android:text="0钻石"
android:textColor="@color/white"
android:textSize="@dimen/font_medium" />

2
app/src/main/res/layout/dialog_custom_confirm_send_gold.xml
View File

@@ -58,6 +58,6 @@
android:textColor="@color/color_333333"
android:layout_marginBottom="@dimen/dp_13"
android:textSize="@dimen/sp_15"
tools:text="转赠1000金币？" />
tools:text="转赠1000钻石？" />
</LinearLayout>

2
app/src/main/res/layout/dialog_monster.xml
View File

@@ -101,7 +101,7 @@
android:lines="4"
android:gravity="center_vertical"
android:ellipsize="end"
tools:text="幸运怪兽：树妖携带“金币1000,座驾兰博基尼 15 天，某实物,金币1000,金币1000,座驾兰博基尼 15 天，某实物,金币1000”将在15秒后抵达战场，立即前往房间ID：“4909539”打怪。"
tools:text="幸运怪兽：树妖携带“钻石1000,座驾兰博基尼 15 天，某实物,钻石1000,钻石1000,座驾兰博基尼 15 天，某实物,钻石1000”将在15秒后抵达战场，立即前往房间ID：“4909539”打怪。"
android:textSize="13dp"
android:textColor="@color/black"
android:text="@{monsterInfo.notifyMessage}"/>

2
app/src/main/res/layout/item_carve_up_result.xml
View File

@@ -11,7 +11,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
tools:text="瓜分金币"
tools:text="瓜分钻石"
android:textSize="@dimen/dp_12"
android:singleLine="true"
tools:ignore="SpUsage" />

2
app/src/main/res/layout/list_expend_gift_item.xml
View File

@@ -76,7 +76,7 @@
android:textColor="#999999"
android:textSize="13dp"
tools:ignore="SpUsage"
tools:text="金币" />
tools:text="钻石" />
<View
android:layout_width="fill_parent"

2
app/src/main/res/layout/list_item_dialog_magic.xml
View File

@@ -56,7 +56,7 @@
android:text="@{item.goldText}"
android:textColor="@{item.isSelect ? @color/color_7154EE_transparent_65 : @color/white_transparent_30}"
android:textSize="@dimen/dp_9"
tools:text="0金币"
tools:text="0钻石"
tools:ignore="SpUsage" />
</RelativeLayout>

2
app/src/main/res/layout/list_item_home_monster.xml
View File

@@ -97,7 +97,7 @@
android:lines="4"
android:gravity="center_vertical"
android:ellipsize="end"
tools:text="幸运怪兽：树妖携带“金币1000,座驾兰博基尼 15 天，某实物,金币1000,金币1000,座驾兰博基尼 15 天，某实物,金币1000”将在15秒后抵达战场，立即前往房间ID：“4909539”打怪。"
tools:text="幸运怪兽：树妖携带“钻石1000,座驾兰博基尼 15 天，某实物,钻石1000,钻石1000,座驾兰博基尼 15 天，某实物,钻石1000”将在15秒后抵达战场，立即前往房间ID：“4909539”打怪。"
android:layout_marginTop="45dp"
android:textSize="13dp"/>
</FrameLayout>

2
app/src/main/res/layout/list_item_magic.xml
View File

@@ -40,7 +40,7 @@
android:layout_below="@id/tv_magic_name"
android:layout_centerHorizontal="true"
android:layout_marginTop="4dp"
android:text="0金币"
android:text="0钻石"
android:textColor="@color/white_transparent_30"
android:textSize="@dimen/sp_10" />

2
app/src/main/res/layout/list_item_monster_hunting_reward.xml
View File

@@ -43,6 +43,6 @@
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/dp_11"
tools:text="9999金币" />
tools:text="9999钻石" />
</RelativeLayout>

2
app/src/main/res/layout/list_order_bills_item.xml
View File

@@ -71,7 +71,7 @@
android:layout_alignEnd="@+id/tv_gold"
android:layout_below="@+id/tv_gold"
android:layout_marginTop="8dp"
android:text="金币"
android:text="钻石"
android:textColor="@color/color_999999"
android:textSize="13dp" />

2
app/src/main/res/layout/wallet_fragment_jewel.xml
View File

@@ -72,7 +72,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@drawable/shape_semi_round_gray_solid"
android:text="兑换金币"
android:text="兑换钻石"
android:textColor="@color/color_FFFFFF"
android:textSize="16sp" />

50
app/src/main/res/values/strings.xml
View File

@@ -79,11 +79,11 @@
<string name="bill_withdraw">钻石提现记录</string>
<string name="bill_red">红包记录</string>
<string name="gift_income_gold">钻石</string>
<string name="gift_expend_gold">金币</string>
<string name="gift_expend_gold">钻石</string>
<string name="bill_title">账单</string>
<string name="bill_gift_gold_num">账户余额: %.2f金币</string>
<string name="bill_gift_gold_num">账户余额: %.2f钻石</string>
<string name="gold_num_text">%.2f金币</string>
<string name="gold_num_text">%.2f钻石</string>
<string name="red_packet_withdraw">红包提现</string>
@@ -94,7 +94,7 @@
<string name="menu_my_level">我的等级</string>
<string name="menu_my_decoration">我的装饰</string>
<string name="menu_my_union">我的公会</string>
<string name="menu_my_gold_charge">金币/充值</string>
<string name="menu_my_gold_charge">钻石/充值</string>
<string name="menu_my_auction">竞拍记录</string>
<string name="menu_setting">设置</string>
<string name="menu_certification">实名认证</string>
@@ -158,12 +158,12 @@
<string name="charge_center">充值中心</string>
<string name="charge_user_name">账号: %s</string>
<string name="charge_gold"> %.2f</string>
<string name="change_gold_noble_notice">(包含%.2f贵族金币,不能购买贵族)</string>
<string name="change_gold_noble_notice">(包含%.2f贵族钻石,不能购买贵族)</string>
<string name="charge_cd_code_diamond">兑换码/钻石</string>
<string name="charge_webchat">微信支付</string>
<string name="charge_alipay">支付宝</string>
<string name="charge_cd_code">兑换码充值</string>
<string name="charge_diamond">钻石兑换金币</string>
<string name="charge_diamond">钻石兑换钻石</string>
<string name="charge">充值</string>
<string name="charge_number">%d元</string>
<string name="charge_sure">确认充值</string>
@@ -282,15 +282,15 @@
<string name="set_manager">设置管理员</string>
<string name="remove_manager">移除管理员</string>
<!--金币-->
<string name="wall_gold_remain_before_text">我的金币总额</string>
<string name="wall_gold_remain_after_text">(+贵族金币)</string>
<!--钻石-->
<string name="wall_gold_remain_before_text">我的钻石总额</string>
<string name="wall_gold_remain_after_text">(+贵族钻石)</string>
<string name="charge_now">立即充值</string>
<string name="buy_now">立即购买</string>
<string name="wallet_gold_normal_remain">金币余额</string>
<string name="wallet_gold_noble_remain">贵族金币余额</string>
<string name="wallet_gold_noble_notice">·贵族金币只能用于购买礼物等消费，无法用于购买贵族</string>
<string name="gold_format">金币：%s</string>
<string name="wallet_gold_normal_remain">钻石余额</string>
<string name="wallet_gold_noble_remain">贵族钻石余额</string>
<string name="wallet_gold_noble_notice">·贵族钻石只能用于购买礼物等消费，无法用于购买贵族</string>
<string name="gold_format">钻石：%s</string>
<string name="jewel_format">钻石：%s</string>
<string name="bill_noble_open">贵族开通记录</string>
<string name="global_notice_before">全服通知:</string>
@@ -343,7 +343,7 @@
4 伤害贡献越高，获得奖励的概率越大，例如一只血值1000的怪兽被打爆后，玩家A贡献了500点伤害值，则有50%的概率获得奖励\n
5 打爆怪兽的奖励将会随着怪兽的实力（血值）增加而增加，例如：打爆一只血值1000的怪兽将获得总价不少于1000金币的金币或者座驾奖励\n
5 打爆怪兽的奖励将会随着怪兽的实力（血值）增加而增加，例如：打爆一只血值1000的怪兽将获得总价不少于1000钻石的钻石或者座驾奖励\n
6 若有疑问，请咨询66星球客服微信：1213490\n
</string>
@@ -353,11 +353,11 @@
<string name="text_quit_monster_hunting">。。。放弃打怪兽？？？</string>
<string name="text_check_damage">查看伤害排行榜</string>
<string name="title_monster_hunting_reward">获得奖励(%s)</string>
<string name="currency_unit">金币</string>
<string name="currency_unit">钻石</string>
<string name="text_user_id">66号:%s</string>
<string name="format_monster_hunting_impact">伤害 %s 点/次</string>
<string name="format_monster_hunting_magic_value">(%s金币)</string>
<string name="exchange_gold_tips">钻石可以兑换金币，兑换比率：1钻石=%s金币；\n</string>
<string name="format_monster_hunting_magic_value">(%s钻石)</string>
<string name="exchange_gold_tips">钻石可以兑换钻石，兑换比率：1钻石=%s钻石；\n</string>
<string name="tips_input_gift_message">熬过异地，就是一生</string>
<string name="tips_input_gift_message_limit">喊话内容限定15个字</string>
<string name="hints_tips_gift_message">请喊话…（如：熬过异地，就是一生）</string>
@@ -577,7 +577,7 @@
<string name="label_record_title">录下您最棒的问候</string>
<string name="label_record_tips">用心录下问候，记录下你最美的声音，\n10秒内尽情发挥您的声线吧！</string>
<string name="label_format_price">%1$s金币</string>
<string name="label_format_price">%1$s钻石</string>
<string name="label_can_use">使用</string>
<string name="label_used">取消使用</string>
<string name="label_send">赠送</string>
@@ -685,7 +685,7 @@
<!--签到-->
<string name="sign_in_notice">签到提醒</string>
<string name="sign_in_explain_text">签到时间越长 奖励越丰厚</string>
<string name="the_gold_pool_tips">当前奖池累计金币</string>
<string name="the_gold_pool_tips">当前奖池累计钻石</string>
<string name="status_point_me_to_sign_in">点我签到</string>
<string name="status_today_has_sign_in">今日已签到</string>
<string name="multi_sign_in_title">累计签到 领取相应<font color='#FFEA01'>奖励</font></string>
@@ -699,14 +699,14 @@
<string name="buy_decoration_info_text">您将要购买“%1$s(%2$s天)”</string>
<string name="renew_decoration_info_text">您将要续费“%1$s(%2$s天)”</string>
<string name="donate_decoration_info_text">赠送&#160;&#160;%1$s&#160;&#160;“%2$s(%3$s天)”</string>
<string name="how_much_gold">%d金币</string>
<string name="how_much_gold">%d钻石</string>
<string name="how_much_radish">%d萝卜</string>
<string name="task_center">任务中心</string>
<string name="task_go_to_finish">去完成</string>
<string name="task_receive">领取</string>
<string name="task_done">已完成</string>
<string name="label_draw_gold">瓜分金币</string>
<string name="label_draw_gold_reward">瓜分金币\n28天</string>
<string name="label_draw_gold">瓜分钻石</string>
<string name="label_draw_gold_reward">瓜分钻石\n28天</string>
<string name="sign_in_continue_number_days">已累计签到%d天</string>
<string name="label_my_radish">我的账户</string>
<string name="register_password_strong_tip">密码必须使用6–16个字符内的数字和英文字母组合哦!</string>
@@ -810,7 +810,7 @@
<string name="old_app_name">66星球</string>
<string name="tip_login_how_login">如何登录？</string>
<string name="tip_login_old_account">%s也可登录%s哦 %s</string>
<string name="me_mentoring_relationship_title">收个徒弟赢金币</string>
<string name="me_mentoring_relationship_title">收个徒弟赢钻石</string>
<string name="me_mentoring_relationship_hint">收徒赢大礼</string>
<string name="family_customer_service_sub_title">活动答疑</string>
<string name="tip_login_other_login">其他方式登录</string>
@@ -824,7 +824,7 @@
<string name="qq_login">QQ登录</string>
<string name="hint_input_nick">请输入昵称</string>
<string name="text_bind_phone">绑定手机号</string>
<string name="slogan">上66星球，轻松寻觅对的TA</string>
<string name="slogan">听声音玩游戏交朋友，来66星球</string>
<string name="text_agree">同意</string>
<string name="text_disagree">不同意</string>
@@ -843,7 +843,7 @@
<string name="copy_success">已复制</string>
<string name="delete_success">已删除</string>
<string name="gold_give">金币转赠</string>
<string name="gold_give">钻石转赠</string>
<string name="donee">受赠人</string>
<string name="done_hint_input_phone_or_id">请输入手机号/66星球号</string>
<string name="give_value">转赠金额</string>

10
app/src/module_community/java/com/yizhuan/erban/community/dynamic/view/DynamicDetailActivity.java
View File

@@ -308,7 +308,6 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
.doOnSuccess(aLong -> {
if (!currNeedKeyboard && !isShowKeyboad) {
clOption.setVisibility(View.VISIBLE);
llReply.setVisibility(View.GONE);
mReplyPosition = -1;
}
})
@@ -316,7 +315,6 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
return;
}
clOption.setVisibility(View.VISIBLE);
llReply.setVisibility(View.GONE);
mReplyPosition = -1;
}
currNeedKeyboard = false;
@@ -466,7 +464,7 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
if (!UserModel.get().isMyseft(cacheReply.getUid()) && isBindPhone()) {
mReplyType = TYPE_TARGET_REPLAY;
mReplyPosition = groupPosition;
clOption.setVisibility(View.GONE);
clOption.setVisibility(View.INVISIBLE);
llReply.setVisibility(View.VISIBLE);
String nick = cacheReply.getNick();
etReply.setHint(String.format(getString(R.string.dy_reply_someone),
@@ -541,7 +539,7 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
}
mReplyType = TYPE_TARGET_COMMENT;
mReplyPosition = position;
clOption.setVisibility(View.GONE);
clOption.setVisibility(View.INVISIBLE);
llReply.setVisibility(View.VISIBLE);
Comment bean = adapter.getData().get(position);
etReply.setHint(String.format(getString(R.string.dy_reply_someone), bean.getNick()));
@@ -1193,10 +1191,10 @@ public class DynamicDetailActivity extends BaseActivity implements IEmoticonSele
}
mReplyType = 0;
mReplyPosition = -1;
clOption.setVisibility(View.GONE);
clOption.setVisibility(View.INVISIBLE);
llReply.setVisibility(View.VISIBLE);
etReply.requestFocus();
etReply.setHint(R.string.dy_say_something);
etReply.setHint(R.string.dy_pub_comment);
showIME(etReply);
}

74
app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java
View File

@@ -94,10 +94,6 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
private int page = 1;
private boolean isLoading = false;
private boolean noMoreData = false;
private SquareDynamicAdapter adapter;
private View footerView;
@@ -168,27 +164,9 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
if (squareType == SquareFragment.TAB_TYPE_RECOMMEND){
initHeader();
}
footerView = LayoutInflater.from(mContext).inflate(R.layout.dy_footer_loadmore, null);
adapter.addFooterView(footerView);
recyclerView.setAdapter(adapter);
recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@Override
public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
super.onScrollStateChanged(recyclerView, newState);
if (newState == RecyclerView.SCROLL_STATE_IDLE) {
if (isLoading || noMoreData) {
return;
}
LinearLayoutManager manager = (LinearLayoutManager) recyclerView.getLayoutManager();
int lastPos = manager.findLastVisibleItemPosition();
if (lastPos >= adapter.getItemCount() - 2) {
loadData(false);
}
}
}
});
adapter.setPreLoadNumber(2);
adapter.setOnLoadMoreListener(() -> loadData(false),recyclerView);
adapter.setOnItemChildClickListener((baseQuickAdapter, view, pos) -> {
WorldDynamicBean bean = adapter.getItem(pos);
if (bean == null) {
@@ -236,15 +214,14 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
}
private void loadData(boolean isRefresh) {
if (isLoading) {
return;
}
if (isRefresh) {
nextDynamicId = null;
noMoreData = false;
page = 1;
}
isLoading = true;
else {
page++;
}
Single<WorldDynamicListResult> single = null;
//推荐动态返回的是直接一个list，但是为了便于统一和关注动态列表的逻辑，我们包多一层
//返回WorldDynamicListResult
@@ -269,13 +246,11 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
super.accept(result, error);
refreshLayout.setRefreshing(false);
hideStatus();
isLoading = false;
if (error != null) {
hideLoadmoreView();
if (!isRefresh) adapter.loadMoreFail();
return;
}
//接口访问正确的处理
page ++;
nextDynamicId = String.valueOf(result.getNextDynamicId());
List<WorldDynamicBean> list = result.getDynamicList();
if (list == null) {
@@ -283,15 +258,8 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
}
if (isRefresh) {
adapter.setNewData(list);
} else {
adapter.addData(list);
}
if (list.size() > 0) {
showLoadmoreView();
} else {
noMoreData = true;
hideLoadmoreView();
if (isRefresh) {
adapter.disableLoadMoreIfNotFullPage();
if (list.isEmpty()) {
String emptyTips = "暂无动态~";
if (squareType == SquareFragment.TAB_TYPE_ATTENT) {
emptyTips = "暂无动态，去推荐看看吧~";
@@ -299,27 +267,19 @@ public class SquareDynamicFragment extends BaseMvpFragment<IMiniWorldCategoryVie
showNoData(R.drawable.icon_common_failure,
emptyTips);
}
}
//如果第一页访问得到的数据特别少，直接加载下一页
if (list.size() > 0 && adapter.getItemCount() <= 6) {
loadData(false);
} else {
if (list.isEmpty()){
adapter.loadMoreEnd();
}
else {
adapter.addData(list);
adapter.loadMoreComplete();
}
}
}
});
}
private void showLoadmoreView() {
ViewGroup.LayoutParams params = footerView.getLayoutParams();
params.height = UIUtil.dip2px(mContext, 60);
footerView.setLayoutParams(params);
}
private void hideLoadmoreView() {
ViewGroup.LayoutParams params = footerView.getLayoutParams();
params.height = 0;
footerView.setLayoutParams(params);
}
/**
* 判断自己是不是该世界的创始人
*/

38
app/src/module_community/res/layout/activity_dynamic_detail.xml
View File

@@ -13,7 +13,6 @@
app:layout_constraintTop_toTopOf="parent" />
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refresh_layout"
android:layout_width="match_parent"
@@ -45,35 +44,42 @@
<LinearLayout
android:id="@+id/ll_reply"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_dy_detail_bottom_bar_height"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center_vertical"
android:minHeight="50dp"
android:orientation="horizontal"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/emoticon_picker_view"
tools:visibility="visible">
<EditText
android:id="@+id/et_reply"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginTop="5dp"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="5dp"
android:layout_weight="1"
android:background="@drawable/shape_round_f5f5f5_radius_15dp"
android:hint="@string/dy_pub_comment"
android:maxLength="500"
android:maxLines="3"
android:minHeight="30dp"
android:paddingStart="10dp"
android:textColor="@color/color_1A1A1A"
android:textColorHint="@color/color_B3B3B3"
android:textSize="@dimen/sp_14" />
<ImageView
android:id="@+id/iv_emoji"
android:layout_width="@dimen/dp_31"
android:layout_height="@dimen/dp_31"
android:layout_gravity="center_vertical"
android:layout_marginStart="7.5dp"
android:layout_marginStart="5dp"
android:layout_marginEnd="4.5dp"
android:src="@drawable/icon_dy_emoji" />
<EditText
android:id="@+id/et_reply"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_10"
android:layout_weight="1"
android:background="@color/transparent"
android:hint="@string/dy_say_something"
android:maxLength="500"
android:textColor="@color/color_1A1A1A"
android:textColorHint="@color/color_B3B3B3"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/tv_send"

2
app/src/module_community/res/values/strings.xml
View File

@@ -3,7 +3,7 @@
<string name="pic_text_publish">图文发布</string>
<string name="dy_publish">发布</string>
<string name="dy_say_something">记录你此刻生活，分享给有趣的人看...</string>
<string name="dy_pub_comment">发表评论</string>
<string name="expand">展开</string>
<string name="collapse">收起</string>
<string name="dy_publish_user_tips">禁止出现商业广告、微信号码、QQ号码、电话号码, 以及低俗、色情、恐怖、暴力和具有侮辱性语言等内容，违规者封号处理 ！</string>

4
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java
View File

@@ -47,14 +47,14 @@ public class IncomeDetailAdapter extends BaseQuickAdapter<IncomeGiftInfo, BaseVi
BigDecimal df = new BigDecimal(d);
String goldStr = df.setScale(2, RoundingMode.DOWN).toString();
spannableString = new SpannableString(goldStr + "万金币");
spannableString = new SpannableString(goldStr + "万钻石");
spannableString.setSpan(first, 0, goldStr.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
spannableString.setSpan(second, goldStr.length(), goldStr.length() + 3, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
} else {
String str = String.valueOf(total);
spannableString = new SpannableString(str + "金币");
spannableString = new SpannableString(str + "钻石");
spannableString.setSpan(first, 0, str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
spannableString.setSpan(second, str.length(), str.length() + 2, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
}

4
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeStatisticsPresenter.java
View File

@@ -49,13 +49,13 @@ public class IncomeStatisticsPresenter extends BaseMvpPresenter<IIncomeStatistic
double d = (double) total;
d = d / 10000;
BigDecimal df = new BigDecimal(d);
String str = df.setScale(2, RoundingMode.DOWN).toString() + "万金币";
String str = df.setScale(2, RoundingMode.DOWN).toString() + "万钻石";
spannableString = new SpannableString(str);
spannableString.setSpan(sizeSpan, str.length() - 3, str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
} else {
String str = String.valueOf(total) + "金币";
String str = String.valueOf(total) + "钻石";
spannableString = new SpannableString(str);
spannableString.setSpan(sizeSpan, str.length() - 2, str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);

2
app/src/module_labour_union/res/layout/activity_income_statistics.xml
View File

@@ -148,7 +148,7 @@
android:textColor="@color/color_999999"
android:layout_marginStart="232dp"
android:textSize="13dp"
android:text="收入(金币)" />
android:text="收入(钻石)" />
</RelativeLayout>

2
app/src/module_mentoring_relationship/res/layout/view_holder_apprentice_mission_three.xml
View File

@@ -32,7 +32,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title"
tools:ignore="SpUsage"
tools:text="花花由官方提供，不扣任何金币哦！" />
tools:text="花花由官方提供，不扣任何钻石哦！" />
<ImageView
android:id="@+id/iv_pic"

2
app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_four.xml
View File

@@ -47,7 +47,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title"
tools:ignore="SpUsage"
tools:text="花花由官方提供，不扣任何金币哦！" />
tools:text="花花由官方提供，不扣任何钻石哦！" />
<ImageView
android:id="@+id/iv_pic"

2
app/src/module_mentoring_relationship/res/layout/view_holder_master_mission_two.xml
View File

@@ -46,7 +46,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title"
tools:ignore="SpUsage"
tools:text="花花由官方提供，不扣任何金币哦！" />
tools:text="花花由官方提供，不扣任何钻石哦！" />
<ImageView
android:id="@+id/iv_pic"

2
app/src/module_mentoring_relationship/res/values/strings.xml
View File

@@ -9,7 +9,7 @@
<string name="text_mentoring_ranking">名师排行榜</string>
<string name="text_tips_picking_limitation">每天最多三个徒弟哦 ~</string>
<string name="text_my_master_and_apprentices">我的师徒</string>
<string name="text_slogan_mentoring">调戏小哥哥 一起赢金币</string>
<string name="text_slogan_mentoring">调戏小哥哥 一起赢钻石</string>
<string name="text_my_master_and_apprentices_no_data">再不去收徒弟，我长大了就自己收了啊~</string>
<string name="btn_follow_and_say_hi">关注并打招呼</string>
<string name="btn_say_hi">打招呼</string>

2
app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java
View File

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

2
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java
View File

@@ -221,7 +221,7 @@ public class TreasureBoxActivity extends BaseBindingActivity<ActivityTreasureBox
@SuppressLint("CheckResult")
private void subscribeEvent() {
//更新金币数量和被踢出房间退出
//更新钻石数量和被踢出房间退出
IMNetEaseManager.get().getChatRoomEventObservable()
.compose(bindToLifecycle())
.subscribe(roomEvent -> {

2
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java
View File

@@ -221,7 +221,7 @@ public class TreasureBoxHonourActivity extends BaseBindingActivity<ActivityTreas
@SuppressLint("CheckResult")
private void subscribeEvent() {
//更新金币数量和被踢出房间退出
//更新钻石数量和被踢出房间退出
IMNetEaseManager.get().getChatRoomEventObservable()
.compose(bindToLifecycle())
.subscribe(roomEvent -> {

4
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BuyKeyDialog.java
View File

@@ -48,7 +48,7 @@ public class BuyKeyDialog extends BaseBindingDialog<DialogBuyKeyBinding> impleme
binding.setClick(this);
edtNum = binding.edtNum;
edtNum.setCursorVisible(false);
binding.tvPrice.setText(Math.min(maxCount, 50) * price + "金币");
binding.tvPrice.setText(Math.min(maxCount, 50) * price + "钻石");
edtNum.addTextChangedListener(this);
edtNum.setLongClickable(false);
if (boxType == IBoxModel.BOX_TYPE_NORMAL){
@@ -173,7 +173,7 @@ public class BuyKeyDialog extends BaseBindingDialog<DialogBuyKeyBinding> impleme
edtNum.setText(numString);
}
edtNum.setSelection(numString.length());
binding.tvPrice.setText(getNum() * price + "金币");
binding.tvPrice.setText(getNum() * price + "钻石");
}

2
app/src/module_treasure_box/res/layout/dialog_buy_key.xml
View File

@@ -126,7 +126,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="1000金币"
android:text="1000钻石"
android:textColor="#333333"
android:textSize="15sp"
app:layout_constraintLeft_toLeftOf="@id/btn_sub"

2
app/src/module_treasure_box/res/layout/dialog_buy_key_honour.xml
View File

@@ -126,7 +126,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center"
android:text="1000金币"
android:text="1000钻石"
android:textColor="#333333"
android:textSize="15sp"
app:layout_constraintLeft_toLeftOf="@id/btn_sub"

2
app/src/module_treasure_box/res/layout/list_item_honour_price.xml
View File

@@ -65,7 +65,7 @@
android:layout_height="0dp" />
<TextView
tools:text="100金币"
tools:text="100钻石"
android:text="@{String.valueOf(prizeRecord.platformValue) + @string/currency_unit}"
android:layout_gravity="center_vertical"
android:textSize="@dimen/sp_14"

2
app/src/module_treasure_box/res/layout/list_item_price.xml
View File

@@ -65,7 +65,7 @@
android:layout_height="0dp" />
<TextView
tools:text="100金币"
tools:text="100钻石"
android:text="@{String.valueOf(prizeRecord.platformValue) + @string/currency_unit}"
android:layout_gravity="center_vertical"
android:textSize="@dimen/sp_14"

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;

Some files were not shown because too many files have changed in this diff Show More