From 6916a96e4e78aeb25fa0b7dc7ccbf437f8b95ebd Mon Sep 17 00:00:00 2001 From: eggmanQQQ <3671373519@qq.com> Date: Fri, 25 Oct 2024 13:44:21 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=E5=88=AA=E9=99=A4=20=E6=8F=90?= =?UTF-8?q?=E7=8F=BE=E7=9B=B8=E9=97=9C=E5=85=A7=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ected.xml => shape_draw_item_selected.xml} | 0 ...elect.xml => shape_draw_item_unselect.xml} | 0 .../bills/activities/TotalBillsActivity.java | 6 - .../activities/WithdrawBillsActivity.java | 164 --------- .../bills/adapter/WithdrawBillsAdapter.java | 32 -- .../WithdrawBillsIndicatorAdapter.java | 103 ------ .../adapter/WithdrawRedBillsAdapter.java | 33 -- .../bills/fragmemt/WithdrawBillsFragment.java | 242 ------------ .../com/chwl/app/earn/EarnRecordViewModel.kt | 62 +--- .../earn/activity/BindWithdrawMsgActivity.kt | 124 ------- .../cp/adapter/CpTaskIndicatorAdapter.java | 6 +- .../wallet/adapter/WithdrawJewelAdapter.java | 42 --- .../adapter/WithdrawRedListAdapter.java | 40 -- .../chwl/app/vip/adapter/VipAuthAdapter.kt | 3 +- .../app/vip/adapter/VipCenterBannerAdapter.kt | 1 - ...hdraw_focused.webp => c_draw_focused.webp} | Bin .../{withdraw_un.webp => c_draw_un.webp} | Bin ..._record_arrow.webp => ic_black_arrow.webp} | Bin ...thdraw_arrow.webp => ic_draw_w_arrow.webp} | Bin ...draw_bank_card.webp => icon_ank_card.webp} | Bin ...ills_withdraw.webp => icon_bills_img.webp} | Bin ..._type.webp => icon_change_type_arrow.webp} | Bin .../main/res/drawable/withdraw_selector.xml | 6 - .../res/layout/activity_bind_withdraw_msg.xml | 346 ------------------ app/src/main/res/layout/activity_jewel.xml | 198 ---------- .../main/res/layout/activity_total_bills.xml | 8 +- .../res/layout/activity_withdraw_bills.xml | 81 ---- .../main/res/layout/fragment_xrexylerview.xml | 27 -- .../res/layout/list_charge_bills_item.xml | 1 - .../main/res/layout/list_red_packet_item.xml | 26 -- .../res/layout/list_withdraw_bills_item.xml | 48 --- app/src/main/res/layout/vip_set_activity.xml | 16 +- app/src/main/res/layout/withdraw_item.xml | 68 ---- app/src/main/res/values-ar/strings.xml | 80 +--- app/src/main/res/values-tr/strings.xml | 79 +--- app/src/main/res/values-zh-rTW/strings.xml | 75 +--- app/src/main/res/values/arrays.xml | 4 - app/src/main/res/values/strings.xml | 79 +--- .../core/bean/response/ServiceResult.java | 2 +- .../response/result/ExchangeInfoResult.java | 1 - .../response/result}/ExchangerInfo.java | 2 +- .../response/result/WithdrawListResult.java | 13 - .../result/WithdrawRedListResult.java | 14 - .../result/WithdrawRedSucceedResult.java | 12 - .../result/WithdrawUserInfoResult.java | 12 - .../java/com/chwl/core/bills/BillModel.java | 42 +-- .../java/com/chwl/core/bills/IBillModel.java | 11 - .../chwl/core/bills/bean/BillItemEntity.java | 2 - .../com/chwl/core/bills/bean/BillType.java | 2 +- .../chwl/core/earn/bean/ConfigWithdrawInfo.kt | 16 - .../chwl/core/earn/bean/WithdrawAccount.kt | 17 - .../com/chwl/core/earn/model/EarnModel.kt | 64 +--- .../com/chwl/core/gift/event/NotifyEvent.java | 2 +- .../core/interceptor/ParamsInterceptor.java | 7 - .../chwl/core/redPacket/IRedPacketModel.java | 29 -- .../chwl/core/redPacket/RedPacketModel.java | 187 ---------- .../redPacket/bean/WithdrawRedListInfo.java | 53 --- .../bean/WithdrawRedSucceedInfo.java | 28 -- .../chwl/core/withdraw/bean/WithdrawInfo.java | 57 --- .../core/withdraw/bean/WithdrwaListInfo.java | 36 -- core/src/main/res/values-ar/strings.xml | 2 - core/src/main/res/values-zh-rTW/strings.xml | 8 - core/src/main/res/values/strings.xml | 2 - .../java/com/chwl/core/code/CodeType.java | 1 - mode.json | 210 ----------- 65 files changed, 43 insertions(+), 2789 deletions(-) rename app/src/common/res/drawable/{shape_withdraw_item_selected.xml => shape_draw_item_selected.xml} (100%) rename app/src/common/res/drawable/{shape_withdraw_item_unselect.xml => shape_draw_item_unselect.xml} (100%) delete mode 100644 app/src/main/java/com/chwl/app/bills/activities/WithdrawBillsActivity.java delete mode 100644 app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsAdapter.java delete mode 100644 app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java delete mode 100644 app/src/main/java/com/chwl/app/bills/adapter/WithdrawRedBillsAdapter.java delete mode 100644 app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java delete mode 100644 app/src/main/java/com/chwl/app/earn/activity/BindWithdrawMsgActivity.kt delete mode 100644 app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawJewelAdapter.java delete mode 100644 app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawRedListAdapter.java rename app/src/main/res/drawable-xhdpi/{withdraw_focused.webp => c_draw_focused.webp} (100%) rename app/src/main/res/drawable-xhdpi/{withdraw_un.webp => c_draw_un.webp} (100%) rename app/src/main/res/drawable-xhdpi/{ic_withdraw_record_arrow.webp => ic_black_arrow.webp} (100%) rename app/src/main/res/drawable-xhdpi/{ic_withdraw_arrow.webp => ic_draw_w_arrow.webp} (100%) rename app/src/main/res/drawable-xhdpi/{icon_withdraw_bank_card.webp => icon_ank_card.webp} (100%) rename app/src/main/res/drawable-xhdpi/{icon_bills_withdraw.webp => icon_bills_img.webp} (100%) rename app/src/main/res/drawable-xhdpi/{icon_withdraw_type.webp => icon_change_type_arrow.webp} (100%) delete mode 100644 app/src/main/res/drawable/withdraw_selector.xml delete mode 100644 app/src/main/res/layout/activity_bind_withdraw_msg.xml delete mode 100644 app/src/main/res/layout/activity_jewel.xml delete mode 100644 app/src/main/res/layout/activity_withdraw_bills.xml delete mode 100644 app/src/main/res/layout/fragment_xrexylerview.xml delete mode 100644 app/src/main/res/layout/list_withdraw_bills_item.xml delete mode 100644 app/src/main/res/layout/withdraw_item.xml rename core/src/main/java/com/chwl/core/{withdraw/bean => bean/response/result}/ExchangerInfo.java (81%) delete mode 100644 core/src/main/java/com/chwl/core/bean/response/result/WithdrawListResult.java delete mode 100644 core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedListResult.java delete mode 100644 core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedSucceedResult.java delete mode 100644 core/src/main/java/com/chwl/core/bean/response/result/WithdrawUserInfoResult.java delete mode 100644 core/src/main/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt delete mode 100644 core/src/main/java/com/chwl/core/earn/bean/WithdrawAccount.kt delete mode 100644 core/src/main/java/com/chwl/core/redPacket/IRedPacketModel.java delete mode 100644 core/src/main/java/com/chwl/core/redPacket/RedPacketModel.java delete mode 100644 core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedListInfo.java delete mode 100644 core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedSucceedInfo.java delete mode 100644 core/src/main/java/com/chwl/core/withdraw/bean/WithdrawInfo.java delete mode 100644 core/src/main/java/com/chwl/core/withdraw/bean/WithdrwaListInfo.java diff --git a/app/src/common/res/drawable/shape_withdraw_item_selected.xml b/app/src/common/res/drawable/shape_draw_item_selected.xml similarity index 100% rename from app/src/common/res/drawable/shape_withdraw_item_selected.xml rename to app/src/common/res/drawable/shape_draw_item_selected.xml diff --git a/app/src/common/res/drawable/shape_withdraw_item_unselect.xml b/app/src/common/res/drawable/shape_draw_item_unselect.xml similarity index 100% rename from app/src/common/res/drawable/shape_withdraw_item_unselect.xml rename to app/src/common/res/drawable/shape_draw_item_unselect.xml diff --git a/app/src/main/java/com/chwl/app/bills/activities/TotalBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/TotalBillsActivity.java index 480138ec6..0dd8edecb 100644 --- a/app/src/main/java/com/chwl/app/bills/activities/TotalBillsActivity.java +++ b/app/src/main/java/com/chwl/app/bills/activities/TotalBillsActivity.java @@ -15,7 +15,6 @@ public class TotalBillsActivity extends BaseActivity implements View.OnClickList private BillItemView mBillGiftInCome, mBillGiftExpend; private BillItemView mBillChat; private BillItemView mBillCharge; - private BillItemView mBillWithdraw; private BillItemView mBillRed; private BillItemView mBillNoble; @@ -34,7 +33,6 @@ public class TotalBillsActivity extends BaseActivity implements View.OnClickList mBillGiftExpend = (BillItemView) findViewById(R.id.bill_item_expend); mBillChat = (BillItemView) findViewById(R.id.bill_item_chat); mBillCharge = (BillItemView) findViewById(R.id.bill_item_charge); - mBillWithdraw = (BillItemView) findViewById(R.id.bill_item_withdraw); mBillRed = (BillItemView) findViewById(R.id.bill_item_red); mBillNoble = (BillItemView) findViewById(R.id.bill_item_noble); } @@ -49,7 +47,6 @@ public class TotalBillsActivity extends BaseActivity implements View.OnClickList mBillGiftExpend.setOnClickListener(this); mBillChat.setOnClickListener(this); mBillCharge.setOnClickListener(this); - mBillWithdraw.setOnClickListener(this); mBillRed.setOnClickListener(this); mBillNoble.setOnClickListener(this); } @@ -71,9 +68,6 @@ public class TotalBillsActivity extends BaseActivity implements View.OnClickList case R.id.bill_item_charge: startActivity(new Intent(this, ChargeBillsActivity.class)); break; - case R.id.bill_item_withdraw: - startActivity(new Intent(this, WithdrawBillsActivity.class)); - break; case R.id.bill_item_red: startActivity(new Intent(this, RedBagBillsActivity.class)); break; diff --git a/app/src/main/java/com/chwl/app/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/chwl/app/bills/activities/WithdrawBillsActivity.java deleted file mode 100644 index ba1a0a94e..000000000 --- a/app/src/main/java/com/chwl/app/bills/activities/WithdrawBillsActivity.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.chwl.app.bills.activities; - -import android.content.Intent; -import android.util.SparseLongArray; -import android.view.View; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.TextView; - -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; -import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.chwl.app.R; -import com.chwl.app.base.BaseBindingActivity; -import com.chwl.app.base.TitleBar; -import com.chwl.app.bills.event.DateInfoEvent; -import com.chwl.app.bills.event.TopEvent; -import com.chwl.app.bills.fragmemt.WithdrawBillsFragment; -import com.chwl.app.databinding.ActivityWithdrawBillsBinding; -import com.chwl.app.ui.pay.ChargeActivity; -import com.chwl.app.ui.webview.CommonWebViewActivity; -import com.chwl.core.Constants; -import com.chwl.core.UriProvider; -import com.chwl.library.annatation.ActLayoutRes; -import com.chwl.library.common.util.DeviceUtil; -import com.chwl.library.utils.AppMetaDataUtil; -import com.chwl.library.utils.ResUtil; -import com.chwl.library.utils.TimeUtils; - -import org.greenrobot.eventbus.EventBus; - -/** - * 提现账单记录 - */ -@ActLayoutRes(R.layout.activity_withdraw_bills) -public class WithdrawBillsActivity extends BaseBindingActivity - implements View.OnClickListener, OnDateSetListener { - - private TitleBar mTitleBar; - private FrameLayout fragmentContainer; - - private TextView mTvDay; - private ImageView mIvToday, mIvDay; - private ImageView iv_goto_top; - // private TimePickerDialog mDialogYearMonthDay; - private TimePickerDialog.Builder mDialogYearMonthDayBuild; - private int mPosition; - private long time = System.currentTimeMillis(); - private SparseLongArray mTodayMap = new SparseLongArray(2); - - @Override - protected void init() { - initView(); - initData(); - setListener(); - } - - private void initView() { - fragmentContainer = (FrameLayout) findViewById(R.id.fragment_container); - mTvDay = (TextView) findViewById(R.id.tv_date); - mIvToday = (ImageView) findViewById(R.id.iv_today_select); - mIvDay = (ImageView) findViewById(R.id.tv_selector_date); - iv_goto_top = findViewById(R.id.iv_goto_top); - } - - @Override - public void initTitleBar(String title) { - mTitleBar = mBinding.titleBar; - if (mTitleBar != null) { - mTitleBar.setTitle(title); - mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.back_font)); - mTitleBar.setLeftImageResource(R.drawable.icon_user_back_black); - mTitleBar.setLeftClickListener(v -> finish()); - } - mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary)); - mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_withdrawbillsactivity_01)) { - @Override - public void performAction(View view) { -// if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - startActivity(new Intent(WithdrawBillsActivity.this, ChargeActivity.class)); -// }else { -// CommonWebViewActivity.start( -// context, UriProvider.getOfficialPay( -// 4, -// DeviceUtil.getDeviceId(context) -// ) -// ); -// } - } - }); - } - - private void initData() { - initTitleBar(getString(R.string.bill_withdraw)); - WithdrawBillsFragment withdrawBillsFragment = new WithdrawBillsFragment(); - getSupportFragmentManager().beginTransaction() - .add(R.id.fragment_container, withdrawBillsFragment, withdrawBillsFragment.getClass().getName()) - .commit(); - //初始化时间 - mTodayMap.put(0, time); - mTodayMap.put(1, time); - setDate(); - mDialogYearMonthDayBuild = new TimePickerDialog.Builder() - .setType(Type.YEAR_MONTH_DAY) - .setTitleStringId(ResUtil.getString(R.string.bills_activities_withdrawbillsactivity_02)) - .setThemeColor(getResources().getColor(R.color.line_background)) - .setWheelItemTextNormalColor(getResources().getColor(R.color - .timetimepicker_default_text_color)) - .setWheelItemTextSelectorColor(getResources().getColor(R.color.black)) - .setCallBack(this) - ; - } - - - private void setListener() { - mIvDay.setOnClickListener(this); - mIvToday.setOnClickListener(this); - iv_goto_top.setOnClickListener(this); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_today_select: - time = System.currentTimeMillis(); - mTodayMap.put(mPosition, time); - setDate(); - EventBus.getDefault().post(new DateInfoEvent(time, mPosition)); - break; - case R.id.tv_selector_date: - mDialogYearMonthDayBuild.build().show(getSupportFragmentManager(), "year_month_day"); - break; - case R.id.iv_goto_top: - EventBus.getDefault().post(new TopEvent(mPosition)); - break; - default: - } - } - - - private void setDate() { - mTvDay.setText(TimeUtils.getDateTimeString(mTodayMap.get(mPosition), "yyyy-MM-dd")); - } - - @Override - public void onDateSet(TimePickerDialog timePickerView, long millseconds) { - this.time = millseconds; - mTodayMap.put(mPosition, time); - setDate(); - EventBus.getDefault().post(new DateInfoEvent(millseconds, mPosition)); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - if (mDialogYearMonthDayBuild != null) { - mDialogYearMonthDayBuild.setCallBack(null); - mDialogYearMonthDayBuild = null; - } - } - - -} diff --git a/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsAdapter.java deleted file mode 100644 index 675481a03..000000000 --- a/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsAdapter.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.chwl.app.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.chwl.app.R; -import com.chwl.core.bills.bean.BillItemEntity; -import com.chwl.core.bills.bean.IncomeInfo; -import com.chwl.library.utils.ResUtil; -import com.chwl.library.utils.TimeUtils; - -import java.util.List; - -/** - * IncomeInfo - * Created by Seven on 2017/9/17. - */ - -public class WithdrawBillsAdapter extends BillBaseAdapter { - - public WithdrawBillsAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_withdraw_bills_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - IncomeInfo incomeInfo = billItemEntity.mWithdrawInfo; - if (incomeInfo == null) return; - baseViewHolder.setText(R.id.tv_date, TimeUtils.getYearMonthDayHourMinuteSecond(incomeInfo.getRecordTime())) - .setText(R.id.tv_diamondNum, ResUtil.getString(R.string.bills_adapter_withdrawbillsadapter_01) + incomeInfo.getDiamondNum() + ResUtil.getString(R.string.diamond)) - .setText(R.id.tv_money, "+" + incomeInfo.getMoney() + ResUtil.getString(R.string.bills_adapter_withdrawbillsadapter_03)); - } -} diff --git a/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java deleted file mode 100644 index 12d108cc6..000000000 --- a/app/src/main/java/com/chwl/app/bills/adapter/WithdrawBillsIndicatorAdapter.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.chwl.app.bills.adapter; - -import android.content.Context; -import android.view.Gravity; -import android.view.View; - -import androidx.appcompat.widget.AppCompatTextView; - -import com.chwl.app.R; -import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.chwl.library.common.util.Utils; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/11/1 - */ -public class WithdrawBillsIndicatorAdapter extends CommonNavigatorAdapter { - private List mTitleList; - private Context mContext; - - public WithdrawBillsIndicatorAdapter(Context mContext, List mTitleList) { - this.mTitleList = mTitleList; - this.mContext = mContext; - } - - @Override - public int getCount() { - return mTitleList == null ? 0 : mTitleList.size(); - } - - @Override - public IPagerTitleView getTitleView(Context context, int index) { - WithdrawBillsPagerTitleView categoryPagerTitleView = new WithdrawBillsPagerTitleView(context, mTitleList.get(index)); - categoryPagerTitleView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (null != mOnItemSelectListener) { - mOnItemSelectListener.onItemSelect(index); - } - } - }); - return categoryPagerTitleView; - } - - @Override - public IPagerIndicator getIndicator(Context context) { - return null; - } - - private OnItemSelectListener mOnItemSelectListener; - - public void setOnItemSelectListener(OnItemSelectListener onItemSelectListener) { - mOnItemSelectListener = onItemSelectListener; - } - - public interface OnItemSelectListener { - void onItemSelect(int position); - } - - class WithdrawBillsPagerTitleView extends AppCompatTextView implements IPagerTitleView { - - - public WithdrawBillsPagerTitleView(Context context, String tabInfo) { - super(context); - setWidth(Utils.dip2px(getContext(), 96)); - setHeight(Utils.dip2px(getContext(), 30)); - setTextSize(15); - setText(tabInfo); - setGravity(Gravity.CENTER); - - } - - - @Override - public void onSelected(int index, int totalCount) { - setBackgroundResource(R.drawable.shape_bg_contact_indicator_item); - setTextColor(getResources().getColor(R.color.appColor)); - } - - @Override - public void onDeselected(int index, int totalCount) { - setBackgroundDrawable(null); - setTextColor(getResources().getColor(R.color.color_999999)); - } - - @Override - public void onLeave(int index, int totalCount, float leavePercent, boolean leftToRight) { - - } - - @Override - public void onEnter(int index, int totalCount, float enterPercent, boolean leftToRight) { - - } - } - - -} diff --git a/app/src/main/java/com/chwl/app/bills/adapter/WithdrawRedBillsAdapter.java b/app/src/main/java/com/chwl/app/bills/adapter/WithdrawRedBillsAdapter.java deleted file mode 100644 index 256e28ac8..000000000 --- a/app/src/main/java/com/chwl/app/bills/adapter/WithdrawRedBillsAdapter.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.chwl.app.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.chwl.app.R; -import com.chwl.core.bills.bean.BillItemEntity; -import com.chwl.core.bills.bean.RedBagInfo; -import com.chwl.library.utils.ResUtil; -import com.chwl.library.utils.TimeUtils; - -import java.util.List; - -/** - * 红包提现账单adapter RedBagInfo - * Created by Seven on 2017/9/17. - */ -public class WithdrawRedBillsAdapter extends BillBaseAdapter { - - - public WithdrawRedBillsAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_withdraw_bills_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - RedBagInfo redBagInfo = billItemEntity.mRedBagInfo; - if (redBagInfo == null) return; - baseViewHolder.setText(R.id.tv_diamondNum, ResUtil.getString(R.string.bills_adapter_withdrawredbillsadapter_01) + redBagInfo.getPacketNum() + ResUtil.getString(R.string.diamond)) - .setText(R.id.tv_date, TimeUtils.getYearMonthDayHourMinuteSecond(redBagInfo.getCreateTime())) -// .setText(R.id.tv_money, "+" + redBagInfo.getMoney() + ResUtil.getString(R.string.bills_adapter_withdrawredbillsadapter_03)) - ; - } -} diff --git a/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java b/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java deleted file mode 100644 index 0228a3976..000000000 --- a/app/src/main/java/com/chwl/app/bills/fragmemt/WithdrawBillsFragment.java +++ /dev/null @@ -1,242 +0,0 @@ -package com.chwl.app.bills.fragmemt; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.Nullable; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chwl.app.R; -import com.chwl.app.base.BaseBindingFragment; -import com.chwl.app.bills.adapter.WithdrawBillsAdapter; -import com.chwl.app.bills.event.DateInfoEvent; -import com.chwl.app.bills.event.TopEvent; -import com.chwl.app.common.NoDataFragment; -import com.chwl.app.databinding.FragmentXrexylerviewBinding; -import com.chwl.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.chwl.core.XConstants; -import com.chwl.core.Constants; -import com.chwl.core.bills.BillModel; -import com.chwl.core.bills.bean.BillItemEntity; -import com.chwl.core.bills.bean.IncomeInfo; -import com.chwl.core.bills.bean.IncomeListInfo; -import com.chwl.library.annatation.ActLayoutRes; -import com.chwl.library.utils.ListUtils; -import com.chwl.library.utils.ResUtil; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *

提现账单（不包含红包）

- * Created by Administrator on 2017/11/7. - */ -@ActLayoutRes(R.layout.fragment_xrexylerview) -public class WithdrawBillsFragment extends BaseBindingFragment { - private RecyclerView mRecyclerView; - private SwipeRefreshLayout mSwipeRefreshLayout; - private WithdrawBillsAdapter adapter; - private List mBillItemEntityList = new ArrayList<>(); - private Context mContext; - - protected int mCurrentCounter = Constants.PAGE_START;//当前页 - protected static final int PAGE_SIZE = Constants.BILL_PAGE_SIZE; - protected long time = System.currentTimeMillis(); - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mContext = getContext(); - } - - @Override - public void onFindViews() { - mRecyclerView = mBinding.recyclerView; - mSwipeRefreshLayout = mBinding.swipeRefresh; - } - - @Override - public void onSetListener() { - mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - mCurrentCounter = 1; - loadData(); - } - }); - } - - @Override - public void initiate() { - adapter = new WithdrawBillsAdapter(mBillItemEntityList); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - mCurrentCounter++; - loadData(); - } - }, mRecyclerView); - adapter.addFooterView(View.inflate(getActivity(), R.layout.layout_bills_bottom, null)); - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mContext); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(adapter); - showLoading(); - loadData(); - } - - @SuppressLint("CheckResult") - private void loadData() { - BillModel.get() - .getWithdrawBills(mCurrentCounter, PAGE_SIZE, time) - .compose(bindToLifecycle()) - .subscribe((incomedResult, throwable) -> { - if (throwable != null) { - onGetWithdrawBillsError(throwable.getMessage()); - } else if (incomedResult != null && incomedResult.isSuccess()) { - onGetWithdrawBills(incomedResult.getData()); - } else if (incomedResult != null) { - onGetWithdrawBillsError(incomedResult.getError()); - } - }); - } - - public void onGetWithdrawBills(IncomeListInfo data) { - mSwipeRefreshLayout.setRefreshing(false); - if (null != data) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - adapter.setNewData(mBillItemEntityList); - } else { - adapter.loadMoreComplete(); - } - BillItemEntity billItemEntity; - List>> billList = data.getBillList(); - if (!billList.isEmpty()) { - int size = mBillItemEntityList.size(); - List billItemEntities = new ArrayList<>(); - for (int i = 0; i < billList.size(); i++) { - Map> map = billList.get(i); - for (String key : map.keySet()) { - // key ---日期 value：list集合记录 - List incomeInfos = map.get(key); - if (ListUtils.isListEmpty(incomeInfos)) continue; - //标题 - if (size > 0) { - BillItemEntity lastBillItem = mBillItemEntityList.get(size - 1); - if (!TextUtils.equals(lastBillItem.time, key)) { //时间不一致才会添加标题 - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_DATE, key); - billItemEntities.add(billItemEntity); - } - } else { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_DATE, key); - billItemEntities.add(billItemEntity); - } - - //正常item - for (IncomeInfo temp : incomeInfos) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - billItemEntity.mWithdrawInfo = temp; - billItemEntity.time = key; //目的是为了比较 - billItemEntities.add(billItemEntity); - } - } - } - if (billItemEntities.size() < Constants.BILL_PAGE_SIZE && mCurrentCounter == Constants.PAGE_START) { - adapter.setEnableLoadMore(false); - } - adapter.addData(billItemEntities); - } else { - if (mCurrentCounter == 1) { - showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.yizhuan_xchat_android_constants_xchatconstants_017)); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - - @SuppressLint("ResourceType") - @Override - public void showNoData(View view, int drawable, CharSequence charSequence) { - if (!checkActivityValid()) - return; - - if (view == null) { - return; - } - View status = view.findViewById(R.id.status_layout); - if (status == null || status.getId() <= 0) { - return; - } - NoDataFragment fragment = NoDataFragment.newInstance(R.layout.fragment_no_data_large_iv, drawable, charSequence); - fragment.setListener(getLoadListener()); - getChildFragmentManager().beginTransaction().replace(status.getId(), fragment, STATUS_TAG).commitAllowingStateLoss(); - } - - public void onGetWithdrawBillsError(String error) { - mSwipeRefreshLayout.setRefreshing(false); - if (mCurrentCounter == Constants.PAGE_START) { - mSwipeRefreshLayout.setRefreshing(false); - showNetworkErr(); - } else { - adapter.loadMoreFail(); - } - } - - - @Override - public void onStart() { - super.onStart(); - EventBus.getDefault().register(this); - } - - @Override - public void onStop() { - super.onStop(); - EventBus.getDefault().unregister(this); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onDateInfoEvent(DateInfoEvent event) { - if (event != null && event.position == 0) { - time = event.millSeconds; - mCurrentCounter = 1; - showLoading(); - loadData(); - } - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onTopEvent(TopEvent event) { - if (event != null && event.position == 0) { - try { - mRecyclerView.smoothScrollToPosition(0); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - @Override - public View.OnClickListener getLoadListener() { - return new View.OnClickListener() { - @Override - public void onClick(View v) { - mCurrentCounter = 1; - showLoading(); - loadData(); - } - }; - } -} diff --git a/app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt b/app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt index 01f45cc9f..293bb6583 100644 --- a/app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt +++ b/app/src/main/java/com/chwl/app/earn/EarnRecordViewModel.kt @@ -26,15 +26,9 @@ class EarnRecordViewModel : BaseViewModel() { private val _exchangeConfirmLiveData = MutableLiveData() val exchangeConfirmLiveData: MutableLiveData = _exchangeConfirmLiveData - //提现界面 - private val _getConfigWithdrawLiveData = MutableLiveData() - val getConfigWithdrawLiveData: MutableLiveData = _getConfigWithdrawLiveData - //提现 - private val _exchangeLiveData = MutableLiveData() - val exchangeLiveData: MutableLiveData = _exchangeLiveData - //绑定提现账号 + private val _boundLiveData = MutableLiveData() val boundLiveData: MutableLiveData = _boundLiveData @@ -151,61 +145,9 @@ class EarnRecordViewModel : BaseViewModel() { ) } - /** - * 提现界面 - */ - fun getConfigWithdraw() { - safeLaunch( - true, - block = { - _getConfigWithdrawLiveData.value = EarnModel.getConfigWithdrawInfo() - } - ) - } - /** - * 提现 - */ - fun exchange(goldNum: Double, payPwd: String) { - safeLaunch( - true, - block = { - _exchangeLiveData.value = EarnModel.exchange(goldNum, payPwd) - } - ) - } - /** - * 绑定提现账号 - */ - fun bound( - uid: Long, - swift: String, - bankName: String, - accountNumber: String, - accountName: String, - address: String, - city: String, - province: String, - postCode: String - ) { - safeLaunch( - true, - block = { - _boundLiveData.value = EarnModel.bound( - uid, - swift, - bankName, - accountNumber, - accountName, - address, - city, - province, - postCode - ) - } - ) - } + /** * 结算明细 diff --git a/app/src/main/java/com/chwl/app/earn/activity/BindWithdrawMsgActivity.kt b/app/src/main/java/com/chwl/app/earn/activity/BindWithdrawMsgActivity.kt deleted file mode 100644 index 66f14bca4..000000000 --- a/app/src/main/java/com/chwl/app/earn/activity/BindWithdrawMsgActivity.kt +++ /dev/null @@ -1,124 +0,0 @@ -package com.chwl.app.earn.activity - -import android.content.Context -import android.content.Intent -import android.text.Editable -import android.text.TextWatcher -import androidx.activity.viewModels -import com.netease.nim.uikit.StatusBarUtil -import com.chwl.app.R -import com.chwl.app.base.BaseViewBindingActivity -import com.chwl.app.databinding.ActivityBindWithdrawMsgBinding -import com.chwl.app.earn.EarnRecordViewModel -import com.chwl.core.auth.AuthModel -import com.chwl.core.earn.bean.WithdrawAccount - -/** - * 绑定提现信息 - */ -class BindWithdrawMsgActivity : BaseViewBindingActivity(), - TextWatcher { - - private val earnRecordModel: EarnRecordViewModel by viewModels() - - companion object { - - const val BEAN = "bean" - - @JvmStatic - fun start(context: Context, withdrawAccount: WithdrawAccount?) { - val starter = Intent(context, BindWithdrawMsgActivity::class.java) - starter.putExtra(BEAN, withdrawAccount) - context.startActivity(starter) - } - } - - override fun init() { - initTitleBar(getString(R.string.bind_withdraw_message)) - initListener() - val bean = intent.getSerializableExtra(BEAN) as? WithdrawAccount - bean?.let { - binding.edSwiftCode.setText(it.swift) - binding.edBankName.setText(it.bankName) - binding.edAccountNumber.setText(it.accountNumber) - binding.edAccountName.setText(it.accountName) - binding.edAddress.setText(it.address) - binding.edCity.setText(it.city) - binding.edProvince.setText(it.province) - binding.edPostCode.setText(it.postCode) - } - } - - private fun initListener() { - binding.edSwiftCode.addTextChangedListener(this) - binding.edBankName.addTextChangedListener(this) - binding.edAccountNumber.addTextChangedListener(this) - binding.edAccountName.addTextChangedListener(this) - binding.edAddress.addTextChangedListener(this) - binding.edCity.addTextChangedListener(this) - binding.edProvince.addTextChangedListener(this) - binding.edPostCode.addTextChangedListener(this) - - binding.tvSave.setOnClickListener { view -> - val edSwiftCode = binding.edSwiftCode.text.toString() - val edBankName = binding.edBankName.text.toString() - val edAccountNumber = binding.edAccountNumber.text.toString() - val edAccountName = binding.edAccountName.text.toString() - val edAddress = binding.edAddress.text.toString() - val edCity = binding.edCity.text.toString() - val edProvince = binding.edProvince.text.toString() - val edPostCode = binding.edPostCode.text.toString() - earnRecordModel.bound( - AuthModel.get().currentUid, - edSwiftCode, - edBankName, - edAccountNumber, - edAccountName, - edAddress, - edCity, - edProvince, - edPostCode - ) - } - - earnRecordModel.loadingLiveData.observe(this) { loading -> - if (loading) dialogManager.showProgressDialog(this) - else dialogManager.dismissDialog() - } - - earnRecordModel.boundLiveData.observe(this) { - toast(getString(R.string.update_success)) - finish() - } - } - - override fun needSteepStateBar() = true - - override fun setStatusBar() { - super.setStatusBar() - StatusBarUtil.transparencyBar(this) - StatusBarUtil.StatusBarLightMode(this) - } - - override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { - - } - - override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) { - - } - - override fun afterTextChanged(p0: Editable?) { - binding.tvSave.isEnabled = - !(binding.edSwiftCode.text.toString().isEmpty() || binding.edBankName.text.toString() - .isEmpty() - || binding.edAccountNumber.text.toString() - .isEmpty() || binding.edAccountName.text.toString().isEmpty() - || binding.edAddress.text.toString().isEmpty() || binding.edCity.text.toString() - .isEmpty() - || binding.edProvince.text.toString() - .isEmpty() || binding.edPostCode.text.toString() - .isEmpty()) - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskIndicatorAdapter.java b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskIndicatorAdapter.java index 196df7f76..675516545 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskIndicatorAdapter.java +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskIndicatorAdapter.java @@ -34,7 +34,7 @@ public class CpTaskIndicatorAdapter extends CommonNavigatorAdapter { @Override public IPagerTitleView getTitleView(Context context, int index) { - WithdrawBillsPagerTitleView categoryPagerTitleView = new WithdrawBillsPagerTitleView(context, mTitleList.get(index)); + PagerTitleView categoryPagerTitleView = new PagerTitleView(context, mTitleList.get(index)); categoryPagerTitleView.setOnClickListener(v -> { if (null != mOnItemSelectListener) { mOnItemSelectListener.onItemSelect(index); @@ -58,10 +58,10 @@ public class CpTaskIndicatorAdapter extends CommonNavigatorAdapter { void onItemSelect(int position); } - class WithdrawBillsPagerTitleView extends FrameLayout implements IPagerTitleView { + class PagerTitleView extends FrameLayout implements IPagerTitleView { - public WithdrawBillsPagerTitleView(Context context, String tabInfo) { + public PagerTitleView(Context context, String tabInfo) { super(context); LayoutInflater.from(context).inflate(R.layout.layout_cp_task_indicator,this,true); ((TextView) getChildAt(0)).setText(tabInfo); diff --git a/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawJewelAdapter.java b/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawJewelAdapter.java deleted file mode 100644 index 2cf61417d..000000000 --- a/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawJewelAdapter.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.chwl.app.ui.wallet.adapter; - -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.chwl.app.R; -import com.chwl.core.withdraw.bean.WithdrwaListInfo; -import com.chwl.library.utils.ResUtil; - -/** - *

钻石提现界面

- * Created by Administrator on 2017/11/21. - */ -public class WithdrawJewelAdapter extends BaseQuickAdapter { - public WithdrawJewelAdapter() { - super(R.layout.withdraw_item); - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, WithdrwaListInfo withdrwaListInfo) { - if (withdrwaListInfo == null) return; - baseViewHolder.setText(R.id.tv_jewel, (int)withdrwaListInfo.diamondNum + ResUtil.getString(R.string.wallet_adapter_withdrawjeweladapter_01)); - baseViewHolder.setText(R.id.tv_money, "" + withdrwaListInfo.cashNum); - - LinearLayout ll_gold_charge = baseViewHolder.getView(R.id.ll_gold_charge); - TextView tv_jewel = baseViewHolder.getView(R.id.tv_jewel); - TextView tv_money = baseViewHolder.getView(R.id.tv_money); - ll_gold_charge.setSelected(withdrwaListInfo.isSelected); - if(withdrwaListInfo.isSelected){ - tv_jewel.setTextColor(mContext.getResources().getColor(R.color.appColor)); - tv_money.setTextColor(mContext.getResources().getColor(R.color.appColor)); - } else { - tv_jewel.setTextColor(mContext.getResources().getColor(R.color.text_color_secondary)); - tv_money.setTextColor(mContext.getResources().getColor(R.color.text_color_secondary)); - } -// baseViewHolder.setText(R.id.list_name, withdrwaListInfo.cashProdName); -// ImageView imageView = baseViewHolder.getView(R.id.select_withdraw); -// imageView.setSelected(withdrwaListInfo.isSelected); - } -} diff --git a/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawRedListAdapter.java b/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawRedListAdapter.java deleted file mode 100644 index 760c2d9e5..000000000 --- a/app/src/main/java/com/chwl/app/ui/wallet/adapter/WithdrawRedListAdapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.chwl.app.ui.wallet.adapter; - -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.chwl.app.R; -import com.chwl.core.redPacket.bean.WithdrawRedListInfo; - -/** - *

红包提现展示列表

- * Created by Administrator on 2017/11/20. - */ -public class WithdrawRedListAdapter extends BaseQuickAdapter { - public WithdrawRedListAdapter() { - super(R.layout.list_red_packet_item); - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, WithdrawRedListInfo withdrawRedListInfo) { - if (withdrawRedListInfo == null) return; - baseViewHolder.setText(R.id.tv_money, "￥" + withdrawRedListInfo.getPacketNum()); - - LinearLayout ll_gold_charge = baseViewHolder.getView(R.id.ll_gold_charge); - TextView tv_money = baseViewHolder.getView(R.id.tv_money); - ll_gold_charge.setSelected(withdrawRedListInfo.isSelected); - if(withdrawRedListInfo.isSelected){ - tv_money.setTextColor(mContext.getResources().getColor(R.color.appColor)); - } else { - tv_money.setTextColor(mContext.getResources().getColor(R.color.text_color_secondary)); - } - /*baseViewHolder.setText(R.id.list_name, - mContext.getString(R.string.withdraw_prod_name, - withdrawRedListInfo.getPacketNum(), withdrawRedListInfo.getPacketNum()) - ); - ImageView selectWithdraw = baseViewHolder.getView(R.id.select_withdraw); - selectWithdraw.setSelected(withdrawRedListInfo.isSelected);*/ - } -} diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt index 23e4d62ec..889cd3652 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt @@ -21,7 +21,6 @@ class VipAuthAdapter : override fun convert(helper: BaseViewHolder, item: VipAuthInfo) { helper.setText(R.id.tv_auth_name, item.authName) helper.getView(R.id.iv_auth_icon).load(item.authIcon) - helper.itemView.alpha = - if (vipInfo?.ownAuthTypes?.contains(item.authType) == true) 1f else 0.5f + helper.itemView.alpha = if (vipInfo?.ownAuthTypes?.contains(item.authType) == true) 1f else 0.5f } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt index 8436d28fb..0834c9ac3 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt @@ -43,7 +43,6 @@ class VipCenterBannerAdapter( } override fun onBindView(holder: BannerViewHolder, data: VipInfo, position: Int, size: Int) { - //todo do 旧bug 买完VIP不刷新item holder.dueText.visibility = View.GONE if (myVipInfo != null) { diff --git a/app/src/main/res/drawable-xhdpi/withdraw_focused.webp b/app/src/main/res/drawable-xhdpi/c_draw_focused.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/withdraw_focused.webp rename to app/src/main/res/drawable-xhdpi/c_draw_focused.webp diff --git a/app/src/main/res/drawable-xhdpi/withdraw_un.webp b/app/src/main/res/drawable-xhdpi/c_draw_un.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/withdraw_un.webp rename to app/src/main/res/drawable-xhdpi/c_draw_un.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_withdraw_record_arrow.webp b/app/src/main/res/drawable-xhdpi/ic_black_arrow.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_withdraw_record_arrow.webp rename to app/src/main/res/drawable-xhdpi/ic_black_arrow.webp diff --git a/app/src/main/res/drawable-xhdpi/ic_withdraw_arrow.webp b/app/src/main/res/drawable-xhdpi/ic_draw_w_arrow.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_withdraw_arrow.webp rename to app/src/main/res/drawable-xhdpi/ic_draw_w_arrow.webp diff --git a/app/src/main/res/drawable-xhdpi/icon_withdraw_bank_card.webp b/app/src/main/res/drawable-xhdpi/icon_ank_card.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_withdraw_bank_card.webp rename to app/src/main/res/drawable-xhdpi/icon_ank_card.webp diff --git a/app/src/main/res/drawable-xhdpi/icon_bills_withdraw.webp b/app/src/main/res/drawable-xhdpi/icon_bills_img.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_bills_withdraw.webp rename to app/src/main/res/drawable-xhdpi/icon_bills_img.webp diff --git a/app/src/main/res/drawable-xhdpi/icon_withdraw_type.webp b/app/src/main/res/drawable-xhdpi/icon_change_type_arrow.webp similarity index 100% rename from app/src/main/res/drawable-xhdpi/icon_withdraw_type.webp rename to app/src/main/res/drawable-xhdpi/icon_change_type_arrow.webp diff --git a/app/src/main/res/drawable/withdraw_selector.xml b/app/src/main/res/drawable/withdraw_selector.xml deleted file mode 100644 index 5685dc4a6..000000000 --- a/app/src/main/res/drawable/withdraw_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/activity_bind_withdraw_msg.xml b/app/src/main/res/layout/activity_bind_withdraw_msg.xml deleted file mode 100644 index dc4307b8d..000000000 --- a/app/src/main/res/layout/activity_bind_withdraw_msg.xml +++ /dev/null @@ -1,346 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_jewel.xml b/app/src/main/res/layout/activity_jewel.xml deleted file mode 100644 index ed3f8ecd7..000000000 --- a/app/src/main/res/layout/activity_jewel.xml +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_total_bills.xml b/app/src/main/res/layout/activity_total_bills.xml index 0b07d24e6..9533329fe 100644 --- a/app/src/main/res/layout/activity_total_bills.xml +++ b/app/src/main/res/layout/activity_total_bills.xml @@ -61,13 +61,7 @@ app:item_text="@string/bill_charge" app:left_icon="@drawable/icon_bills_charge" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_xrexylerview.xml b/app/src/main/res/layout/fragment_xrexylerview.xml deleted file mode 100644 index 0b1d0779b..000000000 --- a/app/src/main/res/layout/fragment_xrexylerview.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/list_charge_bills_item.xml b/app/src/main/res/layout/list_charge_bills_item.xml index 5ef8fa016..2cb0b82fb 100644 --- a/app/src/main/res/layout/list_charge_bills_item.xml +++ b/app/src/main/res/layout/list_charge_bills_item.xml @@ -12,7 +12,6 @@ android:layout_height="wrap_content" android:layout_marginStart="15dp" android:layout_marginTop="15dp" - tools:text="@string/layout_list_charge_bills_item_01" android:textColor="#333333" android:textSize="15sp" /> diff --git a/app/src/main/res/layout/list_red_packet_item.xml b/app/src/main/res/layout/list_red_packet_item.xml index c831d79c1..501d35fae 100644 --- a/app/src/main/res/layout/list_red_packet_item.xml +++ b/app/src/main/res/layout/list_red_packet_item.xml @@ -18,29 +18,3 @@ android:textSize="17sp" /> - - diff --git a/app/src/main/res/layout/list_withdraw_bills_item.xml b/app/src/main/res/layout/list_withdraw_bills_item.xml deleted file mode 100644 index 126d2fd87..000000000 --- a/app/src/main/res/layout/list_withdraw_bills_item.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/vip_set_activity.xml b/app/src/main/res/layout/vip_set_activity.xml index b16fb22de..3d2191d03 100644 --- a/app/src/main/res/layout/vip_set_activity.xml +++ b/app/src/main/res/layout/vip_set_activity.xml @@ -73,8 +73,8 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 58cde8975..495e8e900 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -86,7 +86,6 @@ سجلات دخل الهدايا سجلات إنفاق الهدايا سجلات الشحن - سجل سحب العملة سجلات الحزمة الحمراء العملة العملة @@ -94,7 +93,6 @@ رصيد الحساب: %.0f عملة %.0f - سحب الحزمة الحمراء ليس لديك سجلات بعد @@ -129,7 +127,6 @@ لم تقم بإضافة أي أصدقاء بعد! \n اذهب وأضف أصدقاء الآن! ليس لديك أي معجبين على Molistar بعد رصيد عملة - يمكن استخدام العملة للسحب، مع معدل تحويل 1 يوان = 10 عملات الرئيسية التصنيف استكشاف @@ -181,24 +178,6 @@ +%.2f %.2f - %1$d حزمة حمراء = ¥%2$d يوان - أنت على وشك تبديل %1$d حزمة حمراء = ¥%2$d يوان - ملاحظة: بالنسبة للسحوبات الكبيرة، يرجى\nالاتصال بخدمة العملاء لعمليات السحب. شكراً لك! - سحب - الرجاء إدخال رقم بطاقة البنك - الرجاء إدخال اسم صاحب البطاقة - تأكيد الربط - سيتم إرسال رمز التحقق إلى هاتفك المرتبط %s، يرجى التحقق بعناية - الألي باي - بطاقة البنك - الألي باي: %s - الاسم الحقيقي: %s - حساب بطاقة البنك: %s - اسم صاحب البطاقة: %s - المبلغ الفعلي المستلم: - رسوم الإدارة: %s يوان - %s يوان - رقم %d رقم الهوية:%1$d   %2$d شخص متصل> الأكثر شعبية @@ -668,8 +647,6 @@ لا يوجد مستخدم\n... مرحبًا ربط الهاتف - ربط بطاقة السحب البنكية - %s (%s) تعيين كلمة المرور لتسجيل الدخول تعديل كلمة مرور الدفع @@ -1812,19 +1789,12 @@ الشحن الشحن عزيزي الطفل، ليس لديك أي سجلات للظرف الأحمر بعد! - الشحن - تحديد التاريخ الشحن الماس مستلم الهدية مرسل الهدية يوان - سحب - الماس - يوان - سحب - الماس - يوان + تحديد التاريخ همم، أنتم لا تحبونني، لا حتى هدية واحدة هدية الماس @@ -2614,7 +2584,6 @@ فشلت العملية، يرجى التحقق من الشبكة يرجى الانتظار الشبكة غير طبيعية، يرجى التحقق من الشبكة والمحاولة مرة أخرى - الماس صرف النقود الرجاء إدخال كمية النقود التي ترغب في صرفها يجب أن تكون كمية النقود المراد صرفها مضاعفة للعشرة @@ -2765,26 +2734,7 @@ بطاقة الملف الشخصي - تخفيضهم بعد تخفيضهم، سيخرج اللاعب من اللعبة بشكل افتراضي. هل ترغب في الاستمرار؟ مركبة - يرجى ربط رقم هاتفك أولاً - تم ربط بطاقة السحب بنجاح - ربط الأليباي - الرقم غير مرتبط برقم الهاتف. - تم الربط بنجاح - فشل تحميل معلومات السحب، يرجى إغلاق الواجهة والمحاولة مرة أخرى - يرجى تحديد المبلغ المراد سحبه أولاً - يرجى ربط الأليباي أولاً - الذهاب للربط - أنت على وشك تبديل - فشل التبديل - فشل الحصول على قائمة السحب - نجاح السحب - سجل السحب - من أجل سلامة أموالك\nالحد الأقصى للسحب الفردي - وصل - RMB\nيدعم السحب فقط إلى بطاقة البنك\n - يرجى ربط بطاقة بنكية أولاً - الذهاب للربط - قواعد السحب + المنجز - صوتي المنجز - صوتي - المنجز - صوتي - @@ -2864,8 +2814,6 @@ سجل نفقات الهدية مطرقة ذهبية مجانية! 100% فوز! صرف النقود - انسحب الآن - ملاحظة: يمكن استخدام النقود للسحب، بمعدل 1 دولار = 10 نقود البيئة التي قمت بتحديدها هي: الجنس بيئة رسمية @@ -3019,15 +2967,7 @@ الرجاء إدخال رمز التحقق التالي إذا فقدت رقم هاتفك\nيرجى التواصل مع خدمة العملاء، ID: - يرجى ربط حسابك على الـ Alipay - لو شينغ - رصيد الماس - رسوم: $6 - $94 - تأكيد السحب - تأكيد السحب - تعرف على المزيد حول قواعد السحب > - 11 سبتمبر 2017 + المنجم المنجم المنجم المنجم ... مرحبًا "رياح وغبار" بهذه الغرفة asdasdsadasdasdaasda المنجم المنجم المنجم المنجم المنجم المنجم المنجم @@ -3743,7 +3683,6 @@ مشاركة معك مشاركة معك مشاركة معك المهمة مكتملة عرض الجوائز - سحب مظروف أحمر شوكولاتة المستلم: الأميرة سيسي ماسة @@ -3784,8 +3723,7 @@ الثالث عشر الأحمر ضد الصفحة الواحدة ماسات 10000 ماسة = 100 دولار - سحب 1000 ماسة - +68 يوان + الصفحة الرئيسية الخاص بي الخاص بي الخاص بي الخاص بي الخاص بي الخاص بي المعرف: 666666 @@ -3817,10 +3755,8 @@ اسم المستخدم المستعار اسحب لتجربة؟ العثور على المزيد من غرف الدردشة المرحة - سحب صرف الماسات - 1000 ماسة - 10000 ماسة = 100 دولار + المسار: تأكيد تأكيد @@ -4914,15 +4850,10 @@ الماس كوينزاتي: %s تأكيد التبادل - لم يتم تعيين حساب السحب - عدد مرات السحب الأسبوعية المتبقية: - سحب نقدي فوري اختر اللعبة نجاح التبادل الرمز السريع/BIC: %s اسم البنك: %s - نجاح السحب - ربط معلومات السحب تحويل النقود إلى ألماس استهلاك النقود %s نقود @@ -4934,7 +4865,6 @@ معاملات الألماس أرباح العملات الذهبية نقود قابلة للتسوية - الرجاء إدخال مبلغ النقود المراد سحبه الكل المرات لا توجد بيانات diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index a6a43dd68..b7fff7140 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -87,14 +87,12 @@ Hediye geliri kaydı Hediye harcama kaydı Şarj kaydı - Altın çekme kaydı Kırmızı paket kaydı Altın Altın Fatura Hesap bakiyesi: %.0f altın %.0f - Kırmızı paket çekme Henüz kaydınız yok Cüzdanım Hediye biletlerim @@ -125,7 +123,6 @@ Henüz hiç arkadaş eklemediniz! \nHemen arkadaş ekleyin! Henüz hiç MoliStar hayranınız yok! Altın bakiyem - Altın çekmek için kullanılabilir, dönüşüm oranı 1 TL=10 altın Ana sayfa Sıralama Keşfet @@ -174,30 +171,12 @@ Yükleme Onayla +%.2f %.2f - - %1$d kırmızı zarf=¥%2$d TL - %1$d kırmızı zarf=¥%2$d TL çekmek üzeresiniz - Not: Yüksek miktarlı çekimlerde, lütfen \nmüşteri hizmetleri ile iletişime geçin. Teşekkürler! - Çekme - Lütfen banka kartı numarasını girin - Lütfen kart sahibinin adını girin - Bağlantıyı Onayla - Doğrulama kodu %s numaralı telefona gönderilecektir, lütfen kontrol edin - Alipay - Banka Kartı - Alipay: %s - Gerçek Ad: %s - Banka Kartı Hesabı: %s - Kart Sahibinin Adı: %s - Gerçek Kazanç: - İşlem Ücreti: %s TL - %s TL + NO.%d ID:%1$d   %2$d people online> VIP Ayrıcalıkları Statik Avatar - %2$d kişi çevrimiçi> Popüler İlgili veri bulunamadı Oda Ayarları @@ -603,8 +582,6 @@ Henüz Kullanıcı Yok\n… nihao Telefon Bağla - Para Çekme Banka Kartını Bağla - %s (%s) Giriş Şifresini Ayarla Değiştir Ödeme Şifresi @@ -1713,15 +1690,10 @@ Toplam imza alın, ilgili ödülü alın Şarj et Şarj et Sevgili, henüz kırmızı paket kaydınız yok! - Şarj et - Tarih Seç Şarj et Alıcı  Gönderen  TL - Para Çekme - Para Çekme - TL Tarih Seç Hmm, beni sevmiyorsunuz, hiç hediye yok Altın Hediye @@ -2511,7 +2483,6 @@ Toplam imza alın, ilgili ödülü alın İşlem Başarısız, Lütfen Ağı Kontrol Edin Lütfen Bekleyin Ağ Hatası, Lütfen Ağı Kontrol Edin ve Tekrar Deneyin - Elmas Altın Değiştirme Değiştirmek İstediğiniz Altın Miktarını Girin Değiştirilecek Altın Miktarı 10\'un Katı Olmalı @@ -2662,26 +2633,7 @@ Toplam imza alın, ilgili ödülü alın Veri Kartı - Onu Mikrofondan Çıkar Onu mikrofondan çıkarın ve varsayılan olarak oyundan çıkmasına izin verilsin mi? Araç - Önce telefon numarasını bağlayın - Çekim banka kartını başarıyla bağla - Alipay Bağla - Telefon numarası bağlı değil. - Bağlama başarılı - Çekme bilgileri başarılı yüklenemedi, lütfen pencereyi kapatın ve tekrar deneyin - Çekmek istediğiniz miktarı seçin - Önce Alipay\'i bağlayın - Bağlamaya git - Değiştirmek istediğiniz miktar - Çekme başarısız - Çekme listesi alınamadı - Çekme başarılı - Çekme kayıtları - Mali güvenliğinizi sağlamak için\nTek seferde çekme miktarı - Ulaşmak - Çin Yuanı\nSadece banka kartına çekim desteklenir\n - Önce bir banka kartı bağlayın - Bağlamaya git - Çekme kuralları + Benim - Benim Sesim Benim - Benim Sesim- Benim - Benim Sesim- @@ -2761,8 +2713,6 @@ Toplam imza alın, ilgili ödülü alın Hediye harcama kaydı Ücretsiz olarak altın yumurta çekici kazma kazanın! %100 kazanma şansı! Altına çevir - Hemen çek - Not: Altınlar çekim için kullanılabilir, çekim oranı 1 TL=10 altın Seçtiğiniz ortam: Cinsiyet Resmi Ortam @@ -2916,15 +2866,7 @@ Toplam imza alın, ilgili ödülü alın Doğrulama Kodunu Girin Sonraki Telefon numaranızı kaybettiyseniz\nLütfen destek hattına başvurun, ID: - Lütfen Alipay Hesabınızı Bağlayın - Luo Sheng - Elmas Bakiyesi - Komisyon: 6 TL - 94 TL - Çekimi Onayla - Çekimi Onayla - Çekim Kurallarını Öğrenmek İçin Git > - 2017 Eylül 11 + Benim Benim Benim Benim Benim Hoş Geldiniz "Fantezi Bin Yıl" Bu Odaya Geldiniz asdasdsadasdasdaasda Benim Benim Benim Benim Benim Benim @@ -3617,7 +3559,6 @@ Toplam imza alın, ilgili ödülü alın Seninle paylaşmak için ve seninle paylaşmak için ve seninle paylaşmak için Görev tamamlandı Ödülleri görüntüle - Kırmızı paket çekme Lolipop Hediye alan Sisi Prenses Sisi Prenses Sisi Prenses Sisi Prenses Sisi Prenses Sisi Prenses Sisi Prenses Sisi Prenses Sisi Prenses Sisi Prenses Elmas @@ -3657,8 +3598,7 @@ Toplam imza alın, ilgili ödülü alın Kırmızı on üç vs tek sayfa Elmas 10000 elmas=100 TL - 1000 elmas çekme - +68 TL + Ana sayfa Benim benim benim benim benim benim ID:666666 @@ -3688,10 +3628,7 @@ Toplam imza alın, ilgili ödülü alın Kullanıcı Adı Kaydırarak deneyin? Daha fazla eğlenceli sohbet odası keşfedin - Çek Elmas Değiştir - 1000 elmas - 10000 elmas=100 TL Yol: Tamam Tamam @@ -4790,15 +4727,12 @@ Toplam imza alın, ilgili ödülü alın Benim Elmasım Benim Altınım:%s Değişimi Onayla - Çekim hesabı bağlı değil - Kalan haftalık çekim sayısı: - Hemen çek + Oyun Seç Değişim başarılı swift kodu/BIC：%s banka adı：%s - Çekim başarılı - Çekim bilgilerini bağla + Elması Altına Çevir ve Altın Kazan Elmas Harca %s Elmas @@ -4809,7 +4743,6 @@ Toplam imza alın, ilgili ödülü alın Elmas Akışı Altın Kazancı Hesaplanabilir Elmas - Lütfen çekim için elmas miktarını girin Hepsi kat Veri yok diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 694ee853d..007fc33d6 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -100,7 +100,6 @@ 禮物收入記錄 禮物支出記錄 充值記錄 - 金幣提現記錄 紅包記錄 金幣 金幣 @@ -109,7 +108,6 @@ %.0f - 紅包提現 您還沒有記錄喔 @@ -144,7 +142,6 @@ 你還沒有添加任何好友哦! \n快去添加好友吧! 你還沒有任何&app_name;粉絲哦! 我的金幣余額 - 金幣可以用於提現，兌換比率1元=10金幣 首頁 排行榜 發現 @@ -200,24 +197,6 @@ +%.2f %.2f - - %1$d紅包=¥%2$d元 - 您將要兌換%1$d紅包=¥%2$d元 - 註：大額提現,請\n聯系客服進行提現操作。謝謝! - 提現 - 請輸入銀行卡號 - 請輸入持卡人姓名 - 確認綁定 - 驗證碼將發送至您綁定的手機%s，請註意查收 - 支付寶 - 銀行卡 - 支付寶: %s - 真實姓名: %s - 銀行卡賬號: %s - 持卡人姓名: %s - 實際到賬: - 手續費: %s 元 - %s元 NO.%d @@ -685,8 +664,6 @@ 暫無用戶\n… nihao 綁定手機 - 綁定提現銀行卡 - %s (%s) 設置登錄密碼 修改 支付密碼 @@ -1830,15 +1807,10 @@ 充值 充值 親愛的寶貝，你還沒有紅包記錄哦! - 充值 - 日期選擇 充值 收禮人 送禮人 元 - 提現 - 提現 - 元 日期選擇 哼，你們不愛我了，一個禮物都沒有 金幣禮物 @@ -2629,7 +2601,6 @@ 操作失敗，請檢查網絡 請稍後 網絡異常,請檢查網絡再試 - 鉆 金幣兌換 請輸入要兌換的金幣數量 兌換的金幣必須為10的整數倍 @@ -2780,26 +2751,7 @@ 資料卡片-抱他下麥 抱Ta下麥後默認該玩家退出遊戲,是否繼續? 座駕 - 請先綁定手機號 - 綁定提現銀行卡成功 - 綁定支付寶 - 沒有綁定手機號。 - 綁定成功 - 提現信息未加載成功，請關閉界面重試 - 請先選擇要提現的金額 - 請先綁定支付寶 - 去綁定 - 您將要兌換 - 兌換失敗 - 獲取提現列表失敗 - 提現成功 - 提現記錄 - 為了保障你的資金安全\n單次提現金額 - 達到 - 人民幣\n僅支持提現到銀行卡\n - 請先綁定銀行卡 - 去綁定 - 提現規則 + 我的-我的聲音 我的-我的聲音- 我的-我的聲音- @@ -2879,8 +2831,6 @@ 禮物支出記錄 免費獲得金蛋錘子！100%中獎哦！ 兌換金幣 - 立即提現 - 註: 金幣可用於提現，提現比例1元=10金幣 您選擇的環境是: 性別 正式環境 @@ -3034,15 +2984,7 @@ 請輸入驗證碼 下一步 如果您的手機號已丟失\n請咨詢客服，ID： - 請綁定你的支付寶賬號 - 羅生 - 鉆石余額 - 手續費:6元 - 94元 - 確認提現 - 確認提現 - 去了解提現規則 > - 2017年9月11日 + 我的我的我的我的... 歡迎「風騷千年」光臨本房間asdasdsadasdasdaasda 我的我的我的我的我的我的 @@ -3736,7 +3678,6 @@ 和你一起分享和你一起分享和你一起分享 任務已完成 查看獎勵 - 紅包提現 棒棒糖 收禮人 思思小公主思思小公主思思小公主思思小公主思思小公主思思小公主思思小公主思思小公主思思小公主 鉆石 @@ -3776,8 +3717,6 @@ 紅十三vs單頁也是 鉆石 10000鉆石=￥100元 - 提現1000鉆石 - +68元 首頁 我的我的我的我的我的我的 ID:666666 @@ -3808,10 +3747,7 @@ 用戶昵稱 滑動試試？ 發現更多嗨聊房 - 提現 兌換鉆石 - 1000鉆 - 10000鉆石=￥100元 路徑: 確定 確定 @@ -4911,15 +4847,11 @@ 我的鑽石 我的金幣:%s 確定兌換 - 未綁定提現賬戶 - 剩餘周提現次數： - 立即提現 + 選擇游戲 兌換成功 swift code/BIC：%s bank name：%s - 提現成功 - 綁定提現信息 兌換鑽石獲得金幣 消耗鑽石 %s鑽石 @@ -4930,7 +4862,6 @@ 鉆石流水 金幣收益 可結算鑽石 - 請輸入提現鑽石 全部 倍 暫無數據 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 2ad5ff922..ab8e2afff 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1,9 +1,5 @@ - - 鉆石提現 - 紅包提現 - 1.如何增加親密值？ 2.親密值會減少嗎？ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 81373c529..ae73b0d85 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,6 @@ Gift Income Records Gift Expenditure Records Recharge Records - Coins Withdrawal Record Red Packet Records Coins Coins @@ -107,7 +106,6 @@ %.0f - Red Packet Withdrawal You have no records yet @@ -142,7 +140,6 @@ You haven\'t added any friends yet! \nGo and add friends now! You don\'t have any MoliStar fans yet! My Coins Balance - Coins can be withdrawn, exchange rate 1 yuan = 10 coins Home Ranking Explore @@ -198,24 +195,7 @@ +%.2f %.2f - - %1$d Red Packets = ¥%2$d Yuan - You are about to exchange %1$d Red Packets = ¥%2$d Yuan - Note: For large withdrawals, please\ncontact customer service for withdrawal operations. Thank you! - Withdraw - Please enter the bank card number - Please enter the cardholder\'s name - Confirm Binding - The verification code will be sent to your bound phone %s, please pay attention to check - Alipay - Bank Card - Alipay: %s - Real Name: %s - Bank Card Account: %s - Cardholder\'s Name: %s - Actual Amount Received: - Handling Fee: %s Yuan - %s Yuan + NO.%d @@ -680,8 +660,6 @@ No user\n… Hello Bind Phone - Bind Withdraw Bank Card - %s (%s) Set Login Password Modify Payment Password @@ -1860,19 +1838,11 @@ Recharge Recharge Dear baby, you don\'t have any red envelope records yet! - Recharge - Date selection Recharge Diamond Gift recipient Gift sender Yuan - Withdrawal - Diamond - Yuan - Withdrawal - Diamond - Yuan Date selection Hmm, you guys don\'t love me, not even one gift Coins gift @@ -2661,7 +2631,6 @@ Operation failed, please check the network Please wait Network abnormal, please check the network and try again - Diamond Exchange Coins Please enter the amount of coins to be exchanged The exchanged coins must be a multiple of 10 @@ -2812,26 +2781,8 @@ Profile Card-Carry Them Down After carrying them down, the player will exit the game by default. Continue? Vehicle - Please bind your phone number first - Successfully bound withdrawal bank card - Bind Alipay - Phone number not bound. - Successfully bound - Withdrawal information failed to load, please close the interface and try again - Please select the amount to withdraw first - Please bind Alipay first - Go to bind - You are about to exchange - Exchange failed - Failed to get withdrawal list - Withdrawal successful - Withdrawal Record - For the safety of your funds\nSingle withdrawal amount - Reached - RMB\nOnly supports withdrawal to bank card\n - Please bind a bank card first - Go to bind - Withdrawal Rules + + Mine - My Sound Mine - My Sound - Mine - My Sound - @@ -2911,8 +2862,6 @@ Gift Expenditure Record Free Golden Hammer! 100% win! Exchange Coins - Withdraw Now - Note: Coins can be used for withdrawal, exchange rate 1 yuan = 10 gold co The environment you selected is: Gender Official Environment @@ -3066,15 +3015,7 @@ Please enter verification code Next If you have lost your phone number\nplease contact customer service, ID: - Please bind your Alipay account - Luo Sheng - Diamond balance - Fee: $6 - $94 - Confirm withdrawal - Confirm withdrawal - Learn more about withdrawal rules > - September 11, 2017 + Mine mine mine mine… Welcome "Wind and Dust" to this room asdasdsadasdasdaasda Mine mine mine mine mine mine @@ -3768,7 +3709,6 @@ Sharing with You Sharing with You Sharing with You Mission Completed View Rewards - Red Packet Withdrawal Lollipop Recipient: Princess Sisi Princess Sisi Princess Sisi Princess Sisi Princess Sisi Princess Sisi Princess Sisi Princess Sisi Princess Sisi Diamond @@ -3808,8 +3748,6 @@ Red Thirteen vs Single Page Diamonds 10000 Diamonds = $100 - Withdrawal 1000 Diamonds - +68 yuan Home Mine Mine Mine Mine Mine Mine ID:666666 @@ -3840,10 +3778,7 @@ User Nickname Slide to try? Find more hi-chat rooms - Withdrawal Exchange Diamonds - 1000 Diamonds - 10000 Diamonds = $100 Path: Confirm Confirm @@ -4909,15 +4844,10 @@ My Diamonds My Coins: %s Confirm Exchange - Withdrawal account is not attached - Remaining weekly withdrawal times: - Immediate Withdrawal Select Game Exchange Successful Swift Code/BIC: %s Bank Name: %s - Withdrawal Successful - Bind Withdrawal Information Exchange Diamonds for Diamonds Consume Diamonds %s Diamonds @@ -4928,7 +4858,6 @@ Diamond Transactions Coins Coin Earnings Settleable Diamonds - Please enter the amount of diamonds to withdraw All times No Data diff --git a/core/src/main/java/com/chwl/core/bean/response/ServiceResult.java b/core/src/main/java/com/chwl/core/bean/response/ServiceResult.java index 7ba2e0e58..8ec7051fd 100644 --- a/core/src/main/java/com/chwl/core/bean/response/ServiceResult.java +++ b/core/src/main/java/com/chwl/core/bean/response/ServiceResult.java @@ -183,7 +183,7 @@ public class ServiceResult implements Serializable { errorStr = ResUtil.getString(R.string.bean_response_serviceresult_025); break; case WEEKNOTWITHCASHTOWNUMS: - errorStr = ResUtil.getString(R.string.bean_response_serviceresult_026); + errorStr = ResUtil.getString(R.string.network_abnormality_check_again); break; default: errorStr = message; diff --git a/core/src/main/java/com/chwl/core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/ExchangeInfoResult.java index cc431fd5f..c34b2a53a 100644 --- a/core/src/main/java/com/chwl/core/bean/response/result/ExchangeInfoResult.java +++ b/core/src/main/java/com/chwl/core/bean/response/result/ExchangeInfoResult.java @@ -1,7 +1,6 @@ package com.chwl.core.bean.response.result; import com.chwl.core.bean.response.ServiceResult; -import com.chwl.core.withdraw.bean.ExchangerInfo; /** * Created by Administrator on 2017/7/5 0005. diff --git a/core/src/main/java/com/chwl/core/withdraw/bean/ExchangerInfo.java b/core/src/main/java/com/chwl/core/bean/response/result/ExchangerInfo.java similarity index 81% rename from core/src/main/java/com/chwl/core/withdraw/bean/ExchangerInfo.java rename to core/src/main/java/com/chwl/core/bean/response/result/ExchangerInfo.java index f2a2c00a4..4dd8a5a25 100644 --- a/core/src/main/java/com/chwl/core/withdraw/bean/ExchangerInfo.java +++ b/core/src/main/java/com/chwl/core/bean/response/result/ExchangerInfo.java @@ -1,4 +1,4 @@ -package com.chwl.core.withdraw.bean; +package com.chwl.core.bean.response.result; /** * Created by Administrator on 2017/7/27. diff --git a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawListResult.java deleted file mode 100644 index d5c357926..000000000 --- a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.chwl.core.bean.response.result; - -import com.chwl.core.bean.response.ServiceResult; -import com.chwl.core.withdraw.bean.WithdrwaListInfo; - -import java.util.List; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class WithdrawListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedListResult.java deleted file mode 100644 index 1fa251b5c..000000000 --- a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedListResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.chwl.core.bean.response.result; - - -import com.chwl.core.bean.response.ServiceResult; -import com.chwl.core.redPacket.bean.WithdrawRedListInfo; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class WithdrawRedListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedSucceedResult.java deleted file mode 100644 index 548eed627..000000000 --- a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawRedSucceedResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.chwl.core.bean.response.result; - - -import com.chwl.core.bean.response.ServiceResult; -import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class WithdrawRedSucceedResult extends ServiceResult { -} diff --git a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/chwl/core/bean/response/result/WithdrawUserInfoResult.java deleted file mode 100644 index 5184f55c9..000000000 --- a/core/src/main/java/com/chwl/core/bean/response/result/WithdrawUserInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.chwl.core.bean.response.result; - -import com.chwl.core.bean.response.ServiceResult; -import com.chwl.core.withdraw.bean.WithdrawInfo; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class WithdrawUserInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/chwl/core/bills/BillModel.java b/core/src/main/java/com/chwl/core/bills/BillModel.java index 1145daef5..c58c521ce 100644 --- a/core/src/main/java/com/chwl/core/bills/BillModel.java +++ b/core/src/main/java/com/chwl/core/bills/BillModel.java @@ -88,33 +88,8 @@ public class BillModel extends BaseModel implements IBillModel { .observeOn(AndroidSchedulers.mainThread()); } - @Override - public Single getWithdrawBills(int pageNo, int pageSize, long time) { - return api.getBillRecord( - String.valueOf(AuthModel.get().getCurrentUid()), - String.valueOf(pageNo), - String.valueOf(pageSize), - String.valueOf(time), - String.valueOf(BillType.WITHDRAW_RECORDS)) - .flatMap((Function, Single>) jsonElementServiceResult -> { - String json = new Gson().toJson(jsonElementServiceResult); - IncomedResult incomedResult = new Gson().fromJson(json, IncomedResult.class); - return Single.just(incomedResult); - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - @Override - public Single getWithdrawRedBills(int pageNo, int pageSize, long time) { - return api.getWithdrawRedBills( - String.valueOf(AuthModel.get().getCurrentUid()), - String.valueOf(pageNo), - String.valueOf(pageSize), - String.valueOf(time)) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } + @Override public Single getChatBills(int pageNo, int pageSize, long time) { @@ -193,20 +168,7 @@ public class BillModel extends BaseModel implements IBillModel { @Query("date") String date, @Query("type") String type); - /** - * 账单提现查询(红包提现) - * - * @param uid - * @param pageNo - * @param pageSize - * @param date - * @return - */ - @GET("/packetrecord/deposit") - Single getWithdrawRedBills(@Query("uid") String uid, - @Query("pageNo") String pageNo, - @Query("pageSize") String pageSize, - @Query("date") String date); + /** diff --git a/core/src/main/java/com/chwl/core/bills/IBillModel.java b/core/src/main/java/com/chwl/core/bills/IBillModel.java index 2d9bd1290..9f9b2413e 100644 --- a/core/src/main/java/com/chwl/core/bills/IBillModel.java +++ b/core/src/main/java/com/chwl/core/bills/IBillModel.java @@ -27,18 +27,7 @@ public interface IBillModel extends IModel { */ Single getGiftExpendBills(int pageNo, int pageSize, long time); - /** - * 提现记录 - * @param pageNo - * @param pageSize - * @param time - */ - Single getWithdrawBills(int pageNo, int pageSize, long time); - /** - * 获取账单红包 - */ - Single getWithdrawRedBills(int pageNo, int pageSize, long time); /** * diff --git a/core/src/main/java/com/chwl/core/bills/bean/BillItemEntity.java b/core/src/main/java/com/chwl/core/bills/bean/BillItemEntity.java index 23fb4aa3c..8088473de 100644 --- a/core/src/main/java/com/chwl/core/bills/bean/BillItemEntity.java +++ b/core/src/main/java/com/chwl/core/bills/bean/BillItemEntity.java @@ -22,8 +22,6 @@ public class BillItemEntity implements MultiItemEntity { public IncomeInfo mGiftInComeInfo; /** 密聊实体 */ public IncomeInfo mChatInComeInfo; - /** 提现记录 */ - public IncomeInfo mWithdrawInfo; /** 充值记录信息 */ public ExpendInfo mChargeExpendInfo; /** 礼物支出 */ diff --git a/core/src/main/java/com/chwl/core/bills/bean/BillType.java b/core/src/main/java/com/chwl/core/bills/bean/BillType.java index 50166b4ff..6b8af2815 100644 --- a/core/src/main/java/com/chwl/core/bills/bean/BillType.java +++ b/core/src/main/java/com/chwl/core/bills/bean/BillType.java @@ -25,5 +25,5 @@ public class BillType { /** * 提现记录 */ - public static final int WITHDRAW_RECORDS = 5; + public static final int DRAW_RECORDS = 5; } diff --git a/core/src/main/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt b/core/src/main/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt deleted file mode 100644 index 05608ad84..000000000 --- a/core/src/main/java/com/chwl/core/earn/bean/ConfigWithdrawInfo.kt +++ /dev/null @@ -1,16 +0,0 @@ -package com.chwl.core.earn.bean - -import lombok.Data -import java.io.Serializable -import java.math.BigDecimal - -@Data -data class ConfigWithdrawInfo( - val account: WithdrawAccount? = null, - val golds: BigDecimal,//钱包当前金币数 - val remainTimes: Int,//周剩余次数 - val fee: Double,//手续费 - val minGolds: Long, - val maxGolds: Long, - val hasPayPwd: Boolean -) : Serializable \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/earn/bean/WithdrawAccount.kt b/core/src/main/java/com/chwl/core/earn/bean/WithdrawAccount.kt deleted file mode 100644 index 9b67df94a..000000000 --- a/core/src/main/java/com/chwl/core/earn/bean/WithdrawAccount.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.chwl.core.earn.bean - -import lombok.Data -import java.io.Serializable - -@Data -data class WithdrawAccount( - val uid: Long, - val swift: String, - val bankName: String, - val accountNumber: String, - val accountName: String, - val address: String, - val city: String, - val province: String, - val postCode: String -) : Serializable \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/earn/model/EarnModel.kt b/core/src/main/java/com/chwl/core/earn/model/EarnModel.kt index 969cf77d2..79713a4d2 100644 --- a/core/src/main/java/com/chwl/core/earn/model/EarnModel.kt +++ b/core/src/main/java/com/chwl/core/earn/model/EarnModel.kt @@ -38,40 +38,11 @@ object EarnModel : BaseModel() { api.exchangeConfirm(goldNum, diamondNum, currency) } - suspend fun getConfigWithdrawInfo(): ConfigWithdrawInfo? = - launchRequest { - api.getConfigWithdrawInfo() - } - suspend fun exchange(goldNum: Double, payPwd: String): Any? = - launchRequest { - api.exchange(goldNum, payPwd) - } - suspend fun bound( - uid: Long, - swift: String, - bankName: String, - accountNumber: String, - accountName: String, - address: String, - city: String, - province: String, - postCode: String - ): String? = - launchRequest { - api.bound( - uid, - swift, - bankName, - accountNumber, - accountName, - address, - city, - province, - postCode - ) - } + + + suspend fun getMemberSettlement(startTime: String, endTime: String): ClanHallMemberIncomeTotalInfo? = launchRequest { @@ -113,36 +84,9 @@ object EarnModel : BaseModel() { @Query("currency") currency: Int ): ServiceResult - /** - * @return - */ - @GET("/withdraw/getConfig") - suspend fun getConfigWithdrawInfo(): ServiceResult - /** - * @return - */ - @POST("/withdraw/exchange") - suspend fun exchange( - @Query("goldNum") goldNum: Double, - @Query("payPwd") payPwd: String - ): ServiceResult - /** - * @return - */ - @POST("/withdraw/bound") - suspend fun bound( - @Query("uid") uid: Long, - @Query("swift") swift: String, - @Query("bankName") bankName: String, - @Query("accountNumber") accountNumber: String, - @Query("accountName") accountName: String, - @Query("address") address: String, - @Query("city") city: String, - @Query("province") province: String, - @Query("postCode") postCode: String - ): ServiceResult + /** * @return diff --git a/core/src/main/java/com/chwl/core/gift/event/NotifyEvent.java b/core/src/main/java/com/chwl/core/gift/event/NotifyEvent.java index 470668d2d..793ac8bd9 100644 --- a/core/src/main/java/com/chwl/core/gift/event/NotifyEvent.java +++ b/core/src/main/java/com/chwl/core/gift/event/NotifyEvent.java @@ -26,7 +26,7 @@ public class NotifyEvent { } public @interface Action{ - int ACT_BAI_SHUN_GAME = 1; //准备送礼 + int ACT_BAI_SHUN_GAME = 1; // 遊戲橫幅被點擊 } } diff --git a/core/src/main/java/com/chwl/core/interceptor/ParamsInterceptor.java b/core/src/main/java/com/chwl/core/interceptor/ParamsInterceptor.java index 073b6b4a1..bde78c60a 100644 --- a/core/src/main/java/com/chwl/core/interceptor/ParamsInterceptor.java +++ b/core/src/main/java/com/chwl/core/interceptor/ParamsInterceptor.java @@ -118,13 +118,6 @@ public class ParamsInterceptor implements Interceptor { // paramsMap.putAll(mHttpParams); paramsMap.remove("ticket");//服务器要求移除ticket,后签名 -// if (!(oldRequest.url().encodedPath().contains("/acc/sms") -// || oldRequest.url().encodedPath().contains("/withDraw/phoneCode") -// || oldRequest.url().encodedPath().contains("/withDraw/getSms"))) { -// for (Map.Entry entry : paramsMap.entrySet()) {//还原 urlEncode 参数 -// entry.setValue(URLDecoder.decode(entry.getValue(), "UTF-8")); -// } -// } String signStr = ""; try { // Log.e("ParamsInterceptor", " url: " + oldRequest.url()+ " encrypt params Map : " + paramsMap.toString()); diff --git a/core/src/main/java/com/chwl/core/redPacket/IRedPacketModel.java b/core/src/main/java/com/chwl/core/redPacket/IRedPacketModel.java deleted file mode 100644 index 48f802eee..000000000 --- a/core/src/main/java/com/chwl/core/redPacket/IRedPacketModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.chwl.core.redPacket; - -import com.chwl.core.base.IModel; -import com.chwl.core.redPacket.bean.ActionDialogInfo; -import com.chwl.core.redPacket.bean.RedDrawListInfo; -import com.chwl.core.redPacket.bean.RedPacketInfo; -import com.chwl.core.redPacket.bean.WithdrawRedListInfo; -import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo; - -import java.util.List; - -import io.reactivex.Single; - -/** - * Created by ${Seven} on 2017/9/20. - */ - -public interface IRedPacketModel extends IModel { - //获取红包页面信息 - Single getRedPacketInfo(); - //进入主界面有红包后设置弹窗类型 1，首页 2直播间 - Single> getActionDialog(int type); - //获取红包提现列表 - Single> getRedList(); - //发起红包提现 - Single getRedWithdraw(long uid, int packetId, String pwd); - //获取红包提现列表 - Single> getRedDrawList(); -} diff --git a/core/src/main/java/com/chwl/core/redPacket/RedPacketModel.java b/core/src/main/java/com/chwl/core/redPacket/RedPacketModel.java deleted file mode 100644 index fa035974c..000000000 --- a/core/src/main/java/com/chwl/core/redPacket/RedPacketModel.java +++ /dev/null @@ -1,187 +0,0 @@ -package com.chwl.core.redPacket; - -import com.chwl.core.auth.AuthModel; -import com.chwl.core.base.BaseModel; -import com.chwl.core.bean.response.result.ActionDialogResult; -import com.chwl.core.bean.response.result.RedDrawListInfoResult; -import com.chwl.core.bean.response.result.RedPacketResult; -import com.chwl.core.bean.response.result.WithdrawRedListResult; -import com.chwl.core.bean.response.result.WithdrawRedSucceedResult; -import com.chwl.core.redPacket.bean.ActionDialogInfo; -import com.chwl.core.redPacket.bean.RedDrawListInfo; -import com.chwl.core.redPacket.bean.RedPacketInfo; -import com.chwl.core.redPacket.bean.WithdrawRedListInfo; -import com.chwl.core.redPacket.bean.WithdrawRedSucceedInfo; -import com.chwl.core.redPacket.event.GetRedInfoEvent; -import com.chwl.core.utils.net.RxHelper; -import com.chwl.library.net.rxnet.RxNet; - -import org.greenrobot.eventbus.EventBus; - -import java.util.List; - -import io.reactivex.Single; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Consumer; -import io.reactivex.schedulers.Schedulers; -import retrofit2.http.GET; -import retrofit2.http.POST; -import retrofit2.http.Query; - -/** - * Created by ${Seven} on 2017/9/20. - */ - -public class RedPacketModel extends BaseModel implements IRedPacketModel { - private final Api api = RxNet.create(Api.class); - - private static final class Helper { - public static final RedPacketModel INSTANCE = new RedPacketModel(); - } - - public static RedPacketModel get() { - return RedPacketModel.Helper.INSTANCE; - } - - private RedPacketModel() { - } - - //获取红包页面数据 - @Override - public Single getRedPacketInfo() { - return api.getRedPacket( - String.valueOf(AuthModel.get().getCurrentUid()) - ) - .compose(RxHelper.handleBeanData()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .doOnSuccess(new Consumer() { - @Override - public void accept(RedPacketInfo redPacketInfo) throws Exception { - EventBus.getDefault().post(new GetRedInfoEvent(redPacketInfo)); -// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient -// .METHOD_ON_GET_RED_INFO, response.getData()); - } - }) - .doOnError(new Consumer() { - @Override - public void accept(Throwable throwable) throws Exception { -// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient -// .METHOD_ON_GET_RED_INFO_ERROR, error.getErrorStr()); - EventBus.getDefault().post(new GetRedInfoEvent(throwable.getMessage())); - } - }); - - } - - @Override - public Single> getActionDialog(int type) { - return api.getRedBagDialogType( - String.valueOf(type) - ) - .compose(RxHelper.handleBeanData()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); -// .subscribe(new OldHttpObserver() { -// @Override -// public void onFail(RequestError error) { -// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient -// .METHOD_ON_GET_ACTION_DIALOG_ERROR, error.getErrorStr()); -// } -// -// @Override -// public void onSuccess(ActionDialogResult response) { -// if (null != response) { -// if (response.isSuccess()) { -// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient -// .METHOD_ON_GET_ACTION_DIALOG, response.getData()); -// } else { -// notifyClients(IRedPacketCoreClient.class, IRedPacketCoreClient -// .METHOD_ON_GET_ACTION_DIALOG_ERROR, response.getMessage()); -// } -// } -// } -// }); - - } - - @Override - public Single> getRedList() { - return api.getRedBagList() - .compose(RxHelper.handleBeanData()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - @Override - public Single getRedWithdraw(long uid, int packetId, String pwd) { - - return api.getRedWithdraw( - String.valueOf(uid), - String.valueOf(packetId), - pwd, - AuthModel.get().getTicket() - ) - .compose(RxHelper.handleBeanData()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - - } - - @Override - public Single> getRedDrawList() { - return api.getRedDrawList() - .compose(RxHelper.handleBeanData()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()); - } - - - interface Api{ - /** - * - * @param uid - * @return - */ - @GET("/statpacket/get") - Single getRedPacket(@Query("uid") String uid); - - - /** - * 获取红包弹窗活动类型 - * @param type - * @return - */ - @GET("/activity/query") - Single getRedBagDialogType(@Query("type") String type); - - - /** - * 获取红包提现列表 - * @return - */ - @GET("/redpacket/list") - Single getRedBagList(); - - - /** - * 发起红包提现 - * @param uid - * @param packetId - * @param ticket - * @return - */ - @POST("/redpacket/withdraw") - Single getRedWithdraw(@Query("uid") String uid, - @Query("packetId") String packetId, - @Query("paymentPwd") String paymentPwd, - @Query("ticket") String ticket); - - /** - * 红包提现列表 - * @return - */ - @GET("/redpacket/drawlist") - Single getRedDrawList(); - } -} diff --git a/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedListInfo.java b/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedListInfo.java deleted file mode 100644 index a959b1fce..000000000 --- a/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedListInfo.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.chwl.core.redPacket.bean; - -import java.io.Serializable; - -/** - * Created by ${Seven} on 2017/9/27. - */ - -public class WithdrawRedListInfo implements Serializable { - /* "packetNum":100, - "prodStauts":1, - "seqNo":1 -*/ - private int packetNum; - private int prodStauts; - private int seqNo; - - public boolean isSelected; - - public int getPacketId() { - return packetId; - } - - public void setPacketId(int packetId) { - this.packetId = packetId; - } - - private int packetId; - - public int getPacketNum() { - return packetNum; - } - - public void setPacketNum(int packetNum) { - this.packetNum = packetNum; - } - - public int getProdStauts() { - return prodStauts; - } - - public void setProdStauts(int prodStauts) { - this.prodStauts = prodStauts; - } - - public int getSeqNo() { - return seqNo; - } - - public void setSeqNo(int seqNo) { - this.seqNo = seqNo; - } -} diff --git a/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedSucceedInfo.java b/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedSucceedInfo.java deleted file mode 100644 index e4f4b61fd..000000000 --- a/core/src/main/java/com/chwl/core/redPacket/bean/WithdrawRedSucceedInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.chwl.core.redPacket.bean; - -import java.io.Serializable; - -/** - * Created by ${Seven} on 2017/9/27. - */ - -public class WithdrawRedSucceedInfo implements Serializable { - private long uid; - private double packetNum; - - public long getUid() { - return uid; - } - - public void setUid(long uid) { - this.uid = uid; - } - - public double getPacketNum() { - return packetNum; - } - - public void setPacketNum(int packetNum) { - this.packetNum = packetNum; - } -} diff --git a/core/src/main/java/com/chwl/core/withdraw/bean/WithdrawInfo.java b/core/src/main/java/com/chwl/core/withdraw/bean/WithdrawInfo.java deleted file mode 100644 index 4c834ec0c..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/bean/WithdrawInfo.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.chwl.core.withdraw.bean; - -import java.io.Serializable; - -import lombok.Data; - -/** - * Created by Administrator on 2017/7/25. - */ -@Data -public class WithdrawInfo implements Serializable{ - - /** - * 提现到阿里 - */ - public final static int ACCOUNT_TYPE_ALIPAY = 1; - /** - * 提现到银行卡 - */ - public final static int ACCOUNT_TYPE_BANK_CARD = 3; - - /* - uid:90000 - zxcAccount:xxx //支付宝账号 - zxcAccountName:xxx //支付宝姓名 - diamondNum:钻石余额 - isNotBoundPhone:true//没有绑定手机，绑定了手机不返回该字段 - */ - public long uid; - public String zxcAccount; - public double diamondNum; - public String zxcAccountName; - public Boolean isNotBoundPhone; - - private boolean isBindAlipay; - - private boolean isBindBankCard; - - private String bankCardNum; - - private String bankCardName; - - private int bankCardMinAmount; - /** - * 默认提现账号类型，1-支付宝，3-银行卡 - */ - private int defaultWithdrawAccountType; - /** - * 是否展示账号类型切换按钮 - */ - private boolean switchButtonShow; - /** - * 提现费率 - */ - private double withdrawRate; - -} diff --git a/core/src/main/java/com/chwl/core/withdraw/bean/WithdrwaListInfo.java b/core/src/main/java/com/chwl/core/withdraw/bean/WithdrwaListInfo.java deleted file mode 100644 index 0cad9ebb1..000000000 --- a/core/src/main/java/com/chwl/core/withdraw/bean/WithdrwaListInfo.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.chwl.core.withdraw.bean; - -import java.io.Serializable; - -import lombok.Data; - -/** - * 钻石实体 - * Created by Administrator on 2017/7/24. - */ -@Data -public class WithdrwaListInfo implements Serializable{ - /* - cashProdId：1 //id - cashProdName: 10000钻=￥100 //列表名称 - diamondNum:10000 //钻石数量 - cashNum:100 //对应金额 - seqNo:1 //排序 - */ - public int cashProdId; - public String cashProdName; - - public double diamondNum; - public int cashNum; - - public boolean isSelected; - /** - * 实际到账 - */ - private double actualArrival; - /** - * 提现手续费 - */ - private double withdrawalFee; - -} diff --git a/core/src/main/res/values-ar/strings.xml b/core/src/main/res/values-ar/strings.xml index 9830ddd55..9816c8619 100644 --- a/core/src/main/res/values-ar/strings.xml +++ b/core/src/main/res/values-ar/strings.xml @@ -252,7 +252,6 @@ الطلب غير موجود خطأ في إرسال الرسالة النصية صيغة رقم الهاتف غير صحيحة - يمكن سحبه فقط مرتين في الأسبوع الحب مُزعج جداً، سأُزعجك في المستقبل أتيت من أجلك، بغض النظر عن تجاوز الجبال @@ -583,7 +582,6 @@ السبت الأحد الأسئلة المتكررة - تم ربطه بنجاح بنك الصين الأوسط بطاقة التوفير فشل التنزيل diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 9995c5eb2..58b3bc6a7 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -246,7 +246,6 @@ 訂單不存在 發送短信出錯 手機格式不正確 - 每周只能提現2次 談戀愛太麻煩了，以後就麻煩你了 我是為你而來，不在乎穿越綿綿山脈 我想你了，是那種要見一面緊緊抱住的那種 @@ -451,12 +450,6 @@ 成功 PK還沒準備好 沒有創建PK - 呆萌小熊貓 - 周冬雨的凝視 - 豆子一號 - 納尼 - 清涼小西瓜 - 🐬□詩涵 設置不提醒用戶出錯，code= 分享成功 分享失敗，請重試 @@ -573,7 +566,6 @@ 周六 周日 常見問題 - 綁定成功 中國光大銀行 儲蓄卡 下載失敗 diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index d7d6125b3..fc11a0422 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -246,7 +246,6 @@ Order does not exist Error sending SMS Incorrect phone number format - Can only withdraw twice a week Love is too troublesome, I&ll trouble you in the future I came for you, regardless of crossing the mountains I miss you, the kind that wants to meet and hug tightly @@ -567,7 +566,6 @@ Saturday Sunday Frequently Asked Questions - Binding successful China Everbright Bank Savings card Download failed diff --git a/core/src/model_smscode/java/com/chwl/core/code/CodeType.java b/core/src/model_smscode/java/com/chwl/core/code/CodeType.java index b0784de83..33a6beb1a 100644 --- a/core/src/model_smscode/java/com/chwl/core/code/CodeType.java +++ b/core/src/model_smscode/java/com/chwl/core/code/CodeType.java @@ -17,7 +17,6 @@ public interface CodeType { int RESET_PAY_PSW = 6; int UNBIND_PHONE = 7; int SUPER_ADMIN = 10; - int BIND_WITHDRAW_BANK_CARD = 11; int RESET_PSW_NOT_LOGIN = 13; int RESET_PSW_LOGIN = 14; } diff --git a/mode.json b/mode.json index f07e08d61..e69de29bb 100644 --- a/mode.json +++ b/mode.json @@ -1,210 +0,0 @@ -[ - { - "authDesc": "彰顯尊貴", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_nameplate.png", - "authIntro": "專屬貴族銘牌，公屏發言凸顯你的貴族身份！", - "authName": "專屬銘牌", - "authType": 1, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/zhuanshumingpai.png", - "id": 1, - "seq": 1, - "status": 1, - "updateTime": "1724739442000" - }, - { - "authDesc": "專屬頭飾", - "authIcon": "https://img.molistar.xyz/46d52b08-ddad-4006-98d8-1f1bdea78993", - "authIntro": "專屬貴族頭飾，讓你登場即成為焦點！", - "authName": "貴族頭飾", - "authType": 2, - "createTime": "1640687536000", - "descPic": "https://img.molistar.xyz/10bf3f4c-303d-4ad1-9252-1245328ca319", - "id": 19, - "seq": 2, - "status": 1, - "updateTime": "1648797952000" - }, - { - "authDesc": "送給特別的Ta", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_gift.png", - "authIntro": "專屬貴族禮物，送給特別的Ta！", - "authName": "貴族禮物", - "authType": 4, - "createTime": "1640687536000", - "descPic": "https://img.molistar.xyz/a5f3707f-b437-49ad-bc45-946cad0069f3", - "id": 3, - "seq": 4, - "status": 1, - "updateTime": "1724740148000" - }, - { - "authDesc": "專屬用戶卡片", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_info_card.png", - "authIntro": "專屬貴族房間資料卡片，盡展貴族身份！", - "authName": "貴族卡片", - "authType": 5, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/guizhukapian.png", - "id": 2, - "seq": 5, - "status": 1, - "updateTime": "1724740005000" - }, - { - "authDesc": "額外經驗", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_medal_upgrade_speed.png", - "authIntro": "額外財富值經驗加成，讓你快速升級！", - "authName": "升級加速", - "authType": 6, - "createTime": "1640687536000", - "descPic": "https://img.molistar.xyz/63d8b5fe-d6e4-4c03-b1b0-da521459a767", - "id": 4, - "seq": 6, - "status": 1, - "updateTime": "1648801213000" - }, - { - "authDesc": "個性光圈裝扮", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_mic_circle.png", - "authIntro": "專屬麥位光圈，彰顯貴族身份。", - "authName": "麥位光圈", - "authType": 8, - "createTime": "1640687536000", - "descPic": "https://img.molistar.xyz/cbdb4565-e2b1-4a7e-ad02-409af2aef119", - "id": 6, - "seq": 7, - "status": 1, - "updateTime": "1724740254000" - }, - { - "authDesc": "成為人群焦點", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_mic_color.png", - "authIntro": "專屬麥位昵稱顏色，讓你成為人群的焦點！", - "authName": "麥位昵稱顏色", - "authType": 9, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/maiweinichengyanse.png", - "id": 7, - "seq": 8, - "status": 1, - "updateTime": "1724740298000" - }, - { - "authDesc": "昵稱優先展示", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_friend_nick_color.png", - "authIntro": "專屬好友列表紅名，展示不同！", - "authName": "好友紅名", - "authType": 10, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/haoyouhongming.png", - "id": 8, - "seq": 9, - "status": 1, - "updateTime": "1713516463000" - }, - { - "authDesc": "發言全場矚目", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_chat_bubble.png", - "authIntro": "專屬聊天公屏發言氣泡，讓你的發言脫穎而出！", - "authName": "聊天氣泡", - "authType": 11, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/liaotianqipao.png", - "id": 9, - "seq": 10, - "status": 1, - "updateTime": "1724740331000" - }, - { - "authDesc": "專屬進房特效", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_entre_effects.png", - "authIntro": "進房獨特炫酷特效，彰顯貴族身份！", - "authName": "進場特效", - "authType": 12, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/jinchangtexiao.png", - "id": 11, - "seq": 11, - "status": 1, - "updateTime": "1724740353000" - }, - { - "authDesc": "神秘隱身進房", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_invistable.png", - "authIntro": "低調進房玩耍，可選擇開啟進房隱身~", - "authName": "隱身進房", - "authType": 13, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/yinshenjinfang.png", - "id": 12, - "seq": 12, - "status": 1, - "updateTime": "1713516507000" - }, - { - "authDesc": "防被踢", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_prevent_kick.png", - "authIntro": "房間超管/房管無權將你踢出，尊貴身份不可撼動！", - "authName": "防被踢", - "authType": 15, - "createTime": "1640687536000", - "descPic": "https://image.lecheng163.com/FmtVhEPDWEHEfiQ26DXIDoVjWY5y?imageslim", - "id": 14, - "seq": 14, - "status": 1, - "updateTime": "1652689701000" - }, - { - "authDesc": "彰顯尊貴", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_medal.png", - "authIntro": "專屬貴族勋章，凸顯你的貴族身份！", - "authName": "VIP勋章", - "authType": 16, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/zhuanshumingpai.png", - "id": 15, - "seq": 15, - "status": 1, - "updateTime": "1713876773000" - }, - { - "authDesc": "彰顯尊貴", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_prevent_trace.png", - "authIntro": "專屬貴族勋章，凸顯你的貴族身份！", - "authName": "防跟踪", - "authType": 17, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/zhuanshumingpai.png", - "id": 16, - "seq": 16, - "status": 1, - "updateTime": "1713876773000" - }, - { - "authDesc": "彰顯尊貴", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_prevent_follow.png", - "authIntro": "專屬貴族勋章，凸顯你的貴族身份！", - "authName": "不被关注\n", - "authType": 18, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/zhuanshumingpai.png", - "id": 17, - "seq": 17, - "status": 1, - "updateTime": "1713876773000" - }, - { - "authDesc": "彰顯尊貴", - "authIcon": "https://image.molistar.xyz/vip_auth_icon_gift_avatar.png", - "authIntro": "專屬貴族勋章，凸顯你的貴族身份！", - "authName": "动态头像\n", - "authType": 19, - "createTime": "1640687536000", - "descPic": "https://image.pekolive.com/zhuanshumingpai.png", - "id": 18, - "seq": 18, - "status": 1, - "updateTime": "1713876773000" - } -] \ No newline at end of file