diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a4fc6cf66..2ab7c565d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -286,10 +286,6 @@ android:name=".home.activity.CollectionRoomActivity" android:label="@string/main_androidmanifest_019" android:screenOrientation="portrait" /> - @@ -299,9 +295,6 @@ - @@ -317,18 +310,6 @@ - - - - @@ -342,21 +323,6 @@ - - - - - - - - - - - - - - - - - @@ -661,15 +575,6 @@ android:name="com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity" android:screenOrientation="portrait" android:theme="@style/room_message_activity" /> - - - @@ -760,10 +665,6 @@ - // 跳转 if (!StringUtil.isEmpty(linkedInfo.getRoomUid()) && linkedInfo.getType().equals("2")) { AVRoomActivity.start(context, Long.parseLong(linkedInfo.getRoomUid())); - } else if (!StringUtil.isEmpty(linkedInfo.getFamilyId()) && linkedInfo.getType().equals("4")) { - FamilyHomeActivity.start(context, linkedInfo.getFamilyId()); } else if (!TextUtils.isEmpty(linkedInfo.getUrl()) && linkedInfo.getType().equals("3")) { CommonWebViewActivity.start(context, UriProvider.getLinkUrl(linkedInfo.getUrl())); } else if (!TextUtils.isEmpty(linkedInfo.getWorldId()) && linkedInfo.getType().equals("5")) { diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index e63bc16ef..9e804b3e6 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -49,7 +49,6 @@ import com.yizhuan.erban.common.app.ActivityStack; import com.yizhuan.erban.common.util.AppLifeCycleHelper; import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.other.activity.SplashActivity; -import com.yizhuan.erban.radish.wallet.RadishWalletManager; import com.yizhuan.erban.utils.PushMessageHandler; import com.yizhuan.xchat_android_constants.XChatConstants; import com.yizhuan.xchat_android_core.Constants; @@ -98,7 +97,6 @@ import org.greenrobot.eventbus.EventBus; import java.io.File; import java.io.IOException; import java.util.HashMap; -import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -443,8 +441,6 @@ public class XChatApplication extends BaseApp { DynamicFaceModel.get().init(); PayModel.get(); UserModel.get(); - //ui层的萝卜钱包 - RadishWalletManager.get(); //model层的 RadishModel.get(); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java index 06df19551..f0bbeda1f 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomCharmListFragment.java @@ -3,6 +3,7 @@ package com.yizhuan.erban.avroom.fragment; import androidx.fragment.app.Fragment; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; import com.yizhuan.erban.avroom.widget.RankNavigatorAdapter; import com.yizhuan.erban.base.BaseBindingFragment; @@ -26,7 +27,7 @@ public class RoomCharmListFragment extends BaseBindingFragment fragments = new ArrayList<>(2); fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_DAY_RANKING)); fragments.add(RoomCharmRankingListFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_WEEK_RANKING)); - mBinding.vpCharmRankings.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragments)); + mBinding.vpCharmRankings.setAdapter(new CommonVPAdapter(getChildFragmentManager(), getLifecycle(), fragments)); CommonNavigator commonNavigator = new CommonNavigator(getActivity()); commonNavigator.setAdjustMode(false); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java index 43d9d9307..0b6d7d196 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomContributeListFragment.java @@ -2,8 +2,10 @@ package com.yizhuan.erban.avroom.fragment; import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; +import androidx.viewpager2.widget.ViewPager2; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; import com.yizhuan.erban.avroom.widget.RankNavigatorAdapter; import com.yizhuan.erban.base.BaseMvpFragment; @@ -21,7 +23,7 @@ import java.util.ArrayList; */ public class RoomContributeListFragment extends BaseMvpFragment implements IMvpBaseView { - private ViewPager viewPager; + private ViewPager2 viewPager; private MagicIndicator viewIndicator; @Override @@ -43,7 +45,7 @@ public class RoomContributeListFragment extends BaseMvpFragment implements IMvpB if (AvRoomDataManager.get().isDatingMode()) { fragments.add(RoomContributeFragment.newInstance(RoomContributeDataInfo.TYPE_ROOM_MONTH_RANKING)); } - viewPager.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), fragments)); + viewPager.setAdapter(new CommonVPAdapter(getChildFragmentManager(), getLifecycle(), fragments)); CommonNavigator commonNavigator = new CommonNavigator(getActivity()); commonNavigator.setAdjustMode(false); RankNavigatorAdapter indicator = new RankNavigatorAdapter(AvRoomDataManager.get().isDatingMode()); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java index 7a980f278..820ea300b 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankDialogFragment.java @@ -16,6 +16,7 @@ import androidx.fragment.app.Fragment; import androidx.viewpager.widget.ViewPager; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.avroom.adapter.RoomRankFragmentPageAdapter; import java.util.ArrayList; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java index 084a8ef04..b0885ece7 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/RoomRankListFragment.java @@ -5,6 +5,7 @@ import android.view.View; import androidx.fragment.app.Fragment; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; import com.yizhuan.erban.avroom.widget.RoomRankNavigatorAdapter; import com.yizhuan.erban.base.BaseBindingFragment; @@ -29,7 +30,7 @@ public class RoomRankListFragment extends BaseBindingFragment list = new ArrayList<>(2); list.add(new RoomContributeListFragment()); list.add(RoomCharmListFragment.newInstance()); - mBinding.viewPager.setAdapter(new RoomContributeListAdapter(getChildFragmentManager(), list)); + mBinding.viewPager.setAdapter(new CommonVPAdapter(getChildFragmentManager(), getLifecycle(), list)); CommonNavigator commonNavigator = new CommonNavigator(getActivity()); commonNavigator.setAdjustMode(true); diff --git a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java index 3b426a586..35b494dda 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/recommendcard/MyRecommendCardActivity.java @@ -9,6 +9,7 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; import com.yizhuan.erban.R; +import com.yizhuan.erban.avroom.adapter.CommonVPAdapter; import com.yizhuan.erban.base.BaseViewBindingActivity; import com.yizhuan.erban.base.TitleBar; import com.yizhuan.erban.databinding.ActivityMyRecommendCardBinding; @@ -49,7 +50,7 @@ public class MyRecommendCardActivity extends BaseViewBindingActivity 账单base activity

- * - * @author Administrator - * @date 2017/11/6 - */ -public abstract class BillBaseActivity extends BaseBindingActivity - implements OnDateSetListener, View.OnClickListener { - protected BillBaseActivity mActivity; - private TextView mTvDate; - private ImageView mIvSelectorDate; - protected RecyclerView mRecyclerView; - private ImageView mIvTodaySelect; - protected SwipeRefreshLayout mRefreshLayout; - protected BillBaseAdapter adapter; - - protected int mCurrentCounter = Constants.PAGE_START; - protected static final int PAGE_SIZE = Constants.BILL_PAGE_SIZE; - protected TimePickerDialog.Builder mDialogYearMonthDayBuild; - protected long time = System.currentTimeMillis(); - protected List mBillItemEntityList = new ArrayList<>(); - - protected int getLayout() { - return R.layout.activity_bills; - } - - @Override - protected void init() { - mActivity = this; - initView(); - initData(); - setListener(); - } - - protected void initView() { - mRecyclerView = (RecyclerView) findViewById(R.id.recyclerView); - mRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh); - mTvDate = (TextView) findViewById(R.id.tv_date); - mIvTodaySelect = (ImageView) findViewById(R.id.iv_today_select); - mIvSelectorDate = (ImageView) findViewById(R.id.tv_selector_date); - -// mRecyclerView = mBinding.recyclerView; -// mRefreshLayout = mBinding.swipeRefresh; -// mTvDate = mBinding.tvDate; -// mIvTodaySelect = mBinding.ivTodaySelect; -// mIvSelectorDate = mBinding.tvSelectorDate; - } - - protected void initData() { - setDate(System.currentTimeMillis()); - mDialogYearMonthDayBuild = new TimePickerDialog.Builder() - .setType(Type.YEAR_MONTH_DAY) - .setTitleStringId(ResUtil.getString(R.string.bills_activities_billbaseactivity_01)) - .setThemeColor(getResources().getColor(R.color.line_background)) - .setWheelItemTextNormalColor(getResources().getColor(R.color - .timetimepicker_default_text_color)) - .setWheelItemTextSelectorColor(getResources().getColor(R.color.black)) - .setCallBack(mActivity); - } - - protected void setDate(long time) { - mTvDate.setText(TimeUtils.getDateTimeString(time, "yyyy-MM-dd")); - } - - protected abstract void loadData(); - - protected void setListener() { - mIvTodaySelect.setOnClickListener(this); - mIvSelectorDate.setOnClickListener(this); - mRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - mCurrentCounter = Constants.PAGE_START; -// time = System.currentTimeMillis(); - loadData(); - } - }); - } - - @Override - public void showNetworkErr() { - mRefreshLayout.setRefreshing(false); - super.showNetworkErr(); - } - - public void onGetDataError(String error) { - if (mCurrentCounter == Constants.PAGE_START) { - showNetworkErr(); - } else { - adapter.loadMoreFail(); - } - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_today_select: - mCurrentCounter = Constants.PAGE_START; - time = System.currentTimeMillis(); - setDate(time); - showLoading(); - loadData(); - break; - case R.id.tv_selector_date: - mDialogYearMonthDayBuild.build().show(getSupportFragmentManager(), "year_month_day"); - break; - default: - } - } - - @Override - public void onDateSet(TimePickerDialog timePickerView, long millseconds) { - this.time = millseconds; - setDate(millseconds); - mCurrentCounter = Constants.PAGE_START; - showLoading(); - loadData(); - } - - @Override - public void showNoData(CharSequence charSequence) { - this.showNoData(R.drawable.icon_common_failure, charSequence); - } - - @SuppressLint("ResourceType") - @Override - public void showNoData(int drawable, CharSequence charSequence) { - if (!checkActivityValid()) { - return; - } - - View status = 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()); - getSupportFragmentManager().beginTransaction().replace(status.getId(), fragment, STATUS_TAG).commitAllowingStateLoss(); - } - - @Override - public View.OnClickListener getLoadListener() { - return v -> { - mCurrentCounter = Constants.PAGE_START; - showLoading(); - loadData(); - }; - } - - @Override - protected void onDestroy() { - super.onDestroy(); - if (mDialogYearMonthDayBuild != null) { - mDialogYearMonthDayBuild.setCallBack(null); - mDialogYearMonthDayBuild = null; - } - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java deleted file mode 100644 index bef96823a..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftExpendActivity.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import android.annotation.SuppressLint; -import android.text.TextUtils; -import android.view.View; -import android.widget.TextView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.GiftExpendAdapter; -import com.yizhuan.erban.databinding.ActivityBillsGiftBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *

账单礼物支出界面

- * - * @author Administrator - * @date 2017/11/6 - */ -@ActLayoutRes(R.layout.activity_bills_gift) -public class BillGiftExpendActivity extends BillBaseActivity { -// private GiftExpendAdapter adapter; - private TextView mGoldNum; - - @Override - protected void initView() { - super.initView(); - mGoldNum = (TextView) findViewById(R.id.tv_gold_num); - } - - @Override - protected void initData() { - super.initData(); - initTitleBar(getString(R.string.bill_gift_expend)); - - adapter = new GiftExpendAdapter(mBillItemEntityList); - adapter.setOnLoadMoreListener(() -> { - mCurrentCounter++; - loadData(); - }, mRecyclerView); - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mActivity); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(adapter); - showLoading(); - onLoadGoldNum(); - loadData(); - } - - private void onLoadGoldNum() { - WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo(); - if (null != walletInfo) { - mGoldNum.setText(getString(R.string.bill_gift_gold_num, walletInfo.getDiamondNum())); - } - } - - @SuppressLint("CheckResult") - @Override - protected void loadData() { - BillModel.get() - .getGiftExpendBills(mCurrentCounter, PAGE_SIZE, time) - .compose(bindToLifecycle()) - .subscribe((expendResult, throwable) -> { - if (throwable != null) { - BillGiftExpendActivity.this.onGetDataError(throwable.getMessage()); - } else if (expendResult != null && expendResult.isSuccess()) { - BillGiftExpendActivity.this.onGetExpendBills(expendResult.getData()); - } else if (expendResult != null) { - BillGiftExpendActivity.this.onGetDataError(expendResult.getError()); - } - }); - } - - public void onGetExpendBills(ExpendListInfo data) { - mRefreshLayout.setRefreshing(false); - if (null != data) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - adapter.setNewData(mBillItemEntityList); - } else { - adapter.loadMoreComplete(); - } - List>> billList = data.getBillList(); - if (!billList.isEmpty()) { - List billItemEntities = new ArrayList<>(); - int size = mBillItemEntityList.size(); - BillItemEntity billItemEntity; - for (int i = 0; i < billList.size(); i++) { - Map> map = billList.get(i); - for (String key : map.keySet()) { - // key ---日期 value：list集合记录 - List expendInfos = map.get(key); - if (ListUtils.isListEmpty(expendInfos)) 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 (ExpendInfo temp : expendInfos) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - //目的是为了比较 - billItemEntity.time = key; - billItemEntity.mGiftExpendInfo = temp; - billItemEntities.add(billItemEntity); - } - } - } - if (billItemEntities.size() < Constants.BILL_PAGE_SIZE && mCurrentCounter == Constants.PAGE_START) { - adapter.setEnableLoadMore(false); - } - - adapter.addData(billItemEntities); - } else { - if (mCurrentCounter == Constants.PAGE_START) { - showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.bills_activities_billgiftexpendactivity_01)); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - -// public void onGetExpendBillsError(String error) { -// if (mCurrentCounter == Constants.PAGE_START) { -// showNetworkErr(); -// } else { -// adapter.loadMoreFail(); -// } -// } - - @Override - public void initTitleBar(String title) { - mTitleBar = (TitleBar) findViewById(R.id.title_bar); - if (mTitleBar != null) { - mTitleBar.setTitle(title); - mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.back_font)); - mTitleBar.setLeftImageResource(R.drawable.arrow_left); - mTitleBar.setLeftClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary)); - mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_billgiftexpendactivity_02)) { - @Override - public void performAction(View view) { - if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - ChargeActivity.start(mActivity); - }else { - CommonWebViewActivity.start( - mActivity, UriProvider.getOfficialPay( - 4, - DeviceUtil.getDeviceId(mActivity) - ) - ); - } - } - }); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java deleted file mode 100644 index 8f9ec677c..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftInComeActivity.java +++ /dev/null @@ -1,218 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import android.annotation.SuppressLint; -import android.content.Intent; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.GiftIncomeAdapter; -import com.yizhuan.erban.databinding.ActivityBillsGiftBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *

账单礼物收入界面

- * - * @author Administrator - * @date 2017/11/7 - */ -@ActLayoutRes(R.layout.activity_bills_gift) -public class BillGiftInComeActivity extends BillBaseActivity { -// private GiftIncomeAdapter adapter; - private TextView mGoldNum; - private ImageView iv_goto_top; - - @Override - protected void init() { - super.init(); - initTitleBar(getString(R.string.bill_gift_income)); - } - - @Override - protected void initView() { - super.initView(); - mGoldNum = (TextView) findViewById(R.id.tv_gold_num); - iv_goto_top = findViewById(R.id.iv_goto_top); - iv_goto_top.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - mRecyclerView.smoothScrollToPosition(0); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - @Override - protected void initData() { - super.initData(); - adapter = new GiftIncomeAdapter(mBillItemEntityList); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - mCurrentCounter++; - loadData(); - } - }, mRecyclerView); - - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mActivity); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(adapter); - - firstLoadDate(); - } - - private void firstLoadDate() { - mCurrentCounter = Constants.PAGE_START; - showLoading(); - onLoadGoldNum(); - loadData(); - } - - @SuppressLint("CheckResult") - @Override - protected void loadData() { - BillModel.get() - .getGiftIncomeBills(mCurrentCounter, PAGE_SIZE, time) - .compose(bindToLifecycle()) - .subscribe((incomedResult, throwable) -> { - if (throwable != null) { - onGetDataError(throwable.getMessage()); - } else if (incomedResult != null && incomedResult.isSuccess()) { - onGetIncomeBills(incomedResult.getData()); - } else if (incomedResult != null) { - onGetDataError(incomedResult.getError()); - } - }); - } - - private void onLoadGoldNum() { - WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo(); - if (null != walletInfo) { - mGoldNum.setText(getString(R.string.bill_gift_gold_num, walletInfo.getDiamondNum())); - } - } - - public void onGetIncomeBills(IncomeListInfo data) { - mRefreshLayout.setRefreshing(false); - if (null != data) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - adapter.setNewData(mBillItemEntityList); - } else { - adapter.loadMoreComplete(); - } - List>> billList = data.getBillList(); - if (!billList.isEmpty()) { - int size = mBillItemEntityList.size(); - List billItemEntities = new ArrayList<>(); - BillItemEntity billItemEntity; - 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.mGiftInComeInfo = 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 == Constants.PAGE_START) { - showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.bills_activities_billgiftincomeactivity_01)); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - - @Override - public void initTitleBar(String title) { - TitleBar mTitleBar = (TitleBar) findViewById(R.id.title_bar); - if (mTitleBar != null) { - mTitleBar.setTitle(title); - mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.back_font)); - mTitleBar.setLeftImageResource(R.drawable.arrow_left); - mTitleBar.setLeftClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary)); - mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_billgiftincomeactivity_02)) { - @Override - public void performAction(View view) { - if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - ChargeActivity.start(mActivity); - }else { - CommonWebViewActivity.start( - mActivity, UriProvider.getOfficialPay( - 4, - DeviceUtil.getDeviceId(mActivity) - ) - ); - } - } - }); - } - - @Override - public void onReloadDate() { - super.onReloadDate(); - firstLoadDate(); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java deleted file mode 100644 index ba1dde6c1..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillGiftIncomeGroupActivity.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import static com.yizhuan.erban.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_EXPAND; -import static com.yizhuan.erban.bills.fragmemt.RadishGiftFragment.TYPE_RADISH_INCOME; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.fragmemt.GiftIncomeFragment; -import com.yizhuan.erban.bills.fragmemt.GiftOutputFragment; -import com.yizhuan.erban.bills.fragmemt.RadishGiftFragment; -import com.yizhuan.erban.bills.presenter.BillGiftIncomeGroupPresenter; -import com.yizhuan.erban.bills.view.IBillGiftIncomeGroupView; -import com.yizhuan.erban.bills.view.ISmoothToTopView; -import com.yizhuan.erban.bills.widget.BillGiftIncomeGroupNavigatorAdapter; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; - -@CreatePresenter(BillGiftIncomeGroupPresenter.class) -public class BillGiftIncomeGroupActivity extends BaseMvpActivity - implements IBillGiftIncomeGroupView, CommonNavigator.NavigatorSelectedListener { - - public static final byte TYPE_BILL_INCOME = 1; - public static final byte TYPE_BILL_OUTPUT = 2; - private static final String FLAG_TYPE_BILL = "type_bill"; - private byte mType = TYPE_BILL_INCOME; - - private TextView mGoldNum; - private ImageView iv_goto_top; - private ViewPager mViewPager; - - public static void startActivity(Context context, byte type) { - Intent intent = new Intent(context, BillGiftIncomeGroupActivity.class); - intent.putExtra(FLAG_TYPE_BILL, type); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - StatusBarLightModes(true); - setContentView(R.layout.activity_bill_gift_income_group); - - mType = getIntent().getByteExtra(FLAG_TYPE_BILL, TYPE_BILL_INCOME); - - initTitleBar(mType == TYPE_BILL_INCOME ? ResUtil.getString(R.string.bills_activities_billgiftincomegroupactivity_01) : ResUtil.getString(R.string.bills_activities_billgiftincomegroupactivity_02)); - - mGoldNum = findViewById(R.id.tv_gold_num); - iv_goto_top = findViewById(R.id.iv_goto_top); - iv_goto_top.setOnClickListener(v -> smoothToTop()); - - mViewPager = findViewById(R.id.vp_bill_gift_income_group); - MagicIndicator viewIndicator = findViewById(R.id.mi_bill); - - ArrayList fragments = new ArrayList<>(2); - - if (mType == TYPE_BILL_INCOME) { - fragments.add(GiftIncomeFragment.newInstance()); - fragments.add(RadishGiftFragment.newInstance(TYPE_RADISH_INCOME)); - } else { - fragments.add(GiftOutputFragment.newInstance()); - fragments.add(RadishGiftFragment.newInstance(TYPE_RADISH_EXPAND)); - } - mViewPager.setAdapter(new RoomContributeListAdapter(getSupportFragmentManager(), fragments)); - - CommonNavigator commonNavigator = new CommonNavigator(this); - commonNavigator.setAdjustMode(true); - commonNavigator.setmNavigatorSelectedListener(this); - - BillGiftIncomeGroupNavigatorAdapter indicator = new BillGiftIncomeGroupNavigatorAdapter(); - indicator.setOnItemSelectListener(position -> mViewPager.setCurrentItem(position)); - commonNavigator.setAdapter(indicator); - viewIndicator.setNavigator(commonNavigator); - ViewPagerHelper.bind(viewIndicator, mViewPager); - } - - private void smoothToTop() { - try { - - if (mViewPager != null) { - int position = mViewPager.getCurrentItem(); - RoomContributeListAdapter roomConsumeListAdapter = (RoomContributeListAdapter) mViewPager.getAdapter(); - - if (roomConsumeListAdapter != null) { - ISmoothToTopView iSmoothToTopView = (ISmoothToTopView) roomConsumeListAdapter.getItem(position); - - if (iSmoothToTopView != null) - iSmoothToTopView.smoothScrollToTop(); - } - } - - } catch (Exception e) { - e.printStackTrace(); - } - } - - private void showRightOption(boolean show) { - if (mTitleBar.getActionCount() > 0) - mTitleBar.removeActionAt(0); - - if (show) { - mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_billgiftincomegroupactivity_03)) { - @Override - public void performAction(View view) { - if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - startActivity(new Intent(BillGiftIncomeGroupActivity.this, ChargeActivity.class)); - }else { - CommonWebViewActivity.start( - context, UriProvider.getOfficialPay( - 4, - DeviceUtil.getDeviceId(context) - ) - ); - } - } - }); - } - - } - - @Override - public void navigatorSelected(int position) { - showRightOption(position == 0); // 钻石礼物显示充值按钮 - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/BillNobleActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/BillNobleActivity.java deleted file mode 100644 index 2f17ab9fb..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/BillNobleActivity.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.NobleBillAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - *

贵族开通记录

- * - * @author jiahui - * @date 2018/1/10 - */ -@ActLayoutRes(R.layout.activity_bills) -public class BillNobleActivity extends BillBaseActivity { - private NobleBillAdapter mNobleBillAdapter; - - private ImageView iv_goto_top; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - initTitleBar(getString(R.string.bill_noble_open)); - } - - @Override - protected void initView() { - super.initView(); - iv_goto_top = findViewById(R.id.iv_goto_top); - iv_goto_top.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - mRecyclerView.smoothScrollToPosition(0); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - @Override - protected void initData() { - super.initData(); - mNobleBillAdapter = new NobleBillAdapter(mBillItemEntityList); - mNobleBillAdapter.setOnLoadMoreListener(() -> { - mCurrentCounter++; - loadData(); - }, mRecyclerView); - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mActivity); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(mNobleBillAdapter); - showLoading(); - loadData(); - } - - @SuppressLint("CheckResult") - @Override - protected void loadData() { - BillModel.get() - .loadNobleBillRecords(time, mCurrentCounter) - .compose(bindToLifecycle()) - .subscribe((nobleBillListInfo, throwable) -> { - if (throwable != null) { - onGetDataError(throwable.getMessage()); - } else { - onLoadNobleRecordSuccess(nobleBillListInfo); - } - }); - - } - -// public void onLoadNobleRecordFail() { -// if (mCurrentCounter == Constants.PAGE_START) { -// showNetworkErr(); -// } else { -// mNobleBillAdapter.loadMoreFail(); -// } -// } - - public void onLoadNobleRecordSuccess(NobleBillListInfo nobleBillListInfo) { - mRefreshLayout.setRefreshing(false); - if (null != nobleBillListInfo) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - mNobleBillAdapter.setNewData(mBillItemEntityList); - } else { - mNobleBillAdapter.loadMoreComplete(); - } - - List>> billList = nobleBillListInfo.billList; - if (!billList.isEmpty()) { - int size = mBillItemEntityList.size(); - List billItemEntities = new ArrayList<>(); - BillItemEntity billItemEntity; - for (int i = 0; i < billList.size(); i++) { - Map> map = billList.get(i); - for (String key : map.keySet()) { - // key ---日期 value：list集合记录 - List nobleBillInfoList = map.get(key); - if (ListUtils.isListEmpty(nobleBillInfoList)) continue; - //标题 - if (size > 0) { - BillItemEntity lastBillItem = (BillItemEntity) 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 (NobleBillListInfo.NobleBillInfo temp : nobleBillInfoList) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - billItemEntity.nobleBillInfo = temp; - //目的是为了比较 - billItemEntity.time = key; - billItemEntities.add(billItemEntity); - } - } - } - if (billItemEntities.size() < Constants.BILL_PAGE_SIZE && mCurrentCounter == Constants.PAGE_START) { - mNobleBillAdapter.setEnableLoadMore(false); - } - mNobleBillAdapter.addData(billItemEntities); - } else { - if (mCurrentCounter == 1) { - showNoData(R.drawable.icon_common_failure, getResources().getString(R.string.bill_no_data_text)); - } else { - mNobleBillAdapter.loadMoreEnd(true); - } - } - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java deleted file mode 100644 index 721766f06..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/ChargeBillsActivity.java +++ /dev/null @@ -1,203 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import android.annotation.SuppressLint; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.ChargeBillsAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 充值记录 - */ -@ActLayoutRes(R.layout.activity_bills) -public class ChargeBillsActivity extends BillBaseActivity { - private TitleBar mTitleBar; -// private ChargeBillsAdapter adapter; - - private ImageView iv_goto_top; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - initTitleBar(ResUtil.getString(R.string.bills_activities_chargebillsactivity_01)); - } - - @Override - protected void initView() { - super.initView(); - iv_goto_top = findViewById(R.id.iv_goto_top); - iv_goto_top.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - mRecyclerView.smoothScrollToPosition(0); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - @Override - protected void initData() { - super.initData(); - adapter = new ChargeBillsAdapter(mBillItemEntityList); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - mCurrentCounter++; - loadData(); - } - }, mRecyclerView); - adapter.addFooterView(View.inflate(context, R.layout.layout_bills_bottom, null)); - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mActivity); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(adapter); - showLoading(); - loadData(); - } - - @SuppressLint("CheckResult") - @Override - protected void loadData() { - BillModel.get() - .getChargeBills(mCurrentCounter, PAGE_SIZE, time) - .compose(bindToLifecycle()) - .subscribe((chargeResult, throwable) -> { - if (throwable != null) { - onGetDataError(throwable.getMessage()); - } else if (chargeResult != null && chargeResult.isSuccess()) { - onGetChargeBills(chargeResult.getData()); - } else if (chargeResult != null) { - onGetDataError(chargeResult.getError()); - } - }); - } - - public void onGetChargeBills(ExpendListInfo data) { - mRefreshLayout.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 expendInfos = map.get(key); - if (ListUtils.isListEmpty(expendInfos)) { - continue; - } - //标题 - if (size > 0) { - BillItemEntity lastBillItem = (BillItemEntity) 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 (ExpendInfo temp : expendInfos) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - billItemEntity.mChargeExpendInfo = 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 == Constants.PAGE_START) { - showNoData(R.drawable.icon_common_failure, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - - - @Override - public void initTitleBar(String title) { - mTitleBar = (TitleBar) findViewById(R.id.title_bar); - if (mTitleBar != null) { - mTitleBar.setTitle(title); - mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.back_font)); - mTitleBar.setLeftImageResource(R.drawable.arrow_left); - mTitleBar.setLeftClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); - } - mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary)); - mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.bills_activities_chargebillsactivity_02)) { - @Override - public void performAction(View view) { - if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - ChargeActivity.start(mActivity); - }else { - CommonWebViewActivity.start( - mActivity, UriProvider.getOfficialPay( - 4, - DeviceUtil.getDeviceId(mActivity) - ) - ); - } - } - }); - } - -// public void onGetChargeBillsError(String error) { -// if (mCurrentCounter == Constants.PAGE_START) { -// showNetworkErr(); -// } else { -// adapter.loadMoreFail(); -// } -// } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java deleted file mode 100644 index 09b3cee12..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/ChatBillsActivity.java +++ /dev/null @@ -1,161 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.ChatBillsAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 竞拍记录 - * - * @author Administrator - */ -@ActLayoutRes(R.layout.activity_bills) -public class ChatBillsActivity extends BillBaseActivity { -// private ChatBillsAdapter adapter; - - private ImageView iv_goto_top; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - initTitleBar(getString(R.string.menu_my_auction)); - } - - @Override - protected void initView() { - super.initView(); - iv_goto_top = findViewById(R.id.iv_goto_top); - iv_goto_top.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - mRecyclerView.smoothScrollToPosition(0); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - @Override - protected void initData() { - super.initData(); - adapter = new ChatBillsAdapter(mBillItemEntityList); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - mCurrentCounter++; - loadData(); - } - }, mRecyclerView); - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mActivity); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(adapter); - showLoading(); - loadData(); - } - - - @SuppressLint("CheckResult") - @Override - protected void loadData() { - BillModel.get() - .getChatBills(mCurrentCounter, PAGE_SIZE, time) - .compose(bindToLifecycle()) - .subscribe((incomedResult, throwable) -> { - if (throwable != null) { - onGetDataError(throwable.getMessage()); - } else if (incomedResult != null && incomedResult.isSuccess()) { - onGetOrderIncomeBills(incomedResult.getData()); - } else if (incomedResult != null) { - onGetDataError(incomedResult.getError()); - } - }); - } - - public void onGetOrderIncomeBills(IncomeListInfo data) { - mRefreshLayout.setRefreshing(false); - if (null != data) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - adapter.setNewData(mBillItemEntityList); - } else { - adapter.loadMoreComplete(); - } - - List>> billList = data.getBillList(); - if (!billList.isEmpty()) { - int size = mBillItemEntityList.size(); - List billItemEntities = new ArrayList<>(); - BillItemEntity billItemEntity; - 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.mChatInComeInfo = 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(getResources().getString(R.string.bill_no_data_text)); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - -// public void onGetOrderIncomeBillsError(String error) { -// if (mCurrentCounter == Constants.PAGE_START) { -// showNetworkErr(); -// } else { -// adapter.loadMoreFail(); -// } -// } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java deleted file mode 100644 index d192dfbdc..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/RedBagBillsActivity.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import android.annotation.SuppressLint; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.adapter.RedBagBillsAdapter; -import com.yizhuan.erban.databinding.ActivityBillsBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; -import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * 红包记录 - * - * @author Administrator - */ -@ActLayoutRes(R.layout.activity_bills) -public class RedBagBillsActivity extends BillBaseActivity { - -// private RedBagBillsAdapter adapter; - - private ImageView iv_goto_top; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - initTitleBar(getString(R.string.bill_red)); - } - - @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_redbagbillsactivity_01)) { - @Override - public void performAction(View view) { - if(AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { - startActivity(new Intent(RedBagBillsActivity.this, ChargeActivity.class)); - }else { - CommonWebViewActivity.start( - context, UriProvider.getOfficialPay( - 4, - DeviceUtil.getDeviceId(context) - ) - ); - } - } - }); - } - - @Override - protected void initView() { - super.initView(); - iv_goto_top = findViewById(R.id.iv_goto_top); - iv_goto_top.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - mRecyclerView.smoothScrollToPosition(0); - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } - - @Override - protected void initData() { - super.initData(); - adapter = new RedBagBillsAdapter(mBillItemEntityList); - adapter.setOnLoadMoreListener(() -> { - mCurrentCounter++; - loadData(); - }, mRecyclerView); - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mActivity); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(adapter); - showLoading(); - loadData(); - } - - @SuppressLint("CheckResult") - @Override - protected void loadData() { - BillModel.get() - .getRedBagBills(mCurrentCounter, PAGE_SIZE, time) - .compose(bindToLifecycle()) - .subscribe((redBagResult, throwable) -> { - if (throwable != null) { - onGetDataError(throwable.getMessage()); - } else if (redBagResult != null && redBagResult.isSuccess()) { - onGetRedBagBills(redBagResult.getData()); - } else if (redBagResult != null) { - onGetDataError(redBagResult.getError()); - } - }); - } - - public void onGetRedBagBills(RedBagListInfo data) { - mRefreshLayout.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 redBagInfos = map.get(key); - if (ListUtils.isListEmpty(redBagInfos)) 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 (RedBagInfo temp : redBagInfos) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - billItemEntity.mRedBagInfo = 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(ResUtil.getString(R.string.bills_activities_redbagbillsactivity_02)); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - -// public void onGetRedBagBillsError(String error) { -// if (mCurrentCounter == Constants.PAGE_START) { -// showNetworkErr(); -// } else { -// adapter.loadMoreFail(); -// } -// } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/TotalBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/TotalBillsActivity.java deleted file mode 100644 index 98854da58..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/TotalBillsActivity.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.yizhuan.erban.bills.activities; - -import android.content.Intent; -import android.os.Bundle; -import android.view.View; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.bills.widget.BillItemView; - -/** - * @author Administrator - */ -public class TotalBillsActivity extends BaseActivity implements View.OnClickListener { - private BillItemView mBillGiftInCome, mBillGiftExpend; - private BillItemView mBillChat; - private BillItemView mBillCharge; - private BillItemView mBillWithdraw; - private BillItemView mBillRed; - private BillItemView mBillNoble; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_total_bills); - initTitleBar(getString(R.string.bill_title)); - initView(); - initData(); - setListener(); - } - - private void initView() { - mBillGiftInCome = (BillItemView) findViewById(R.id.bill_item_income); - 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); - } - - private void initData() { - - } - - - private void setListener() { - mBillGiftInCome.setOnClickListener(this); - mBillGiftExpend.setOnClickListener(this); - mBillChat.setOnClickListener(this); - mBillCharge.setOnClickListener(this); - mBillWithdraw.setOnClickListener(this); - mBillRed.setOnClickListener(this); - mBillNoble.setOnClickListener(this); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.bill_item_income: -// startActivity(new Intent(this, BillGiftInComeActivity.class)); - BillGiftIncomeGroupActivity.startActivity(this, BillGiftIncomeGroupActivity.TYPE_BILL_INCOME); - break; - case R.id.bill_item_expend: -// startActivity(new Intent(this, BillGiftExpendActivity.class)); - BillGiftIncomeGroupActivity.startActivity(this, BillGiftIncomeGroupActivity.TYPE_BILL_OUTPUT); - break; - case R.id.bill_item_chat: - startActivity(new Intent(this, ChatBillsActivity.class)); - break; - 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; - case R.id.bill_item_noble: - startActivity(new Intent(this, BillNobleActivity.class)); - break; - default: - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java deleted file mode 100644 index 4253a5729..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/activities/WithdrawBillsActivity.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.yizhuan.erban.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.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.event.DateInfoEvent; -import com.yizhuan.erban.bills.event.TopEvent; -import com.yizhuan.erban.bills.fragmemt.WithdrawBillsFragment; -import com.yizhuan.erban.databinding.ActivityWithdrawBillsBinding; -import com.yizhuan.erban.ui.pay.ChargeActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.common.util.DeviceUtil; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_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/yizhuan/erban/bills/adapter/BillBaseAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/BillBaseAdapter.java deleted file mode 100644 index b862349ae..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/BillBaseAdapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -/** - *

账单adapter base

- * Created by Administrator on 2017/11/6. - */ -public abstract class BillBaseAdapter extends BaseMultiItemQuickAdapter { - - public BillBaseAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_DATE, R.layout.list_income_gift_title); - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - if (billItemEntity == null) { - return; - } - switch (billItemEntity.getItemType()) { - case BillItemEntity.ITEM_DATE: - baseViewHolder.setText(R.id.tv_date, - TimeUtils.getDateTimeString(Long.parseLong(billItemEntity.time), "yyyy-MM-dd")); - break; - case BillItemEntity.ITEM_NORMAL: - convertNormal(baseViewHolder, billItemEntity); - break; - default: - } - } - - public abstract void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity); -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChargeBillsAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/ChargeBillsAdapter.java deleted file mode 100644 index 740563e01..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChargeBillsAdapter.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -/** - * 充值记录 ExpendInfo - * Created by ${Seven} on 2017/9/15. - */ -public class ChargeBillsAdapter extends BillBaseAdapter { - - public ChargeBillsAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_charge_bills_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - ExpendInfo expendInfo = billItemEntity.mChargeExpendInfo; - if (expendInfo == null) { - return; - } - baseViewHolder.setText(R.id.tv_gold, ResUtil.getString(R.string.bills_adapter_chargebillsadapter_01) + expendInfo.getGoldNum() + ResUtil.getString(R.string.bills_adapter_chargebillsadapter_02)) - .setText(R.id.tv_money, expendInfo.getShowStr()) - .setText(R.id.tv_charge_time, TimeUtils.getYearMonthDayHourMinuteSecond(expendInfo.getRecordTime())); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChatBillsAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/ChatBillsAdapter.java deleted file mode 100644 index e5b8c0b71..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/ChatBillsAdapter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -/** - * IncomeInfo - * Created by Seven on 2017/9/18. - */ -public class ChatBillsAdapter extends BillBaseAdapter { - - public ChatBillsAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_order_bills_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - IncomeInfo incomeInfo = billItemEntity.mChatInComeInfo; - if (incomeInfo == null) return; - baseViewHolder.setVisible(R.id.rly_gold, true) - .setText(R.id.tv_user_pro, incomeInfo.getTargetNick() + "&" + incomeInfo.getUserNick()) - .setText(R.id.tv_date, TimeUtils.getYearMonthDayHourMinuteSecond(incomeInfo.getRecordTime())) - .setText(R.id.tv_gold, incomeInfo.getGoldNum() != 0 - ? String.valueOf(incomeInfo.getGoldNum()) : "+" + incomeInfo.getDiamondNum()) - .setText(R.id.tv_bill_type, incomeInfo.getGoldNum() != 0 - ? mContext.getString(R.string.gift_expend_gold) : mContext.getString(R.string.gift_income_gold)); - - CircleImageView userAvatar = baseViewHolder.getView(R.id.user_avatar); - CircleImageView proAvatar = baseViewHolder.getView(R.id.pro_avatar); - ImageLoadUtils.loadAvatar(mContext, incomeInfo.getUserAvatar(), userAvatar); - ImageLoadUtils.loadAvatar(mContext, incomeInfo.getTargetAvatar(), proAvatar); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftExpendAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftExpendAdapter.java deleted file mode 100644 index f213a4827..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftExpendAdapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import android.widget.ImageView; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -/** - * ExpendInfo - * Created by Seven on 2017/9/10. - */ -public class GiftExpendAdapter extends BillBaseAdapter { - - public GiftExpendAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_expend_gift_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - ExpendInfo expendInfo = billItemEntity.mGiftExpendInfo; - if (expendInfo == null) return; - baseViewHolder.setText(R.id.tv_gift_income, - mContext.getString(R.string.gift_out_gold_number_format, expendInfo.getGoldNum())) - .setText(R.id.tv_send_name, ResUtil.getString(R.string.bills_adapter_giftexpendadapter_01) + expendInfo.getTargetNick()) - .setText(R.id.tv_user_name, expendInfo.getGiftName()) - .setText(R.id.gift_date, TimeUtils.getDateTimeString(expendInfo.getRecordTime(), "HH:mm:ss")) - .setText(R.id.gold, R.string.gift_expend_gold); - - ImageView img_avatar = baseViewHolder.getView(R.id.img_avatar); - ImageLoadUtils.loadImage(mContext, expendInfo.getGiftPic(), img_avatar); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftIncomeAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftIncomeAdapter.java deleted file mode 100644 index 49a6639fb..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/GiftIncomeAdapter.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import android.widget.ImageView; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -/** - * Created by Seven on 2017/9/11. - */ - -public class GiftIncomeAdapter extends BillBaseAdapter { - - public GiftIncomeAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_expend_gift_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - IncomeInfo incomeInfo = billItemEntity.mGiftInComeInfo; - if (incomeInfo == null) return; - baseViewHolder.setText(R.id.tv_gift_income, - mContext.getString(R.string.gift_in_gold_number_format, incomeInfo.getDiamondNum())) - .setText(R.id.tv_send_name, ResUtil.getString(R.string.bills_adapter_giftincomeadapter_01) + incomeInfo.getTargetNick()) - .setText(R.id.tv_user_name, incomeInfo.getGiftName()) - .setText(R.id.gift_date, TimeUtils.getDateTimeString(incomeInfo.getRecordTime(), "HH:mm:ss")) - .setText(R.id.gold, R.string.gift_income_gold); - ImageView avatar = baseViewHolder.getView(R.id.img_avatar); - ImageLoadUtils.loadImage(mContext, incomeInfo.getGiftPic(), avatar); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/NobleBillAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/NobleBillAdapter.java deleted file mode 100644 index 131058427..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/NobleBillAdapter.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -/** - *

- * - * @author jiahui - * @date 2018/1/18 - */ -public class NobleBillAdapter extends BillBaseAdapter { - public NobleBillAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_charge_bills_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - NobleBillListInfo.NobleBillInfo nobleBillInfo = billItemEntity.nobleBillInfo; - if (nobleBillInfo == null) return; - baseViewHolder.setText(R.id.tv_gold, nobleBillInfo.getOptStr()) - .setText(R.id.tv_money, nobleBillInfo.getPayStr()) - .setText(R.id.tv_charge_time, TimeUtils.getYearMonthDayHourMinuteSecond(nobleBillInfo.getRecordTime())); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java deleted file mode 100644 index 3672f5c37..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/RadishGiftAdapter.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import android.widget.ImageView; - -import androidx.core.content.ContextCompat; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.fragmemt.RadishGiftFragment; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -public class RadishGiftAdapter extends BillBaseAdapter{ - private byte mType; - - public RadishGiftAdapter(List billItemEntityList, byte type) { - super(billItemEntityList); - mType = type; - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_expend_gift_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - - RadishGiftInfo radishGiftInfo = billItemEntity.mRadishGiftInfo; - if (radishGiftInfo == null) return; - - baseViewHolder.setText(R.id.tv_send_name, radishGiftInfo.getDescribeStr()) - .setText(R.id.tv_user_name, radishGiftInfo.getGiftName()) - .setText(R.id.gift_date, TimeUtils.getDateTimeString(radishGiftInfo.getCreateTime(), "HH:mm:ss")); - - // 价格/数量 - int incomeColor = ContextCompat.getColor(mContext, R.color.appColor); - int outputColor = ContextCompat.getColor(mContext, R.color.color_333333); - baseViewHolder.setTextColor(R.id.tv_gift_income, mType == RadishGiftFragment.TYPE_RADISH_INCOME ? incomeColor : outputColor) - .setText(R.id.tv_gift_income, mType == RadishGiftFragment.TYPE_RADISH_INCOME ? "x" + radishGiftInfo.getGiftNum() : radishGiftInfo.getAmountStr()) - .setText(R.id.gold, mType == RadishGiftFragment.TYPE_RADISH_INCOME ? "" : radishGiftInfo.getCurrencyStr()); - - ImageView avatar = baseViewHolder.getView(R.id.img_avatar); - ImageLoadUtils.loadImage(mContext, radishGiftInfo.getGiftPicUrl(), avatar); - } -} - diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/RedBagBillsAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/RedBagBillsAdapter.java deleted file mode 100644 index 2a1ea522c..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/RedBagBillsAdapter.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -/** - * 红包记录 RedBagInfo - * Created by ${Seven} on 2017/9/25. - */ -public class RedBagBillsAdapter extends BillBaseAdapter { - public RedBagBillsAdapter(List billItemEntityList) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.list_charge_bills_item); - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - RedBagInfo redBagInfo = billItemEntity.mRedBagInfo; - if (redBagInfo == null) return; - baseViewHolder.setText(R.id.tv_gold, redBagInfo.getTypeStr()) - .setText(R.id.tv_money, "+" + redBagInfo.getPacketNum() + ResUtil.getString(R.string.bills_adapter_redbagbillsadapter_01)) - .setText(R.id.tv_charge_time, TimeUtils.getYearMonthDayHourMinuteSecond(redBagInfo.getCreateTime())); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsAdapter.java deleted file mode 100644 index 798de49f6..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsAdapter.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_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.bills_adapter_withdrawbillsadapter_02)) - .setText(R.id.tv_money, "+" + incomeInfo.getMoney() + ResUtil.getString(R.string.bills_adapter_withdrawbillsadapter_03)); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java deleted file mode 100644 index 99a261e79..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawBillsIndicatorAdapter.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import android.content.Context; -import android.view.Gravity; -import android.view.View; - -import androidx.appcompat.widget.AppCompatTextView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.erban.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/yizhuan/erban/bills/adapter/WithdrawRedBillsAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawRedBillsAdapter.java deleted file mode 100644 index 5d4acf483..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/adapter/WithdrawRedBillsAdapter.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yizhuan.erban.bills.adapter; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_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.bills_adapter_withdrawredbillsadapter_02)) - .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/yizhuan/erban/bills/event/DateInfoEvent.java b/app/src/main/java/com/yizhuan/erban/bills/event/DateInfoEvent.java deleted file mode 100644 index 7328c9dc5..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/event/DateInfoEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yizhuan.erban.bills.event; - -/** - *

事件日期

- * Created by Administrator on 2017/11/8. - */ -public class DateInfoEvent { - public long millSeconds; - public int position; - - public DateInfoEvent(long millSeconds, int position) { - this.millSeconds = millSeconds; - this.position = position; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/event/TopEvent.java b/app/src/main/java/com/yizhuan/erban/bills/event/TopEvent.java deleted file mode 100644 index a51eaeca6..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/event/TopEvent.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.erban.bills.event; - -public class TopEvent { - - public int position; - - public TopEvent(int position) { - this.position = position; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java deleted file mode 100644 index a87cd44c5..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/BaseBillsFragment.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.yizhuan.erban.bills.fragmemt; - -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; -import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.ArrayList; -import java.util.List; - -public abstract class BaseBillsFragment> extends BaseMvpFragment - implements View.OnClickListener, OnDateSetListener { - protected RecyclerView mRecyclerView; - protected SwipeRefreshLayout mRefreshLayout; - protected int mCurrentCounter = Constants.PAGE_START; - protected static final int PAGE_SIZE = Constants.BILL_PAGE_SIZE; - protected long time = System.currentTimeMillis(); - protected List mBillItemEntityList = new ArrayList<>(); - private TextView mTvDate; - private ImageView mIvTodaySelect; - private ImageView mIvSelectorDate; - protected TimePickerDialog.Builder mDialogYearMonthDayBuild; - private View mRlyDate; - - @Override - public int getRootLayoutId() { - return R.layout.fragment_gift_income ; - } - - @Override - public void onFindViews() { - mTvDate = mView.findViewById(R.id.tv_date); - mRecyclerView = mView.findViewById(R.id.recyclerView); - mRefreshLayout = mView.findViewById(R.id.swipe_refresh); - mIvTodaySelect = mView.findViewById(R.id.iv_today_select); - mIvSelectorDate = mView.findViewById(R.id.tv_selector_date); - mRlyDate = mView.findViewById(R.id.rly_date); - } - - @Override - public void onSetListener() { - mIvTodaySelect.setOnClickListener(this); - mIvSelectorDate.setOnClickListener(this); - mRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - mCurrentCounter = Constants.PAGE_START; - RadishModel.get().updateRadishWallet().subscribe(); - loadData(); - } - }); - - } - - @Override - public void initiate() { - initData(); - } - - @Override - public void onDateSet(TimePickerDialog timePickerView, long millseconds) { - this.time = millseconds; - setDate(millseconds); - mCurrentCounter = Constants.PAGE_START; - showLoading(); - loadData(); - } - - protected void initData() { - setDate(System.currentTimeMillis()); - mDialogYearMonthDayBuild = new TimePickerDialog.Builder() - .setType(Type.YEAR_MONTH_DAY) - .setTitleStringId(ResUtil.getString(R.string.bills_fragmemt_basebillsfragment_01)) - .setThemeColor(getResources().getColor(R.color.line_background)) - .setWheelItemTextNormalColor(getResources().getColor(R.color - .timetimepicker_default_text_color)) - .setWheelItemTextSelectorColor(getResources().getColor(R.color.black)) - .setCallBack(this); - } - - protected long mTime; - protected void setDate(long time) { - mTime = time; - mTvDate.setText(TimeUtils.getDateTimeString(time, "yyyy-MM-dd")); - } - - @Override - public void onClick(View v) { - switch (v.getId()) { - case R.id.iv_today_select: - mCurrentCounter = Constants.PAGE_START; - time = System.currentTimeMillis(); - setDate(time); - showLoading(); - loadData(); - break; - case R.id.tv_selector_date: - mDialogYearMonthDayBuild.build().show(getChildFragmentManager(), "year_month_day"); - break; - default: - } - } - - @Override - public void onDestroy() { - super.onDestroy(); - if (mDialogYearMonthDayBuild != null) { - mDialogYearMonthDayBuild.setCallBack(null); - mDialogYearMonthDayBuild = null; - } - } - - protected void setRlyDateBackground(int color) { - if (mRlyDate != null) - mRlyDate.setBackgroundColor(color); - } - - public abstract void loadData(); -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java deleted file mode 100644 index ccd09b843..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftIncomeFragment.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.yizhuan.erban.bills.fragmemt; - -import android.annotation.SuppressLint; -import android.text.TextUtils; -import android.view.View; - -import androidx.fragment.app.Fragment; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.erban.bills.adapter.GiftIncomeAdapter; -import com.yizhuan.erban.bills.presenter.GiftIncomePresenter; -import com.yizhuan.erban.bills.view.IGiftIncomeView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@CreatePresenter(GiftIncomePresenter.class) -public class GiftIncomeFragment extends BaseBillsFragment implements IGiftIncomeView { - private BillBaseAdapter adapter; - - public static Fragment newInstance() { - Fragment fragment = new GiftIncomeFragment(); - return fragment; - } - - @Override - public int getRootLayoutId() { - return R.layout.fragment_gift_income; - } - - @Override - public void initiate () { - super.initiate(); - adapter = new GiftIncomeAdapter(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); - - firstLoadDate(); - } - - @SuppressLint("CheckResult") - public void loadData () { - getMvpPresenter().getGiftIncomeBills(mCurrentCounter, PAGE_SIZE, time); - } - - @Override - public void onGetDataError (String error){ - if (mCurrentCounter == Constants.PAGE_START) { - showNetworkErr(); - } else { - adapter.loadMoreFail(); - } - } - - @Override - public void onGetIncomeBills (IncomeListInfo data){ - mRefreshLayout.setRefreshing(false); - if (null != data) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - adapter.setNewData(mBillItemEntityList); - } else { - adapter.loadMoreComplete(); - } - List>> billList = data.getBillList(); - if (!billList.isEmpty()) { - int size = mBillItemEntityList.size(); - List billItemEntities = new ArrayList<>(); - BillItemEntity billItemEntity; - 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.mGiftInComeInfo = 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 == Constants.PAGE_START) { - showNoData(R.drawable.icon_common_failure, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - - @Override - public void smoothScrollToTop () { - if (mRecyclerView != null) - mRecyclerView.smoothScrollToPosition(0); - } - - private void firstLoadDate () { - mCurrentCounter = Constants.PAGE_START; - showLoading(); - loadData(); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java deleted file mode 100644 index 62cddc148..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/GiftOutputFragment.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.yizhuan.erban.bills.fragmemt; - -import android.annotation.SuppressLint; -import android.text.TextUtils; -import android.view.View; - -import androidx.fragment.app.Fragment; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.erban.bills.adapter.GiftExpendAdapter; -import com.yizhuan.erban.bills.presenter.GiftOutputPresenter; -import com.yizhuan.erban.bills.view.IGiftOutputView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@CreatePresenter(GiftOutputPresenter.class) -public class GiftOutputFragment extends BaseBillsFragment implements IGiftOutputView { - private BillBaseAdapter adapter; - - public static Fragment newInstance() { - Fragment fragment = new GiftOutputFragment(); - return fragment; - } - - @Override - public void initiate() { - super.initiate(); - adapter = new GiftExpendAdapter(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); - - firstLoadDate(); - } - - private void firstLoadDate() { - mCurrentCounter = Constants.PAGE_START; - showLoading(); - loadData(); - } - - @SuppressLint("CheckResult") - public void loadData() { - getMvpPresenter().getetExpendBills(mCurrentCounter, PAGE_SIZE, time); - } - - @Override - public void onGetDataError(String error) { - if (mCurrentCounter == Constants.PAGE_START) { - showNetworkErr(); - } else { - adapter.loadMoreFail(); - } - } - - @Override - public void onGetExpendBills(ExpendListInfo data) { - mRefreshLayout.setRefreshing(false); - if (null != data) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - adapter.setNewData(mBillItemEntityList); - } else { - adapter.loadMoreComplete(); - } - List>> billList = data.getBillList(); - if (!billList.isEmpty()) { - List billItemEntities = new ArrayList<>(); - int size = mBillItemEntityList.size(); - BillItemEntity billItemEntity; - for (int i = 0; i < billList.size(); i++) { - Map> map = billList.get(i); - for (String key : map.keySet()) { - // key ---日期 value：list集合记录 - List expendInfos = map.get(key); - if (ListUtils.isListEmpty(expendInfos)) 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 (ExpendInfo temp : expendInfos) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - //目的是为了比较 - billItemEntity.time = key; - billItemEntity.mGiftExpendInfo = temp; - billItemEntities.add(billItemEntity); - } - } - } - if (billItemEntities.size() < Constants.BILL_PAGE_SIZE && mCurrentCounter == Constants.PAGE_START) { - adapter.setEnableLoadMore(false); - } - - adapter.addData(billItemEntities); - } else { - if (mCurrentCounter == Constants.PAGE_START) { - showNoData(R.drawable.icon_common_failure, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS); - } else { - adapter.loadMoreEnd(true); - } - } - } - } - - @Override - public void smoothScrollToTop() { - if (mRecyclerView != null) - mRecyclerView.smoothScrollToPosition(0); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java deleted file mode 100644 index 4731affba..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/RadishGiftFragment.java +++ /dev/null @@ -1,155 +0,0 @@ -package com.yizhuan.erban.bills.fragmemt; - -import android.os.Bundle; -import android.text.TextUtils; - -import androidx.fragment.app.Fragment; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.erban.bills.adapter.RadishGiftAdapter; -import com.yizhuan.erban.bills.presenter.RadishGiftPresenter; -import com.yizhuan.erban.bills.view.IRadishGiftView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftInfo; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@CreatePresenter(RadishGiftPresenter.class) -public class RadishGiftFragment extends BaseBillsFragment implements IRadishGiftView { - - public static final byte TYPE_RADISH_EXPAND = 1; - public static final byte TYPE_RADISH_INCOME= 2; - private static final String TYPE = "type_radish"; - private BillBaseAdapter mAdapter; - - private byte mType = TYPE_RADISH_INCOME; - - public static Fragment newInstance(byte type) { - Fragment fragment = new RadishGiftFragment(); - Bundle bundle = new Bundle(); - bundle.putByte(TYPE, type); - fragment.setArguments(bundle); - return fragment; - } - @Override - public void loadData() { - getMvpPresenter().getRadishRecord(mCurrentCounter, PAGE_SIZE, mTime, mType); - } - - private void firstLoadDate() { - mCurrentCounter = Constants.PAGE_START; - showLoading(); - loadData(); - } - - @Override - public void initiate() { - super.initiate(); - - Bundle bundle = getArguments(); - if (bundle != null) { - mType = bundle.getByte(TYPE, TYPE_RADISH_INCOME); - } - - mAdapter = new RadishGiftAdapter(mBillItemEntityList, mType); - mAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - mCurrentCounter++; - loadData(); - } - }, mRecyclerView); - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mContext); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(mAdapter); - - firstLoadDate(); - - } - - @Override - public void getRadishRecordSuccess(RadishGiftListInfo list) { - mRefreshLayout.setRefreshing(false); - if (null != list) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - mAdapter.setNewData(mBillItemEntityList); - } else { - mAdapter.loadMoreComplete(); - } - List>> billList = list.getBillList(); - if (!billList.isEmpty()) { - int size = mBillItemEntityList.size(); - List billItemEntities = new ArrayList<>(); - BillItemEntity billItemEntity; - 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 (RadishGiftInfo temp : incomeInfos) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - billItemEntity.mRadishGiftInfo = temp; - //目的是为了比较 - billItemEntity.time = key; - billItemEntities.add(billItemEntity); - } - } - } - if (billItemEntities.size() < Constants.BILL_PAGE_SIZE && mCurrentCounter == Constants.PAGE_START) { - mAdapter.setEnableLoadMore(false); - } - mAdapter.addData(billItemEntities); - } else { - if (mCurrentCounter == Constants.PAGE_START) { - showNoData(R.drawable.icon_common_failure, ResUtil.getString(R.string.bills_fragmemt_radishgiftfragment_01)); - } else { - mAdapter.loadMoreEnd(true); - } - } - } - } - - @Override - public void getRadishRecordFail(String message) { - if (mCurrentCounter == Constants.PAGE_START) { - showNetworkErr(); - } else { - mAdapter.loadMoreFail(); - } - - } - - @Override - public void smoothScrollToTop () { - if (mRecyclerView != null) - mRecyclerView.smoothScrollToPosition(0); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java b/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java deleted file mode 100644 index 2a43695db..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/fragmemt/WithdrawBillsFragment.java +++ /dev/null @@ -1,241 +0,0 @@ -package com.yizhuan.erban.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.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseBindingFragment; -import com.yizhuan.erban.bills.adapter.WithdrawBillsAdapter; -import com.yizhuan.erban.bills.event.DateInfoEvent; -import com.yizhuan.erban.bills.event.TopEvent; -import com.yizhuan.erban.common.NoDataFragment; -import com.yizhuan.erban.databinding.FragmentXrexylerviewBinding; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -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, XChatConstants.EMPTY_RECORD_AND_THREE_MONTHS_TIPSS); - } 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/yizhuan/erban/bills/presenter/BillGiftIncomeGroupPresenter.java b/app/src/main/java/com/yizhuan/erban/bills/presenter/BillGiftIncomeGroupPresenter.java deleted file mode 100644 index 4c67832c3..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/BillGiftIncomeGroupPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.erban.bills.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IBillGiftIncomeGroupView; - -public class BillGiftIncomeGroupPresenter extends BaseMvpPresenter { -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftIncomePresenter.java b/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftIncomePresenter.java deleted file mode 100644 index 92539eb99..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftIncomePresenter.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yizhuan.erban.bills.presenter; - -import android.annotation.SuppressLint; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IGiftIncomeView; -import com.yizhuan.xchat_android_core.bills.BillModel; - -public class GiftIncomePresenter extends BaseMvpPresenter { - - @SuppressLint("CheckResult") - public void getGiftIncomeBills(int pageNo, int pageSize, long time) { - BillModel.get() - .getGiftIncomeBills(pageNo, pageSize, time) - .compose(bindToLifecycle()) - .subscribe((incomedResult, throwable) -> { - if (throwable != null) { - if (mMvpView != null) - mMvpView.onGetDataError(throwable.getMessage()); - } else if (incomedResult != null && incomedResult.isSuccess()) { - if (mMvpView != null) - mMvpView.onGetIncomeBills(incomedResult.getData()); - } else if (incomedResult != null) { - if (mMvpView != null) - mMvpView.onGetDataError(incomedResult.getError()); - } - }); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftOutputPresenter.java b/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftOutputPresenter.java deleted file mode 100644 index 1b237ff8e..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/GiftOutputPresenter.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.yizhuan.erban.bills.presenter; - -import android.annotation.SuppressLint; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IGiftOutputView; -import com.yizhuan.xchat_android_core.bills.BillModel; - -public class GiftOutputPresenter extends BaseMvpPresenter { - - @SuppressLint("CheckResult") - public void getetExpendBills(int pageNo, int pageSize, long time) { - BillModel.get() - .getGiftExpendBills(pageNo, pageSize, time) - .compose(bindToLifecycle()) - .subscribe((expendResult, throwable) -> { - if (throwable != null) { - mMvpView.onGetDataError(throwable.getMessage()); - } else if (expendResult != null && expendResult.isSuccess()) { - mMvpView.onGetExpendBills(expendResult.getData()); - } else if (expendResult != null) { - mMvpView.onGetDataError(expendResult.getError()); - } - }); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/presenter/RadishGiftPresenter.java b/app/src/main/java/com/yizhuan/erban/bills/presenter/RadishGiftPresenter.java deleted file mode 100644 index 798461aeb..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/presenter/RadishGiftPresenter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.yizhuan.erban.bills.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.bills.view.IRadishGiftView; -import com.yizhuan.xchat_android_core.bills.RadishGiftModel; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -public class RadishGiftPresenter extends BaseMvpPresenter { - - public void getRadishRecord(int page, int pageSize, long date, byte type) { - RadishGiftModel.get().getRadishRecord(page, pageSize, date, type) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(RadishGiftResult radishGiftResult) { - if (radishGiftResult != null && radishGiftResult.isSuccess()) { - if (mMvpView != null) - mMvpView.getRadishRecordSuccess(radishGiftResult.getData()); - } else if (radishGiftResult != null){ - if (mMvpView != null) - mMvpView.getRadishRecordFail(radishGiftResult.getError()); - } - } - - @Override - public void onError(Throwable e) { - if (mMvpView != null) - mMvpView.getRadishRecordFail(e.getMessage()); - - } - }); - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IBillGiftIncomeGroupView.java b/app/src/main/java/com/yizhuan/erban/bills/view/IBillGiftIncomeGroupView.java deleted file mode 100644 index 01c1c9a0a..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IBillGiftIncomeGroupView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IBillGiftIncomeGroupView extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftIncomeView.java b/app/src/main/java/com/yizhuan/erban/bills/view/IGiftIncomeView.java deleted file mode 100644 index c64070c07..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftIncomeView.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; - -public interface IGiftIncomeView extends ISmoothToTopView { - void onGetDataError(String message); - void onGetIncomeBills(IncomeListInfo data); -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftOutputView.java b/app/src/main/java/com/yizhuan/erban/bills/view/IGiftOutputView.java deleted file mode 100644 index 74916330b..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IGiftOutputView.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IGiftOutputView extends IMvpBaseView { - void smoothScrollToTop(); - void onGetDataError(String message); - void onGetExpendBills(ExpendListInfo data); -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/IRadishGiftView.java b/app/src/main/java/com/yizhuan/erban/bills/view/IRadishGiftView.java deleted file mode 100644 index f01d3186b..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/IRadishGiftView.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; - -public interface IRadishGiftView extends ISmoothToTopView { - void getRadishRecordSuccess(RadishGiftListInfo list); - void getRadishRecordFail(String message); -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/view/ISmoothToTopView.java b/app/src/main/java/com/yizhuan/erban/bills/view/ISmoothToTopView.java deleted file mode 100644 index 995be34a2..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/view/ISmoothToTopView.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.erban.bills.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface ISmoothToTopView extends IMvpBaseView { - void smoothScrollToTop(); -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java b/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java deleted file mode 100644 index 4038b3d8b..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/widget/BillGiftIncomeGroupNavigatorAdapter.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.yizhuan.erban.bills.widget; - -import android.content.Context; -import android.view.ViewGroup; -import android.widget.FrameLayout; - -import androidx.core.content.ContextCompat; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.widget.RankNavigatorAdapter; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; - -public class BillGiftIncomeGroupNavigatorAdapter extends CommonNavigatorAdapter { - - private List mTitleList = new ArrayList<>(); - - public BillGiftIncomeGroupNavigatorAdapter() { - mTitleList.add(ResUtil.getString(R.string.bills_widget_billgiftincomegroupnavigatoradapter_01)); - mTitleList.add(ResUtil.getString(R.string.bills_widget_billgiftincomegroupnavigatoradapter_02)); - } - @Override - public int getCount() { - return mTitleList.size(); - } - - @Override - public IPagerTitleView getTitleView(Context context, int index) { - BadgeScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new BadgeScaleTransitionPagerTitleView(context); - scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_999999)); - scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_333333)); - scaleTransitionPagerTitleView.setMinScale(1.0f); - scaleTransitionPagerTitleView.setTextSize(15); - scaleTransitionPagerTitleView.setText(mTitleList.get(index)); - - scaleTransitionPagerTitleView.setOnClickListener(view -> { - if (mOnItemSelectListener != null) { - mOnItemSelectListener.onItemSelect(index); - } - }); - return scaleTransitionPagerTitleView; - } - - @Override - public IPagerIndicator getIndicator(Context context) { - LinePagerIndicator indicator = new LinePagerIndicator(context); - indicator.setMode(LinePagerIndicator.MODE_EXACTLY); - indicator.setLineHeight(UIUtil.dip2px(context, 4)); - indicator.setRoundRadius(UIUtil.dip2px(context, 2.0)); - indicator.setLineWidth(UIUtil.dip2px(context, 17)); - indicator.setColors(ContextCompat.getColor(context, R.color.appColor)); - FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - //lp.bottomMargin = 0; - indicator.setLayoutParams(lp); - return indicator; - } - - private RankNavigatorAdapter.OnItemSelectListener mOnItemSelectListener; - - public void setOnItemSelectListener(RankNavigatorAdapter.OnItemSelectListener mOnItemSelectListener) { - this.mOnItemSelectListener = mOnItemSelectListener; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java b/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java deleted file mode 100644 index 13ab2e788..000000000 --- a/app/src/main/java/com/yizhuan/erban/bills/widget/BillItemView.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.yizhuan.erban.bills.widget; - -import android.content.Context; -import android.content.res.TypedArray; -import android.util.AttributeSet; -import android.view.View; -import android.widget.ImageView; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.yizhuan.erban.R; - -/** - *

账单item

- * Created by Administrator on 2017/11/6. - */ -public class BillItemView extends RelativeLayout { - private ImageView mIvLeftIcon; - private TextView mTvItemText; - private View mViewLine; - private Context mContext; - - public BillItemView(Context context) { - this(context, null); - } - - public BillItemView(Context context, @Nullable AttributeSet attrs) { - this(context, attrs, 0); - } - - public BillItemView(Context context, @Nullable AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - init(context, attrs, defStyle); - } - - private void init(Context context, @Nullable AttributeSet attrs, int defStyle) { - mContext = context; - inflate(context, R.layout.layout_bill_item_view, this); - TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.BillItemView, defStyle, 0); - int leftIcon = a.getResourceId(R.styleable.BillItemView_left_icon, -1); - String itemText = a.getString(R.styleable.BillItemView_item_text); - boolean isHide = a.getBoolean(R.styleable.BillItemView_hide_line, false); - a.recycle(); - mIvLeftIcon = (ImageView) findViewById(R.id.iv_left_icon); - mTvItemText = (TextView) findViewById(R.id.tv_item_text); - mViewLine = findViewById(R.id.view_line); - - setBackgroundResource(R.drawable.bg_common_touch_while); - setData(leftIcon, itemText); - setViewLine(isHide); - } - - public void setData(int leftIconResId, int itemTextResId) { - setData(leftIconResId, mContext.getResources().getString(itemTextResId)); - } - - public void setData(int leftIconResId, String itemText) { - mIvLeftIcon.setImageResource(leftIconResId); - mTvItemText.setText(itemText); - } - - public void setViewLine(boolean isHide) { - mViewLine.setVisibility(!isHide ? VISIBLE : GONE); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java index 54ae7285e..9bea2374e 100644 --- a/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java +++ b/app/src/main/java/com/yizhuan/erban/common/widget/dialog/DialogUiHelper.java @@ -5,7 +5,6 @@ import android.content.Context; import com.yizhuan.erban.R; import com.yizhuan.erban.application.IReportConstants; import com.yizhuan.erban.application.ReportManager; -import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; import com.yizhuan.erban.ui.pay.ChargeActivity; import com.yizhuan.erban.ui.webview.CommonWebViewActivity; import com.yizhuan.xchat_android_core.Constants; @@ -27,25 +26,6 @@ public class DialogUiHelper { public static String CHARGE_FROM = ""; - /** - * 萝卜不足统一弹框处理 - */ - public static void showRadishNotEnoughDialog(Context context, DialogManager dialogManager) { - if (!ActivityUtil.isValidContext(context)) { - return; - } - if (dialogManager == null) { - dialogManager = new DialogManager(context); - } - String[] messages = new String[]{ResUtil.getString(R.string.widget_dialog_dialoguihelper_01), ResUtil.getString(R.string.widget_dialog_dialoguihelper_02)}; - dialogManager.showOkCancelWithTitleDialog(messages, ResUtil.getString(R.string.widget_dialog_dialoguihelper_03), true, () -> { - if (!ActivityUtil.isValidContext(context)) { - return; - } - TaskCenterActivity.start(context, TaskCenterActivity.FromPage.RADISH_NOT_ENOUGH_DIALOG); - }); - } - public static void showNeedCharge(Context context, DialogManager dialogManager) { if (!ActivityUtil.isValidContext(context)) { return; diff --git a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java b/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java index 9071b6d59..5ea5d7d1e 100644 --- a/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java +++ b/app/src/main/java/com/yizhuan/erban/decoration/helper/DecorationDialogHelper.java @@ -256,10 +256,7 @@ public class DecorationDialogHelper { } else { if (throwable instanceof BalanceNotEnoughExeption) { DialogUiHelper.showNeedCharge(context, dialogManager); - } else if (throwable instanceof RadishNotEnoughException) { - DialogUiHelper.showRadishNotEnoughDialog(context, dialogManager); } else { -// Toast.makeText(context, throwable.getMessage(), Toast.LENGTH_SHORT).show(); SingleToastUtil.showToastShort(throwable.getMessage()); } } diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyAttentionFragmentView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyAttentionFragmentView.java deleted file mode 100644 index 85d603a6c..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyAttentionFragmentView.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public interface IFamilyAttentionFragmentView extends IMvpBaseView{ - void onRefreshData(List attentionInfoList); - - void onLoadMoreData(List attentionInfoList); - - void onRefreshDataFail(String error); - - void onLoadMoreDataFail(String error); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencySearchView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencySearchView.java deleted file mode 100644 index 2b8b6fe20..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencySearchView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * @author jack - * @Description - * @Date 2018/5/30 - */ - -public interface IFamilyCurrencySearchView extends IMvpBaseView { - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencyView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencyView.java deleted file mode 100644 index f799c9e6a..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyCurrencyView.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public interface IFamilyCurrencyView extends IMvpBaseView { - void onLoadData(List billItemInfos, int page, int dataSize); - - void showErrorView(String message); - - void refreshData(); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFansListFragmentView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFansListFragmentView.java deleted file mode 100644 index 94bbe5da7..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFansListFragmentView.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public interface IFamilyFansListFragmentView extends IMvpBaseView { - void onRefreshData(FansListInfo fansListInfo); - - void onLoadMoreData(FansListInfo fansListInfo); - - void onRefreshDataFail(String message); - - void onLoadMoreDataFail(String message); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFriendListFragmentView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFriendListFragmentView.java deleted file mode 100644 index c57260313..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyFriendListFragmentView.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public interface IFamilyFriendListFragmentView extends IMvpBaseView { - - void onRefreshData(List userInfos); - - void onLoadMoreData(List userInfos); - - void onRefreshDataFail(String message); - - void onLoadMoreDataFail(String message); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyGameListActivityView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyGameListActivityView.java deleted file mode 100644 index e1b72c803..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyGameListActivityView.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/23 - */ - -public interface IFamilyGameListActivityView extends IMvpBaseView { - - void onLoadData(List data, int page); - - void onLoadDataFail(String error, int page); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyInfoView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyInfoView.java deleted file mode 100644 index aee9a426a..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyInfoView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public interface IFamilyInfoView extends IMvpBaseView { - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyManageActivityView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyManageActivityView.java deleted file mode 100644 index bc3c6d4dc..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyManageActivityView.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * @author jack - * @Description - * @Date 2018/5/25 - */ - -public interface IFamilyManageActivityView extends IMvpBaseView { - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberListView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberListView.java deleted file mode 100644 index d3c47f47d..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberListView.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public interface IFamilyMemberListView extends IMvpBaseView { - void onLoadData(List memberInfoList); - - void reloadFamilyMember(); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberSearchView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberSearchView.java deleted file mode 100644 index 599b218b7..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyMemberSearchView.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public interface IFamilyMemberSearchView extends IMvpBaseView { - - void update(List memberInfos); -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyPlazaActivityView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyPlazaActivityView.java deleted file mode 100644 index ad66b3313..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilyPlazaActivityView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * @author jack - * @Description - * @Date 2018/5/23 - */ - -public interface IFamilyPlazaActivityView extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySearchView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySearchView.java deleted file mode 100644 index a92f1e3ca..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySearchView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * @author jack - * @Description - * @Date 2018/5/2 - */ - -public interface IFamilySearchView extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySelectFriendActivityView.java b/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySelectFriendActivityView.java deleted file mode 100644 index 987dad727..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/contract/viewinterface/IFamilySelectFriendActivityView.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.erban.family.contract.viewinterface; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public interface IFamilySelectFriendActivityView extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java deleted file mode 100644 index c7c0ceadb..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyAttentionPresenter.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyAttentionFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public class FamilyAttentionPresenter extends BaseMvpPresenter { - private int mPage = Constants.PAGE_START; - private boolean isLoading = false; - - public void refreshData() { - loadData(Constants.PAGE_START); - } - public void loadMoreData() { - loadData(mPage + 1); - } - - private void loadData(int targetPage){ - if (isLoading){ - if (getMvpView() == null){ - return; - } - if (mPage == Constants.PAGE_START) { - getMvpView().onRefreshDataFail(ResUtil.getString(R.string.family_presenter_familyattentionpresenter_01)); - } else { - getMvpView().onLoadMoreDataFail(ResUtil.getString(R.string.family_presenter_familyattentionpresenter_02)); - } - return; - } - this.mPage = targetPage; - isLoading = true; - AttentionModel.get().getAttentionList( - AuthModel.get().getCurrentUid(), - mPage, - Constants.PAGE_SIZE - ) - .compose(bindToLifecycle()) - .subscribe(new SingleObserver>() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(List attentionInfos) { - isLoading = false; - if (mPage == Constants.PAGE_START){ - getMvpView().onRefreshData(attentionInfos); - }else { - getMvpView().onLoadMoreData(attentionInfos); - } - } - - @Override - public void onError(Throwable e) { - isLoading = false; - if (mPage == Constants.PAGE_START) { - getMvpView().onRefreshDataFail(e.getMessage()); - } else { - getMvpView().onLoadMoreDataFail(e.getMessage()); - } - } - }); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java deleted file mode 100644 index 7928d6c3b..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyCurrencyPresenter.java +++ /dev/null @@ -1,284 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.MonthlyRecord; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.SingleSource; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.disposables.Disposable; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public class FamilyCurrencyPresenter extends BaseMvpPresenter { - - private FamilyMoneyManagementInfo familyMoneyManagementInfo; - private List monthlyRecordList = new ArrayList<>(); - private List billItemInfos = new ArrayList<>(); - - private int page = Constants.PAGE_START; - private boolean isLoading = false; - - private SimpleDateFormat monthDateFormat = new SimpleDateFormat(ResUtil.getString(R.string.family_presenter_familycurrencypresenter_01), Locale.getDefault()); - private SimpleDateFormat dayDateFormat = new SimpleDateFormat(ResUtil.getString(R.string.family_presenter_familycurrencypresenter_02), Locale.getDefault()); - - private CompositeDisposable compositeDisposable; - - public FamilyMoneyManagementInfo getFamilyMoneyManagementInfo() { - return familyMoneyManagementInfo; - } - - public List getBillItemInfos() { - return billItemInfos; - } - - public FamilyCurrencyPresenter() { - - } - - @Override - public void onCreatePresenter(@Nullable Bundle saveState) { - super.onCreatePresenter(saveState); - this.compositeDisposable = new CompositeDisposable(); - addRxEvent(); - } - - - - @Override - public void onDestroyPresenter() { - super.onDestroyPresenter(); - if (this.compositeDisposable != null) { - this.compositeDisposable.dispose(); - this.compositeDisposable = null; - } - } - - private void addRxEvent() { - /** - * 转让或者贡献家族币后更新家族币信息 - */ - RxBusHelper.doOnMainThread(FamilyCurrencyUpdateEvent.class, compositeDisposable, new Consumer() { - @Override - public void accept(FamilyCurrencyUpdateEvent familyCurrencyUpdateEvent) throws Exception { - getMvpView().refreshData(); - } - }); - } - - /** - * 获取家族币 头部卡片信息 - * @return - */ - public Single loadData() { - - return FamilyModel.Instance().loadFamilyBillSummary() - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function>() { - @Override - public SingleSource apply(FamilyMoneyManagementInfo response) throws Exception { - familyMoneyManagementInfo = response; - return Single.just(familyMoneyManagementInfo); - } - }); - - } - - - - public void onRefreshRecordList(@NonNull String timeMillis){ - loadMemberRecordList(timeMillis,Constants.PAGE_START); - } - - public void onLoadMoreRecordList(@NonNull String timeMillis){ - loadMemberRecordList(timeMillis, this.page); - } - - /** - * 获取某个成员家族币流水 - * @param timeMillis - */ - private void loadMemberRecordList(@NonNull String timeMillis, int targetPage){ - long uid = AuthModel.get().getCurrentUid(); - if (uid <= 0){ - if (getMvpView() == null){ - return; - } - getMvpView().showErrorView(ResUtil.getString(R.string.family_presenter_familycurrencypresenter_03)); - return; - } - if (isLoading){ - if (getMvpView() == null){ - return; - } - getMvpView().showErrorView(ResUtil.getString(R.string.family_presenter_familycurrencypresenter_04)); - return; - } - page = targetPage; - isLoading = true; - FamilyModel.Instance().loadFamilyMemberBillRecordList( - String.valueOf(uid), - String.valueOf(page), - String.valueOf(Constants.PAGE_SIZE), - timeMillis - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(TradeMoneyRecord tradeMoneyRecord) { - isLoading = false; - if (page == Constants.PAGE_START){ - monthlyRecordList.clear(); - billItemInfos.clear(); - } - if (tradeMoneyRecord.getRecordMonVos().size() > 0) { - transferToViewModel(tradeMoneyRecord.getRecordMonVos()); - } - int recordSize = 0; - for (MonthlyRecord monthlyRecord : tradeMoneyRecord.getRecordMonVos()) { - recordSize += monthlyRecord.getList().size(); - } - if (page == Constants.PAGE_START && billItemInfos.isEmpty()) { - showNoData(Long.parseLong(timeMillis)); - } - getMvpView().onLoadData(billItemInfos, page, recordSize); - page ++; - } - - @Override - public void onError(Throwable e) { - isLoading = false; - getMvpView().showErrorView(e.getMessage()); - } - }); - - } - - /** - * 整合月份数据,转换数据 - * @param - * @return - */ - @NonNull - private void transferToViewModel(List recordMonVos) { - if (ListUtils.isListEmpty(recordMonVos)){ - return; - } - List recordList = new ArrayList<>(recordMonVos); - if (monthlyRecordList.size() == 0){ - monthlyRecordList.addAll(recordList); - }else{ - //分页的时候跨越月份了,整合起来 - MonthlyRecord monthlyRecord = monthlyRecordList.get(monthlyRecordList.size() - 1); - if (monthlyRecord.getMonth() == recordList.get(0).getMonth()){ - MonthlyRecord monthlyRecord1 = recordList.remove(0); - monthlyRecord.getList().addAll(monthlyRecord1.getList()); - for (MonthlyRecord.RecordItem recordItem : monthlyRecord1.getList()) { - VMBillItemInfo item = new VMBillItemInfo<>(VMBillItemInfo.TYPE_TRANSACTION_RECORD); - TransactionRecordInfo transactionRecordInfo = new TransactionRecordInfo(); - transactionRecordInfo.setAvatar(recordItem.getAvatar()); - transactionRecordInfo.setTitle(recordItem.getTitle()); - transactionRecordInfo.setData(recordItem.getAmount()); - transactionRecordInfo.setDate(dayDateFormat.format(new Date(recordItem.getTime()))); - transactionRecordInfo.setDesc("["+recordItem.getSource()+"]"); - transactionRecordInfo.setMoneyName(monthlyRecord.getMoneyName()); - transactionRecordInfo.setType(recordItem.getType()); - transactionRecordInfo.setUid(recordItem.getUid()); - item.setData(transactionRecordInfo); - billItemInfos.add(item); - } - } - monthlyRecordList.addAll(recordList); - } - - for (MonthlyRecord monthlyRecord : recordList) { - VMBillItemInfo dataItem = new VMBillItemInfo<>(VMBillItemInfo.TYPE_DATE_DIV); - BillDateDivInfo billDateDivInfo = new BillDateDivInfo(); - billDateDivInfo.setMoneyName(monthlyRecord.getMoneyName()); - billDateDivInfo.setDate(monthDateFormat.format(new Date(monthlyRecord.getMonth()))); - billDateDivInfo.setIncome(monthlyRecord.getIncome()); - billDateDivInfo.setExpend(monthlyRecord.getCost()); - dataItem.setData(billDateDivInfo); - billItemInfos.add(dataItem); - for (MonthlyRecord.RecordItem recordItem : monthlyRecord.getList()) { - VMBillItemInfo item = new VMBillItemInfo<>(VMBillItemInfo.TYPE_TRANSACTION_RECORD); - TransactionRecordInfo transactionRecordInfo = new TransactionRecordInfo(); - transactionRecordInfo.setAvatar(recordItem.getAvatar()); - transactionRecordInfo.setTitle(recordItem.getTitle()); - transactionRecordInfo.setData(recordItem.getAmount()); - transactionRecordInfo.setDate(dayDateFormat.format(new Date(recordItem.getTime()))); - transactionRecordInfo.setDesc("["+recordItem.getSource()+"]"); - transactionRecordInfo.setMoneyName(monthlyRecord.getMoneyName()); - transactionRecordInfo.setType(recordItem.getType()); - transactionRecordInfo.setUid(recordItem.getUid()); - item.setData(transactionRecordInfo); - billItemInfos.add(item); - } - } - } - - public void showNoData(long timeMills){ - VMBillItemInfo dataItem = new VMBillItemInfo<>(VMBillItemInfo.TYPE_DATE_DIV); -// BillDateDivInfo billDateDivInfo = new BillDateDivInfo(); -// billDateDivInfo.setMoneyName(familyMoneyManagementInfo.getMoneyName()); -// billDateDivInfo.setDate(monthDateFormat.format(new Date(timeMills))); -// billDateDivInfo.setIncome(0.0f); -// billDateDivInfo.setExpend(0.0f); -// dataItem.setData(billDateDivInfo); -// billItemInfos.add(dataItem); - VMBillItemInfo emptyTip = new VMBillItemInfo<>(VMBillItemInfo.TYPE_EMPTY_TIP); - billItemInfos.add(emptyTip); - } - - - /** - * 贡献家族币 - * @param count - */ - public Single contributionCurrency(double count) { - return FamilyModel.Instance().contributeCurrency( - count - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFansListPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFansListPresenter.java deleted file mode 100644 index fc76b5158..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFansListPresenter.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFansListFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public class FamilyFansListPresenter extends BaseMvpPresenter { - private int mPage = Constants.PAGE_START; - private boolean isLoading = false; - public void refreshData() { - loadData(Constants.PAGE_START); - } - - public void loadMoreData() { - loadData(mPage + 1); - } - - private void loadData(int targetPage){ - if (isLoading){ - if (getMvpView() == null){ - return; - } - if (mPage == Constants.PAGE_START){ - getMvpView().onRefreshDataFail(ResUtil.getString(R.string.family_presenter_familyfanslistpresenter_01)); - }else { - getMvpView().onLoadMoreDataFail(ResUtil.getString(R.string.family_presenter_familyfanslistpresenter_02)); - } - return; - } - this.mPage = targetPage; - isLoading = true; - AttentionModel.get().getFansList( - AuthModel.get().getCurrentUid(), - this.mPage, - Constants.PAGE_SIZE - ) - .compose(bindToLifecycle()) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(FansListInfo fansListInfo) { - isLoading = false; - if (mPage == Constants.PAGE_START){ - getMvpView().onRefreshData(fansListInfo); - }else { - getMvpView().onLoadMoreData(fansListInfo); - } - } - - @Override - public void onError(Throwable e) { - isLoading = false; - if (mPage == Constants.PAGE_START){ - getMvpView().onRefreshDataFail(e.getMessage()); - }else { - getMvpView().onLoadMoreDataFail(e.getMessage()); - } - } - }); - } - - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFriendListPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFriendListPresenter.java deleted file mode 100644 index b69c15ce8..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyFriendListPresenter.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFriendListFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public class FamilyFriendListPresenter extends BaseMvpPresenter { - private int mPage = Constants.PAGE_START; - private final int pageSize = Constants.PAGE_SIZE; - private boolean isLoading = false; - - public void refreshData() { - loadData(Constants.PAGE_START); - } - - public void loadMoreData() { - loadData(mPage + 1); - } - - private void loadData(int targetPage){ - if (isLoading){ - if (getMvpView() == null){ - return; - } - if (mPage == Constants.PAGE_START){ - getMvpView().onRefreshDataFail(ResUtil.getString(R.string.family_presenter_familyfriendlistpresenter_01)); - }else { - getMvpView().onLoadMoreDataFail(ResUtil.getString(R.string.family_presenter_familyfriendlistpresenter_02)); - } - return; - } - this.mPage = targetPage; - isLoading = true; - IMFriendModel.get().getMyFriendsUserInfos(mPage, pageSize) - .compose(bindToLifecycle()) - .subscribe(new SingleObserver>() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(List userInfos) { - isLoading = false; - if (mPage == Constants.PAGE_START){ - getMvpView().onRefreshData(userInfos); - }else { - getMvpView().onLoadMoreData(userInfos); - } - } - - @Override - public void onError(Throwable e) { - isLoading = false; - if (mPage == Constants.PAGE_START){ - getMvpView().onRefreshDataFail(e.getMessage()); - }else { - getMvpView().onLoadMoreDataFail(e.getMessage()); - } - } - }); - } - - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyGameListPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyGameListPresenter.java deleted file mode 100644 index 009b8208b..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyGameListPresenter.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyGameListActivityView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; - -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; - -/** - * @author jack - * @Description - * @Date 2018/7/23 - */ - -public class FamilyGameListPresenter extends BaseMvpPresenter { - - private AtomicInteger curPage = new AtomicInteger(Constants.PAGE_START); - private boolean isLoading = false; - - public void refreshData() { - curPage.set(Constants.PAGE_START); - loadMoreData(); - } - - - public void loadMoreData() { - loadData(curPage.get()) - .subscribe((familyGameInfos, throwable) -> { - if (throwable == null) { - getMvpView().onLoadData(familyGameInfos, curPage.getAndIncrement()); - } else { - getMvpView().onLoadDataFail(throwable.getMessage(), curPage.get()); - } - }); - } - - - private Single> loadData(int targetPage){ - FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily(); - if (familyInfo == null){ - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familygamelistpresenter_01))); - } - - if (isLoading){ - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familygamelistpresenter_02))); - } - isLoading = true; - return FamilyModel.Instance().loadFamilyGameList( - familyInfo.getFamilyId(), - targetPage, - Constants.PAGE_SIZE - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function, SingleSource>>() { - @Override - public SingleSource> apply(List familyGameInfos) throws Exception { - isLoading = false; - return Single.just(familyGameInfos); - } - }) - .doOnError(new Consumer() { - @Override - public void accept(Throwable throwable) throws Exception { - isLoading = false; - } - }); - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java deleted file mode 100644 index e60665121..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyHomePresenter.java +++ /dev/null @@ -1,180 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import android.os.Bundle; - -import androidx.annotation.Nullable; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.view.IFamilyHomeActivityView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyMemberUpdateEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; - -/** - * @author jack - * @Description - * @Date 2018/5/23 - */ - -public class FamilyHomePresenter extends BaseMvpPresenter { - - private FamilyInfo familyInfo; - private CompositeDisposable compositeDisposable; - - public FamilyInfo getFamilyInfo() { - return familyInfo; - } - - @Override - public void onCreatePresenter(@Nullable Bundle saveState) { - super.onCreatePresenter(saveState); - compositeDisposable = new CompositeDisposable(); - addEvent(); - } - - - - @Override - public void onDestroyPresenter() { - super.onDestroyPresenter(); - if (compositeDisposable != null){ - compositeDisposable.dispose(); - compositeDisposable = null; - } - } - - - private void addEvent() { - /** - * 转让或者贡献家族币后更新家族信息 - */ - RxBusHelper.doOnMainThread(FamilyCurrencyUpdateEvent.class, compositeDisposable, new Consumer() { - @Override - public void accept(FamilyCurrencyUpdateEvent familyCurrencyUpdateEvent) throws Exception { - getMvpView().reloadMyFamilyInfo(familyInfo.getFamilyId()); - } - }); - /** - * 修改家族相关信息更新家族信息事件 - */ - RxBusHelper.doOnMainThread(FamilyUpdateEvent.class, compositeDisposable, new Consumer() { - @Override - public void accept(FamilyUpdateEvent familyUpdateEvent) throws Exception { - if (familyUpdateEvent.getFamilyInfo() != null - && familyInfo.getFamilyId().equals(familyUpdateEvent.getFamilyInfo().getFamilyId())) { - familyInfo = familyUpdateEvent.getFamilyInfo(); - getMvpView().onLoadData(familyUpdateEvent.getFamilyInfo()); - } else if (familyUpdateEvent.getFamilyInfo() == null - && familyInfo.getEnterStatus() == FamilyInfo.STATUS_IN_FAMILY){ - getMvpView().close(); - } - - } - }); - - - /** - * 成员更新 - */ - RxBusHelper.doOnMainThread(FamilyMemberUpdateEvent.class, compositeDisposable, new Consumer() { - @Override - public void accept(FamilyMemberUpdateEvent familyMemberUpdateEvent) throws Exception { - getMvpView().reloadMyFamilyInfo(familyInfo.getFamilyId()); - } - }); - - } - /** - * 加载家族信息 - * @param familyId - */ - public Single loadData(String familyId) { - - return FamilyModel.Instance().loadFamilyHomeInfo( - familyId - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function>() { - @Override - public SingleSource apply(FamilyInfo familyInfo) throws Exception { - FamilyHomePresenter.this.familyInfo = familyInfo; - return Single.just(familyInfo); - } - }); - - - } - - /** - * 退出家族 - * @return - */ - public Single exitFamily() { - return FamilyModel.Instance().exitFamily() - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - - } - - /** - * 申请加入家族 - * @return - */ - public Single joinFamily(String str) { - if (null == familyInfo){ - return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyhomepresenter_01))); - } - - return FamilyModel.Instance().applyJoinFamily( - familyInfo.getFamilyId(), - str - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - - } - - /** - * 加入家族群 - * @return - */ - public Single joinFamilyGroup(String chatId, String message) { - - - return FamilyModel.Instance().joinFamilyGroup( - chatId, - message - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function>() { - @Override - public SingleSource apply(String response) throws Exception { - getMvpView().reloadMyFamilyInfo(familyInfo.getFamilyId()); - return Single.just(response); - } - }); - } - - /** - * 邀请朋友加入家族 - * @param friendUid - * @return - */ - public Single inviteFriendToFamily(long friendUid) { - return FamilyModel.Instance().inviteIntoFamily( - String.valueOf(friendUid) - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java deleted file mode 100644 index 2e448d44a..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyInfoPresenter.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyInfoView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import io.reactivex.Single; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public class FamilyInfoPresenter extends BaseMvpPresenter { - - /** - * 修改验证状态 - * @param isOn - * @return - */ - public Single changeVerifyStatus(final boolean isOn) { - final FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily(); - if (null == familyInfo){ - return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyinfopresenter_01))); - } - return FamilyModel.Instance().modifyFamilyInfo( - familyInfo.getFamilyId(), - null, - null, - isOn ? "1":"0" - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - - } - - /** - * 修改家族头像 - * @param url - * @return - */ - public Single changeFamilyAvatar(final String url) { - final FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily(); - if (null == familyInfo){ - return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyinfopresenter_02))); - } - return FamilyModel.Instance().modifyFamilyInfo( - familyInfo.getFamilyId(), - null, - url, - null - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - } - - /** - * 修改家族名称 - * @param str - * @return - */ - public Single changeFamilyName(final String str) { - final FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily(); - if (null == familyInfo){ - return Single.error(new Exception(ResUtil.getString(R.string.family_presenter_familyinfopresenter_03))); - } - return FamilyModel.Instance().modifyFamilyInfo( - familyInfo.getFamilyId(), - str, - null, - null - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java deleted file mode 100644 index 00a08d1a0..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyListPresenter.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; - -import java.util.List; - -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Function; - -/** - * @author jack - * @Description - * @Date 2018/5/24 - */ - -public class FamilyListPresenter extends BaseMvpPresenter { - - public Single> refreshData() { - return loadData(); - } - - - private Single> loadData(){ - return FamilyModel.Instance().loadFamilyRankingList( - RespFamilyRankList.TYPE_THIS_WEEK, - String.valueOf(Constants.PAGE_START), - String.valueOf(20) - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function>>() { - @Override - public SingleSource> apply(RespFamilyRankList response) throws Exception { - return Single.just(response.getFamilys()); - } - }); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyManagePresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyManagePresenter.java deleted file mode 100644 index ba220d0cf..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyManagePresenter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyManageActivityView; - -/** - * @author jack - * @Description - * @Date 2018/5/25 - */ - -public class FamilyManagePresenter extends BaseMvpPresenter { - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java deleted file mode 100644 index d0c99ef49..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberCurrencyPresenter.java +++ /dev/null @@ -1,210 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.MonthlyRecord; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public class FamilyMemberCurrencyPresenter extends BaseMvpPresenter { - - private List monthlyRecordList = new ArrayList<>(); - private List billItemInfos = new ArrayList<>(); - - private int page = Constants.PAGE_START; - private boolean isLoading = false; - - private SimpleDateFormat monthDateFormat = new SimpleDateFormat(ResUtil.getString(R.string.family_presenter_familymembercurrencypresenter_01), Locale.getDefault()); - private SimpleDateFormat dayDateFormat = new SimpleDateFormat(ResUtil.getString(R.string.family_presenter_familymembercurrencypresenter_02), Locale.getDefault()); - - - - public List getBillItemInfos() { - return billItemInfos; - } - - public FamilyMemberCurrencyPresenter() { - - } - - @Override - public void onCreatePresenter(@Nullable Bundle saveState) { - super.onCreatePresenter(saveState); - } - - - - @Override - public void onDestroyPresenter() { - super.onDestroyPresenter(); - } - - - public void onRefreshRecordList(@NonNull String timeMillis, String targetId){ - loadMemberRecordList(timeMillis, targetId, Constants.PAGE_START); - } - - public void onLoadMoreRecordList(@NonNull String timeMillis, String targetId){ - loadMemberRecordList(timeMillis,targetId, this.page); - } - - - /** - * 获取某个人家族币交易记录 - * - * @param timeMillis - * @param targetId - * @return - */ - private void loadMemberRecordList(@NonNull String timeMillis, String targetId, int targetPage){ - if (isLoading){ - if (getMvpView() == null){ - return; - } - getMvpView().showErrorView(ResUtil.getString(R.string.family_presenter_familymembercurrencypresenter_03)); - return; - } - page = targetPage; - isLoading = true; - FamilyModel.Instance().loadFamilyMemberBillRecordList( - targetId, - String.valueOf(page), - String.valueOf(Constants.PAGE_SIZE), - timeMillis - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(TradeMoneyRecord tradeMoneyRecord) { - isLoading = false; - if (page == Constants.PAGE_START){ - monthlyRecordList.clear(); - billItemInfos.clear(); - } - if (tradeMoneyRecord.getRecordMonVos().size() > 0) { - transferToViewModel(tradeMoneyRecord.getRecordMonVos()); - } - if (page == Constants.PAGE_START && billItemInfos.isEmpty()) { - showNoData(Long.parseLong(timeMillis)); - } - getMvpView().onLoadData(billItemInfos, page, tradeMoneyRecord.getRecordMonVos().size()); - page ++; - } - - @Override - public void onError(Throwable e) { - isLoading = false; - getMvpView().showErrorView(e.getMessage()); - } - }); - - } - - /** - * 整合月份数据,转换数据 - * @param - * @return - */ - @NonNull - private void transferToViewModel(List recordMonVos) { - if (ListUtils.isListEmpty(recordMonVos)){ - return; - } - if (monthlyRecordList.size() == 0){ - monthlyRecordList.addAll(recordMonVos); - }else{ - //分页的时候跨越月份了,整合起来 - MonthlyRecord monthlyRecord = monthlyRecordList.get(monthlyRecordList.size() - 1); - if (monthlyRecord.getMonth() == recordMonVos.get(0).getMonth()){ - MonthlyRecord monthlyRecord1 = recordMonVos.remove(0); - monthlyRecord.getList().addAll(monthlyRecord1.getList()); - for (MonthlyRecord.RecordItem recordItem : monthlyRecord1.getList()) { - VMBillItemInfo item = new VMBillItemInfo<>(VMBillItemInfo.TYPE_TRANSACTION_RECORD); - TransactionRecordInfo transactionRecordInfo = new TransactionRecordInfo(); - transactionRecordInfo.setAvatar(recordItem.getAvatar()); - transactionRecordInfo.setTitle(recordItem.getTitle()); - transactionRecordInfo.setData(recordItem.getAmount()); - transactionRecordInfo.setDate(dayDateFormat.format(new Date(recordItem.getTime()))); - transactionRecordInfo.setDesc("["+recordItem.getSource()+"]"); - transactionRecordInfo.setMoneyName(monthlyRecord.getMoneyName()); - item.setData(transactionRecordInfo); - billItemInfos.add(item); - } - } - monthlyRecordList.addAll(recordMonVos); - } - - for (MonthlyRecord monthlyRecord : recordMonVos) { - VMBillItemInfo dataItem = new VMBillItemInfo<>(VMBillItemInfo.TYPE_DATE_DIV); - BillDateDivInfo billDateDivInfo = new BillDateDivInfo(); - billDateDivInfo.setMoneyName(monthlyRecord.getMoneyName()); - billDateDivInfo.setDate(monthDateFormat.format(new Date(monthlyRecord.getMonth()))); - billDateDivInfo.setIncome(monthlyRecord.getIncome()); - billDateDivInfo.setExpend(monthlyRecord.getCost()); - dataItem.setData(billDateDivInfo); - billItemInfos.add(dataItem); - for (MonthlyRecord.RecordItem recordItem : monthlyRecord.getList()) { - VMBillItemInfo item = new VMBillItemInfo<>(VMBillItemInfo.TYPE_TRANSACTION_RECORD); - TransactionRecordInfo transactionRecordInfo = new TransactionRecordInfo(); - transactionRecordInfo.setAvatar(recordItem.getAvatar()); - transactionRecordInfo.setTitle(recordItem.getTitle()); - transactionRecordInfo.setData(recordItem.getAmount()); - transactionRecordInfo.setDate(dayDateFormat.format(new Date(recordItem.getTime()))); - transactionRecordInfo.setDesc("["+recordItem.getSource()+"]"); - transactionRecordInfo.setMoneyName(monthlyRecord.getMoneyName()); - item.setData(transactionRecordInfo); - billItemInfos.add(item); - } - } - - } - - public void showNoData(long timeMills){ - VMBillItemInfo dataItem = new VMBillItemInfo<>(VMBillItemInfo.TYPE_DATE_DIV); - BillDateDivInfo billDateDivInfo = new BillDateDivInfo(); - if (FamilyModel.Instance().getMyFamily() != null) { - billDateDivInfo.setMoneyName(FamilyModel.Instance().getMyFamily().getMoneyName()); - } - billDateDivInfo.setDate(monthDateFormat.format(new Date(timeMills))); - billDateDivInfo.setIncome(0.0f); - billDateDivInfo.setExpend(0.0f); - dataItem.setData(billDateDivInfo); - billItemInfos.add(dataItem); - VMBillItemInfo emptyTip = new VMBillItemInfo<>(VMBillItemInfo.TYPE_EMPTY_TIP); - billItemInfos.add(emptyTip); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java deleted file mode 100644 index bbd4072f0..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberListPresenter.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import android.os.Bundle; - -import androidx.annotation.Nullable; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberListView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.event.FamilyMemberUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.rxbus.RxBusHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public class FamilyMemberListPresenter extends BaseMvpPresenter { - - private int page = Constants.PAGE_START; - private boolean isLoading = false; - private CompositeDisposable compositeDisposable; - - @Override - public void onCreatePresenter(@Nullable Bundle saveState) { - super.onCreatePresenter(saveState); - compositeDisposable = new CompositeDisposable(); - addEvent(); - } - - - @Override - public void onDestroyPresenter() { - super.onDestroyPresenter(); - if (null != compositeDisposable){ - compositeDisposable.dispose(); - compositeDisposable.dispose(); - } - } - - private void addEvent() { - /** - * 成员更新 - */ - RxBusHelper.doOnMainThread(FamilyMemberUpdateEvent.class, compositeDisposable, new Consumer() { - @Override - public void accept(FamilyMemberUpdateEvent familyMemberUpdateEvent) throws Exception { - getMvpView().reloadFamilyMember(); - } - }); - } - - - public Single refreshData(){ - FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily(); - if (null == familyInfo) { - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_01))); - } - this.page = Constants.PAGE_START; - return loadData(familyInfo.getFamilyId(),Constants.PAGE_START); - } - - public Single loadMoreData() { - FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily(); - if (null == familyInfo) { - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_02))); - } - return loadData(familyInfo.getFamilyId(),this.page); - } - - private Single loadData(String familyId, int targetPage) { - - if (isLoading){ - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_03))); - } - this.page = targetPage; - isLoading = true; - return FamilyModel.Instance().loadFamilyMemberList( - familyId, - String.valueOf(page), - String.valueOf(Constants.PAGE_SIZE) - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function>() { - @Override - public SingleSource apply(RespFamilymember respFamilymember) throws Exception { - isLoading = false; - page++; - return Single.just(respFamilymember); - } - }) - .doOnError(new Consumer() { - @Override - public void accept(Throwable throwable) throws Exception { - isLoading = false; - } - }); - - } - - public FamilyInfo getFamilyInfo(){ - return FamilyModel.Instance().getMyFamily(); - } - - /** - * 移除家族成员 - * @param familyMemberInfo - */ - public Single removeFamilyMember(FamilyMemberInfo familyMemberInfo) { - if (null == familyMemberInfo){ - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymemberlistpresenter_04))); - } - return FamilyModel.Instance().kickOutFamily( - String.valueOf(familyMemberInfo.getUid()) - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - } - - /** - * 家族币转让 - * @param familyMemberInfo - * @param count - * @return - */ - public Single transferCurrency(FamilyMemberInfo familyMemberInfo, double count) { - return FamilyModel.Instance().transferCurrency( - String.valueOf(familyMemberInfo.getUid()), - count - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java deleted file mode 100644 index 3cc2c388f..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyMemberSearchPresenter.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberSearchView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Function; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public class FamilyMemberSearchPresenter extends BaseMvpPresenter { - private int page = Constants.PAGE_START; - private String searchStr; - - public FamilyInfo getFamilyInfo(){ - return FamilyModel.Instance().getMyFamily(); - } - - public Single> search(String str) { - page = Constants.PAGE_START; - searchStr = str; - return loadData(searchStr); - } - - private Single> loadData(String searchKey) { - - FamilyInfo familyInfo = FamilyModel.Instance().getMyFamily(); - if (null == familyInfo) { - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymembersearchpresenter_01))); - } - - return FamilyModel.Instance().searchFamilyMemberList( - familyInfo.getFamilyId(), - null, - null, - searchKey - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function>>() { - @Override - public SingleSource> apply(RespFamilymember respFamilymember) throws Exception { - page++; - return Single.just(respFamilymember.getMembers()); - } - }); - - } - - public Single> loadMoreData() { - return loadData(searchStr); - } - - /** - * 移除家族成员 - * @param familyMemberInfo - */ - public Single removeFamilyMember(FamilyMemberInfo familyMemberInfo) { - if (null == familyMemberInfo){ - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familymembersearchpresenter_02))); - } - return FamilyModel.Instance().kickOutFamily( - String.valueOf(familyMemberInfo.getUid()) - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - } - - /** - * 家族币转让 - * @param familyMemberInfo - * @param count - * @return - */ - public Single transferCurrency(FamilyMemberInfo familyMemberInfo, double count) { - return FamilyModel.Instance().transferCurrency( - String.valueOf(familyMemberInfo.getUid()), - count - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyPlazaPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyPlazaPresenter.java deleted file mode 100644 index e348782b8..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilyPlazaPresenter.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyPlazaActivityView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; - -import io.reactivex.Single; - -/** - * @author jack - * @Description - * @Date 2018/5/23 - */ - -public class FamilyPlazaPresenter extends BaseMvpPresenter { - - public FamilyPlazaPresenter() { - - } - - public Single loadWeeklyRankData() { - return FamilyModel.Instance().loadFamilyRankingList( - RespFamilyRankList.TYPE_THIS_WEEK, - String.valueOf(Constants.PAGE_START), - String.valueOf(6) - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)); - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java deleted file mode 100644 index 5a0afc468..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySearchPresent.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yizhuan.erban.family.presenter; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.PresenterEvent; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -import io.reactivex.Single; -import io.reactivex.SingleSource; -import io.reactivex.functions.Consumer; -import io.reactivex.functions.Function; - -/** - * @author jack - * @Description - * @Date 2018/5/24 - */ - -public class FamilySearchPresent extends BaseMvpPresenter { - - private String searchStr = null; - - private int page = Constants.PAGE_START; - private boolean isLoading = false; - - public Single> search(String str) { - this.searchStr = str; - return loadData(Constants.PAGE_START); - } - - public Single> loadMoreData(){ - return loadData(this.page); - } - - - private Single> loadData(int targetPage){ - if (isLoading){ - return Single.error(new Throwable(ResUtil.getString(R.string.family_presenter_familysearchpresent_01))); - } - this.page = targetPage; - isLoading = true; - return FamilyModel.Instance().searchFamilyInfos( - this.searchStr, - page - ) - .compose(bindUntilEvent(PresenterEvent.DESTROY)) - .flatMap(new Function>>() { - @Override - public SingleSource> apply(RespFamily response) throws Exception { - isLoading = false; - page++; - return Single.just(response.getFamilys()); - } - }) - .doOnError(new Consumer() { - @Override - public void accept(Throwable throwable) throws Exception { - isLoading = false; - } - }); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySelectFriendPresenter.java b/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySelectFriendPresenter.java deleted file mode 100644 index 7b2c588e0..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/presenter/FamilySelectFriendPresenter.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.erban.family.presenter; - - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySelectFriendActivityView; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public class FamilySelectFriendPresenter extends BaseMvpPresenter { -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java deleted file mode 100644 index 59bd656e5..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyCurrencyActivity.java +++ /dev/null @@ -1,323 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.graphics.Typeface; -import android.os.Bundle; -import android.text.SpannableString; -import android.text.Spanned; -import android.text.style.StyleSpan; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.jay.widget.StickyHeadersLinearLayoutManager; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; -import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.erban.family.presenter.FamilyCurrencyPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyCurrencyBillAdapter; -import com.yizhuan.erban.family.view.dialog.FamilyContributionDialog; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyCurrencyPresenter.class) -public class FamilyCurrencyActivity extends BaseMvpActivity - implements IFamilyCurrencyView, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener, OnDateSetListener { - - private TextView tvFamilyCurrencyLabel; - private TextView tvFamilyCurrencyBalance; - private ImageView ivFamilyCurrencyHelp; - private TextView tvAction; - private TextView tvFamilyCurrencyIncome; - private TextView tvFamilyCurrencyExpenditure; - private LinearLayout llSearch; - - private SwipeRefreshLayout swipeRefresh; - private RecyclerView rvFamilyCurrency; - private FamilyCurrencyBillAdapter adapter; - - protected TimePickerDialog.Builder mDialogYearMonthDayBuild; - - private String selectDate; - - public static void start(Context context) { - Intent intent = new Intent(context, FamilyCurrencyActivity.class); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_currency); - initTitleBar(""); - - - View header = LayoutInflater.from(this).inflate(R.layout.header_famiy_currency_bill,null,false); - tvFamilyCurrencyLabel = (TextView) header.findViewById(R.id.tv_family_currency_label); - tvFamilyCurrencyBalance = (TextView) header.findViewById(R.id.tv_family_currency_balance); - tvAction = (TextView) header.findViewById(R.id.tv_action); - tvFamilyCurrencyIncome = (TextView) header.findViewById(R.id.tv_family_currency_income); - tvFamilyCurrencyExpenditure = (TextView) header.findViewById(R.id.tv_family_currency_expenditure); - llSearch = (LinearLayout) header.findViewById(R.id.ll_search); - ivFamilyCurrencyHelp = (ImageView) header.findViewById(R.id.iv_family_currency_help); - - - swipeRefresh = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh); - swipeRefresh.setOnRefreshListener(this); - - rvFamilyCurrency = (RecyclerView) findViewById(R.id.rv_family_currency); - rvFamilyCurrency.setItemAnimator(null); - rvFamilyCurrency.setLayoutManager(new StickyHeadersLinearLayoutManager(this,LinearLayoutManager.VERTICAL, false)); - adapter = new FamilyCurrencyBillAdapter(this,null); - adapter.addHeaderView(header); - adapter.setEnableLoadMore(true); - adapter.setOnLoadMoreListener(this, rvFamilyCurrency); - adapter.setOnDateSelectListener(new FamilyCurrencyBillAdapter.OnDateSelectListener() { - @Override - public void onDateSelect() { - mDialogYearMonthDayBuild.build().show(getSupportFragmentManager(), "year_month"); - } - }); - rvFamilyCurrency.setAdapter(adapter); - - mDialogYearMonthDayBuild = new TimePickerDialog.Builder() - .setType(Type.YEAR_MONTH) - .setTitleStringId(ResUtil.getString(R.string.view_activity_familycurrencyactivity_01)) - .setThemeColor(getResources().getColor(R.color.line_background)) - .setWheelItemTextNormalColor(getResources().getColor(R.color - .timetimepicker_default_text_color)) - .setWheelItemTextSelectorColor(getResources().getColor(R.color.black)) - .setCallBack(this); - - this.selectDate = String.valueOf(System.currentTimeMillis()); - } - - @Override - public void onDateSet(TimePickerDialog timePickerView, long millseconds) { - this.selectDate = String.valueOf(millseconds); - getMvpPresenter().onRefreshRecordList(selectDate); - } - - @Override - protected void onResume() { - super.onResume(); - if (null == getMvpPresenter().getFamilyMoneyManagementInfo()){ - swipeRefresh.setRefreshing(true); - getMvpPresenter().loadData().subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(FamilyMoneyManagementInfo familyMoneyManagementInfo) { - showCard(familyMoneyManagementInfo); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - getMvpPresenter().onRefreshRecordList(selectDate); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - if (mDialogYearMonthDayBuild != null) { - mDialogYearMonthDayBuild.setCallBack(null); - mDialogYearMonthDayBuild = null; - } - } - - /** - * 显示头部卡片 - * @param familyMoneyManagementInfo - */ - private void showCard(FamilyMoneyManagementInfo familyMoneyManagementInfo) { - - String moneyName = familyMoneyManagementInfo.getMoneyName(); - String incomeStr = FormatUtils.formatToShortDown(familyMoneyManagementInfo.getIncomeAndCost().getIncome()); - String expendStr = FormatUtils.formatToShortDown(familyMoneyManagementInfo.getIncomeAndCost().getCost()); - StyleSpan boldSpan = new StyleSpan(Typeface.BOLD); - - tvFamilyCurrencyLabel.setText(String.format( - getString(R.string.family_currency_balance_label), - moneyName - )); - - - - SpannableString incomeSpan = new SpannableString(incomeStr + moneyName); - incomeSpan.setSpan(boldSpan,0,incomeStr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - tvFamilyCurrencyIncome.setText(incomeSpan); - - SpannableString expendSpan = new SpannableString(expendStr + moneyName); - expendSpan.setSpan(boldSpan,0,expendStr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - tvFamilyCurrencyExpenditure.setText(expendSpan); - - tvFamilyCurrencyBalance.setText(FormatUtils.formatToShortDown(familyMoneyManagementInfo.getTotalAmount())); - - if (familyMoneyManagementInfo.getPosition() == FamilyMemberInfo.LEVEL_PATRIARCH){ - mTitleBar.setTitle(R.string.family_currency); - llSearch.setVisibility(View.VISIBLE); - llSearch.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - FamilyMemberSearchActivity.start(FamilyCurrencyActivity.this,FamilyMemberListActivity.TYPE_CHECK_MEMBER_CURRENCY); - } - }); - ivFamilyCurrencyHelp.setVisibility(View.VISIBLE); - ivFamilyCurrencyHelp.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - CommonWebViewActivity.start(FamilyCurrencyActivity.this, UriProvider.getFamilyCurrencyHelpUrl()); - } - }); - tvAction.setText(String.format( - getString(R.string.family_currency_transfer), - moneyName)); - tvAction.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - FamilyMemberListActivity.start(FamilyCurrencyActivity.this,FamilyMemberListActivity.TYPE_SELECT_MEMBER); - } - }); - - }else { - mTitleBar.setTitle(R.string.family_my_currency); - llSearch.setVisibility(View.GONE); - ivFamilyCurrencyHelp.setVisibility(View.INVISIBLE); - tvAction.setText(String.format( - getString(R.string.family_currency_contribution), - moneyName)); - tvAction.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showContributeDialog(); - } - }); - } - } - - - @Override - public void onLoadData(List billItemInfos,int page, int dataSize) { - if (page == Constants.PAGE_START){ - swipeRefresh.setRefreshing(false); - if (!ListUtils.isListEmpty(billItemInfos)) { - adapter.setNewData(billItemInfos); - } - }else { - if (dataSize > 0) { - adapter.loadMoreComplete(); - adapter.notifyDataSetChanged(); - }else { - adapter.loadMoreEnd(true); - } - } - - } - - @Override - public void onRefresh() { - this.selectDate = String.valueOf(System.currentTimeMillis()); - getMvpPresenter().loadData().subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(FamilyMoneyManagementInfo familyMoneyManagementInfo) { - showCard(familyMoneyManagementInfo); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - getMvpPresenter().onRefreshRecordList(selectDate); - } - - - @Override - public void onLoadMoreRequested() { - getMvpPresenter().onLoadMoreRecordList(selectDate); - } - - - - @Override - public void showErrorView(String message) { - swipeRefresh.setRefreshing(false); - toast(message); - } - - @Override - public void refreshData() { - onRefresh(); - } - - private void showContributeDialog(){ - FamilyContributionDialog dialog = new FamilyContributionDialog(this, getMvpPresenter().getFamilyMoneyManagementInfo()); - dialog.setOnOperationListener(new FamilyContributionDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog, double count) { - dialog.dismiss(); - getMvpPresenter().contributionCurrency(count) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familycurrencyactivity_02)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - } - }); - dialog.show(); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java deleted file mode 100644 index 1337803f4..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyGameListActivity.java +++ /dev/null @@ -1,179 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; - -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.netease.nim.uikit.common.util.sys.NetworkUtil; -import com.scwang.smartrefresh.layout.SmartRefreshLayout; -import com.scwang.smartrefresh.layout.api.RefreshLayout; -import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; -import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyGameListActivityView; -import com.yizhuan.erban.family.presenter.FamilyGameListPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyGameListAdapter; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyGameListPresenter.class) -public class FamilyGameListActivity extends BaseMvpActivity - implements IFamilyGameListActivityView { - - private SmartRefreshLayout swipeRefresh; - private RecyclerView recyclerView; - private FamilyGameListAdapter adapter; - - - public static void start(Activity activity) { - Intent intent = new Intent(activity, FamilyGameListActivity.class); - activity.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_game_list); - - initTitleBar(getString(R.string.family_games)); - - - swipeRefresh = findViewById(R.id.swipe_refresh); - swipeRefresh.setEnableLoadmore(true); - swipeRefresh.setEnableRefresh(true); - swipeRefresh.setOnRefreshLoadmoreListener(new OnRefreshLoadmoreListener() { - @Override - public void onLoadmore(RefreshLayout refreshlayout) { - if (!NetworkUtil.isNetAvailable(FamilyGameListActivity.this)) { - swipeRefresh.finishLoadmore(); - return; - } - List data = adapter.getData(); - if (ListUtils.isListEmpty(data)) { - swipeRefresh.finishLoadmore(); - return; - } - getMvpPresenter().loadMoreData(); - } - - @Override - public void onRefresh(RefreshLayout refreshlayout) { - if (!NetworkUtil.isNetAvailable(FamilyGameListActivity.this)) { - swipeRefresh.finishRefresh(); - return; - } - getMvpPresenter().refreshData(); - } - }); - - recyclerView = (RecyclerView) findViewById(R.id.recycler_view); - recyclerView.setLayoutManager(new GridLayoutManager(this, 4)); - adapter = new FamilyGameListAdapter(this, null); - View headerView = LayoutInflater.from(this).inflate(R.layout.layout_search_header, null,false); - adapter.addHeaderView(headerView); - adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { - @Override - public void onItemClick(BaseQuickAdapter adapter, View view, int position) { - FamilyGameInfo familyGameInfo = (FamilyGameInfo) adapter.getData().get(position); - if (FamilyModel.Instance().getMyFamily() != null) { - FamilyGameInfo gameInfo = (FamilyGameInfo) adapter.getData().get(position); - CommonWebViewActivity.start(FamilyGameListActivity.this, gameInfo.getLink()); - }else { - toast(ResUtil.getString(R.string.view_activity_familygamelistactivity_01)); - } - } - }); - - recyclerView.setAdapter(adapter); - - requestFamilyInfo(); - } - - /** - * 这里获取家族信息,决定是否能使用游戏 - */ - private void requestFamilyInfo() { - if (FamilyModel.Instance().getMyFamily() == null) { - return; - } - FamilyModel.Instance().loadFamilySimpleInfo( - FamilyModel.Instance().getMyFamily().getFamilyId() - ) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(FamilyInfo familyInfo) { - if (!familyInfo.isOpenGame()){ - toast(ResUtil.getString(R.string.view_activity_familygamelistactivity_02)); - finish(); - } - } - - @Override - public void onError(Throwable e) { - - } - }); - } - - @Override - protected void onResume() { - super.onResume(); - getMvpPresenter().refreshData(); - } - - @Override - public void onLoadData(List data, int page) { - if (!ListUtils.isListEmpty(data)) { - hideStatus(); - if (page == Constants.PAGE_START) { - adapter.setNewData(data); - swipeRefresh.finishRefresh(); - } else { - adapter.addData(data); - swipeRefresh.finishLoadmore(); - } - } else { - if (page == Constants.PAGE_START) { - swipeRefresh.finishRefresh(); - showNoData(R.drawable.icon_common_failure, getText(R.string.text_my_master_and_apprentices_no_data)); - } else { - swipeRefresh.finishLoadmore(); - } - } - } - - @Override - public void onLoadDataFail(String error, int page) { - if (page == Constants.PAGE_START) { - swipeRefresh.finishRefresh(); - showNoData(R.drawable.icon_common_failure, getText(R.string.text_my_master_and_apprentices_no_data)); - } else { - swipeRefresh.finishLoadmore(); - } - toast(error); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java deleted file mode 100644 index f1eb44b17..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyHomeActivity.java +++ /dev/null @@ -1,793 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.graphics.Color; -import android.graphics.Typeface; -import android.os.Bundle; -import android.text.SpannableString; -import android.text.Spanned; -import android.text.TextUtils; -import android.text.style.StyleSpan; -import android.view.View; -import android.widget.ImageView; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.makeramen.roundedimageview.RoundedImageView; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.util.Utils; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.erban.family.presenter.FamilyHomePresenter; -import com.yizhuan.erban.family.view.adapter.FamilyGamesAdapter; -import com.yizhuan.erban.family.view.adapter.FamilyGroupAdapter; -import com.yizhuan.erban.family.view.adapter.FamilyMemberAdapter; -import com.yizhuan.erban.family.view.dialog.FamilyDisbandDialog; -import com.yizhuan.erban.family.view.dialog.FamilyGuideDialog; -import com.yizhuan.erban.family.view.dialog.FamilyJoinDialog; -import com.yizhuan.erban.family.view.dialog.FamilyMenuDialog; -import com.yizhuan.erban.family.view.fragment.FamilyEmptyFragment; -import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.home.view.IFamilyHomeActivityView; -import com.yizhuan.erban.team.view.CreateTeamMessageActivity; -import com.yizhuan.erban.team.view.NimTeamMessageActivity; -import com.yizhuan.erban.ui.user.activity.UserInfoActivity; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.erban.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyGroupInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; -import com.yizhuan.xchat_android_library.utils.log.MLog; -import com.yizhuan.xchat_android_library.widget.DrawableCenterTextView; - -import cn.sharesdk.framework.Platform; -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyHomePresenter.class) -public class FamilyHomeActivity extends BaseMvpActivity - implements IFamilyHomeActivityView, View.OnClickListener, ShareDialog.OnShareDialogItemClick { - - private final String share_pref_is_first_in_family = "share_pref_is_first_in_family"; - - private ImageView ivFamilyBg; - private RoundedImageView rivCover; - private TextView tvName; - private TextView tvId; - private TextView tvMemberCount; - private DrawableCenterTextView tvFamilyManage; - private LinearLayout llMyFamilyCurrency; - private TextView tvMyFamilyCurrency; - private LinearLayout llFamilyPatriarch; - private CircleImageView civPatriarchAvatar; - private TextView tvPatriarchName; - private LinearLayout llFamilyGames; - private LinearLayout llFamilyMember; - private TextView tvFamilyMemberTitle; - private TextView tvFamilyGroupTitle; - private TextView tvCreateGroup; - private RecyclerView rvFamilyGroupList; - private LinearLayout llNoGroup; - private DrawableCenterTextView rlJoinFamily; - private TextView tvAllMember; - - private FamilyGamesAdapter gamesAdapter; - private FamilyMemberAdapter memberAdapter; - private FamilyGroupAdapter groupAdapter; - - private String familyId; - private ShareDialog shareDialog; - - public static void start(Context activity,String familyId) { - Intent intent = new Intent(activity,FamilyHomeActivity.class); - if(familyId != null){ - Bundle bundle = new Bundle(); - bundle.putString(BundleKeys.KEY_EXTRA_1, familyId); - intent.putExtras(bundle); - } - activity.startActivity(intent); - } - - @Override - protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - familyId = getIntent().getStringExtra(BundleKeys.KEY_EXTRA_1); - if(familyId == null){ - showNoData(); - } else { - showLoading(); - loadFamilyInfo(familyId); - } - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - familyId = getIntent().getStringExtra(BundleKeys.KEY_EXTRA_1); - setContentView(R.layout.activity_family_home); - initTitleBar(""); - - ivFamilyBg = findViewById(R.id.iv_family_bg); - rivCover = findViewById(R.id.riv_cover); - tvName = findViewById(R.id.tv_name); - tvId = findViewById(R.id.tv_id); - tvMemberCount = findViewById(R.id.tv_member_count); - - tvFamilyManage = findViewById(R.id.tv_family_manage); - - llMyFamilyCurrency = findViewById(R.id.ll_my_family_currency); - tvMyFamilyCurrency = findViewById(R.id.tv_my_family_currency); - - llFamilyPatriarch = findViewById(R.id.ll_family_patriarch); - civPatriarchAvatar = findViewById(R.id.civ_patriarch_avatar); - tvPatriarchName = findViewById(R.id.tv_patriarch_name); - - llFamilyGames = findViewById(R.id.ll_family_games); - RecyclerView rvFamilyGameList = findViewById(R.id.rv_family_game_list); - - tvAllMember = findViewById(R.id.tv_all_member); - llFamilyMember = findViewById(R.id.ll_family_member); - tvFamilyMemberTitle = findViewById(R.id.tv_family_member_title); - RecyclerView rvFamilyMemberList = findViewById(R.id.rv_family_member_list); - - tvFamilyGroupTitle = findViewById(R.id.tv_family_group_title); - tvCreateGroup = findViewById(R.id.tv_create_group); - rvFamilyGroupList = findViewById(R.id.rv_family_group_list); - llNoGroup = findViewById(R.id.ll_no_group); - - rlJoinFamily = findViewById(R.id.rl_join_family); - - rvFamilyGameList.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)); - rvFamilyGameList.addItemDecoration(new ColorDecoration(Color.TRANSPARENT, Utils.dip2px(this, 20), 0, false)); - gamesAdapter = new FamilyGamesAdapter(this, null); - gamesAdapter.setOnItemClickListener((adapter, view, position) -> { - if (getMvpPresenter().getFamilyInfo().getEnterStatus() == FamilyInfo.STATUS_IN_FAMILY) { - FamilyGameInfo gameInfo = (FamilyGameInfo) adapter.getData().get(position); - CommonWebViewActivity.start(FamilyHomeActivity.this, gameInfo.getLink()); - } else { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_01)); - } - }); - rvFamilyGameList.setAdapter(gamesAdapter); - - rvFamilyMemberList.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)); - rvFamilyMemberList.addItemDecoration(new ColorDecoration(Color.TRANSPARENT, Utils.dip2px(this, 20), 0, false)); - memberAdapter = new FamilyMemberAdapter(this, null); - memberAdapter.setOnItemClickListener((adapter, view, position) -> { - FamilyMemberInfo memberInfo = (FamilyMemberInfo) adapter.getData().get(position); - UserInfoActivity.Companion.start(FamilyHomeActivity.this, memberInfo.getUid()); - }); - rvFamilyMemberList.setAdapter(memberAdapter); - - rvFamilyGroupList.setLayoutManager(new FullyLinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); - rvFamilyGroupList.addItemDecoration(new ColorDecoration(getResources().getColor(R.color.color_F1F1F1), 0, 1, false)); - groupAdapter = new FamilyGroupAdapter(this, null); - groupAdapter.setActionListener(new FamilyGroupAdapter.ActionListener() { - @Override - public void onJoin(FamilyGroupInfo groupInfo) { - joinFamilyGroup(groupInfo); - } - - @Override - public void onGotoGroup(FamilyGroupInfo groupInfo) { - NimTeamMessageActivity.start(FamilyHomeActivity.this, groupInfo.getTid()); - } - }); - - rvFamilyGroupList.setAdapter(groupAdapter); - - } - - private void showFamilyManage(boolean isShow) { - if (isShow) { - tvFamilyManage.setVisibility(View.VISIBLE); - tvFamilyManage.setOnClickListener(this); - } else { - tvFamilyManage.setVisibility(View.GONE); - tvFamilyManage.setOnClickListener(null); - } - } - - private void showFamilyView(FamilyInfo data) { - if (null == data) { - return; - } - if (!TextUtils.isEmpty(data.getBackground())) { - GlideApp.with(this) - .load(data.getBackground()) - .dontAnimate() - .into(ivFamilyBg); - } else { - GlideApp.with(this) - .load(R.mipmap.bg_family_home) - .dontAnimate() - .into(ivFamilyBg); - } - - GlideApp.with(this) - .load(data.getFamilyIcon()) - .placeholder(R.drawable.default_cover) - .into(rivCover); - tvName.setText(data.getFamilyName()); - tvId.setText(data.getFamilyId()); - tvMemberCount.setText(String.valueOf(data.getMemberCount())); - - if (ListUtils.isListEmpty(data.getGames()) || !data.isOpenGame()) { - llFamilyGames.setVisibility(View.GONE); - } else { - llFamilyGames.setVisibility(View.VISIBLE); - gamesAdapter.setNewData(data.getGames()); - } - - - if (FamilyInfo.STATUS_NOT_IN_FAMILY == data.getEnterStatus()) { - showFamilyManage(false); - - llMyFamilyCurrency.setVisibility(View.GONE); - llFamilyPatriarch.setVisibility(View.VISIBLE); - llFamilyMember.setVisibility(View.GONE); - rlJoinFamily.setVisibility(View.VISIBLE); - rlJoinFamily.setOnClickListener(this); - showTitleBar(data.getFamilyName(), false); - - tvCreateGroup.setVisibility(View.GONE); - - FamilyMemberInfo patriarch = data.getLeader(); - GlideApp.with(this) - .load(patriarch.getIcon()) - .placeholder(R.drawable.default_cover) - .into(civPatriarchAvatar); - - tvPatriarchName.setText(patriarch.getName()); - llFamilyPatriarch.setOnClickListener(v -> - UserInfoActivity.Companion.start(FamilyHomeActivity.this, patriarch.getUid()) - ); - - } else { - - llMyFamilyCurrency.setVisibility(View.VISIBLE); - llMyFamilyCurrency.setOnClickListener(this); - llFamilyPatriarch.setVisibility(View.GONE); - llFamilyMember.setVisibility(View.VISIBLE); - tvAllMember.setOnClickListener(this); - rlJoinFamily.setVisibility(View.GONE); - - showTitleBar(getString(R.string.family_mine), true); - - if (data.getPosition() == FamilyInfo.LEVEL_PATRIARCH) { - showFamilyManage(true); - tvCreateGroup.setVisibility(View.VISIBLE); - tvCreateGroup.setOnClickListener(this); - showFamilyGuide(); - - } else { - showFamilyManage(false); - tvCreateGroup.setVisibility(View.GONE); - tvCreateGroup.setOnClickListener(null); - } - - if (data.isOpenMoney()) { - llMyFamilyCurrency.setVisibility(View.VISIBLE); - tvMyFamilyCurrency.setText(String.format( - getResources().getString(R.string.family_currency_count), - FormatUtils.formatToShortDown(data.getFamilyMoney()), - data.getMoneyName())); - } else { - llMyFamilyCurrency.setVisibility(View.GONE); - } - - tvFamilyMemberTitle.setText(String.format( - getResources().getString(R.string.family_member_title), - String.valueOf(data.getMemberCount()) - )); - memberAdapter.setNewData(data.getMembers()); - - } - - tvFamilyGroupTitle.setText(String.format( - getResources().getString(R.string.family_group_title), - String.valueOf(data.getGroups().size()) - )); - - if (!ListUtils.isListEmpty(data.getGroups())) { - llNoGroup.setVisibility(View.GONE); - rvFamilyGroupList.setVisibility(View.VISIBLE); - groupAdapter.setNewData(data.getGroups()); - } else { - llNoGroup.setVisibility(View.VISIBLE); - rvFamilyGroupList.setVisibility(View.GONE); - } - - } - - private void showTitleBar(String title, boolean isMore) { - mTitleBar.setTitle(title); - mTitleBar.removeAllActions(); - - mTitleBar.addAction(new TitleBar.ImageAction(R.drawable.ic_family_share) { - @Override - public void performAction(View view) { - shareDialog = new ShareDialog(FamilyHomeActivity.this); - shareDialog.setOnShareDialogItemClick(FamilyHomeActivity.this); - shareDialog.show(); - } - }); - - if (isMore) - mTitleBar.addAction(new TitleBar.ImageAction(R.drawable.ic_family_more) { - @Override - public void performAction(View view) { - showMenuDialog(view); - } - }); - } - - private void showMenuDialog(View view) { - FamilyMenuDialog dialog = new FamilyMenuDialog(this, getMvpPresenter().getFamilyInfo(), view); - dialog.setOnMenuClickListener(new FamilyMenuDialog.OnMenuClickListener() { - @Override - public void onExitFamily(DialogInterface dialog, FamilyInfo familyInfo) { - dialog.dismiss(); - getDialogManager().showOkCancelWithTitleDialog(new String[]{ResUtil.getString(R.string.view_activity_familyhomeactivity_02), ResUtil.getString(R.string.view_activity_familyhomeactivity_03), ResUtil.getString(R.string.view_activity_familyhomeactivity_04)}, - () -> getMvpPresenter().exitFamily().subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_05)); - finish(); - } - - @Override - public void onError(Throwable e) { -// Toast.makeText(FamilyHomeActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort(e.getMessage()); - } - })); - } - - @Override - public void onDisbandFamily(DialogInterface dialog, FamilyInfo familyInfo) { //解散家族 - dialog.dismiss(); - FamilyDisbandDialog disbandFamilyDialog = new FamilyDisbandDialog(FamilyHomeActivity.this); - disbandFamilyDialog.show(); - } - - @Override - public void onInviteFriends(DialogInterface dialog, FamilyInfo familyInfo) { - FamilySelectFriendActivity.start(FamilyHomeActivity.this, (activity, uid) -> - getMvpPresenter().inviteFriendToFamily(uid) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_06)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - })); - dialog.dismiss(); - } - }); - dialog.show(); - } - - @Override - protected void onResume() { - super.onResume(); - if(familyId == null){ - showNoData(); - } else { - showLoading(); - loadFamilyInfo(familyId); - } - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (requestCode == SelectFriendActivity.CODE_REQUEST_TO_SHARE_FAMILY && - resultCode == RESULT_OK) { - String targetUid = data.getStringExtra(SelectFriendActivity.EXTRA_TARGET_UID); - String nick = data.getStringExtra(SelectFriendActivity.EXTRA_TARGET_NAME); - int sessionType = data.getIntExtra(SelectFriendActivity.EXTRA_SESSION_TYPE, SessionType.P2P); - IMNetEaseManager.get().sendSharingFamilyMessage(sessionType, targetUid, getMvpPresenter().getFamilyInfo()); - } - } - - @Override - public void onLoadData(FamilyInfo data) { - hideStatus(); - showFamilyView(data); - } - - @Override - public void showNoData(int drawable, CharSequence charSequence) { - if (!checkActivityValid()) { - return; - } - - View status = findViewById(R.id.status_layout); - if (status == null || status.getId() <= 0) { - MLog.error(this, "xuwakao, had not set layout id "); - return; - } - - FamilyEmptyFragment fragment = FamilyEmptyFragment.newInstance(0 - mTitleBar.getmHeight()); - fragment.setOnClickListener(v -> FamilyPlazaActivity.start(FamilyHomeActivity.this)); - getSupportFragmentManager().beginTransaction().replace(status.getId(), fragment, STATUS_TAG).commitAllowingStateLoss(); - } - - @Override - public void showErrorView(String message) { - toast(message); - finish(); - } - - @Override - public void reloadMyFamilyInfo(String familyId) { - loadFamilyInfo(familyId); - } - - @Override - public void close() { - finish(); - } - - private void loadFamilyInfo(String familyId) { - getMvpPresenter().loadData(familyId).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(FamilyInfo familyInfo) { - mTitleBar.setVisibility(View.VISIBLE); - onLoadData(familyInfo); - } - - @Override - public void onError(Throwable e) { - hideStatus(); - showErrorView(e.getMessage()); - } - }); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == tvFamilyManage.getId()) { - FamilyManageActivity.start(this); - } else if (id == llMyFamilyCurrency.getId()) { - FamilyCurrencyActivity.start(this); - } else if (id == tvAllMember.getId()) { - FamilyMemberListActivity.start(this, FamilyMemberListActivity.TYPE_SHOW_MEMBER); - } else if (id == tvCreateGroup.getId()) { - //去创建群组 - CreateTeamMessageActivity.start(this); - } else if (id == rlJoinFamily.getId()) { - joinFamily(getMvpPresenter().getFamilyInfo()); - } - } - - private void joinFamily(FamilyInfo familyInfo) { - if (null != FamilyModel.Instance().getMyFamily()) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_08)); - return; - } - if (familyInfo.getVerifyType() == FamilyInfo.VERIFY_ON) { - showJoinFamilyDialog(getMvpPresenter().getFamilyInfo()); - } else { - getMvpPresenter().joinFamily(null) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_09)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - } - } - - /** - * 加入家族验证弹框 - */ - private void showJoinFamilyDialog(FamilyInfo familyInfo) { - FamilyJoinDialog dialog = new FamilyJoinDialog(this); - String str = String.format(getResources().getString(R.string.family_join_tip), - "\"" + familyInfo.getFamilyName() + "\""); - SpannableString spannableString = new SpannableString(str); - StyleSpan styleSpan = new StyleSpan(Typeface.BOLD); - spannableString.setSpan(styleSpan, str.indexOf("\""), str.lastIndexOf("\"") + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - dialog.setTipMessage(spannableString); - dialog.setDefaultVerifyMessage(getResources().getString(R.string.family_join_hint)); - dialog.setOnOperationListener(new FamilyJoinDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog, String str) { - dialog.dismiss(); - getMvpPresenter().joinFamily(str) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_010)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - } - }); - dialog.show(); - } - - private void joinFamilyGroup(FamilyGroupInfo groupInfo) { - if (getMvpPresenter().getFamilyInfo().getEnterStatus() == FamilyInfo.STATUS_IN_FAMILY) { - if (groupInfo.isVerify()) { - showInFamilyJoinDialog(groupInfo); - } else { - getMvpPresenter().joinFamilyGroup( - String.valueOf(groupInfo.getId()), - "" - ).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_011)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - } - - } else if (getMvpPresenter().getFamilyInfo().getEnterStatus() == FamilyInfo.STATUS_NOT_IN_FAMILY) { - if (null != FamilyModel.Instance().getMyFamily()) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_012)); - return; - } - if (getMvpPresenter().getFamilyInfo().getVerifyType() == FamilyInfo.VERIFY_ON || groupInfo.isVerify()) { - //凡是有一个需要验证,弹出验证dailog - showNotInFamilyJoinDialog(groupInfo); - } else { - //都不需要验证的情况 直接进群 - getMvpPresenter().joinFamilyGroup( - String.valueOf(groupInfo.getId()), - null - ).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_013)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - } - - } - - } - - /** - * 在家族中加入需要验证的群组 - */ - private void showInFamilyJoinDialog(FamilyGroupInfo groupInfo) { - FamilyJoinDialog dialog = new FamilyJoinDialog(this); - String str = String.format(getResources().getString(R.string.family_join_tip), - "\"" + groupInfo.getName() + "\""); - SpannableString spannableString = new SpannableString(str); - StyleSpan styleSpan = new StyleSpan(Typeface.BOLD); - spannableString.setSpan(styleSpan, str.indexOf("\""), str.lastIndexOf("\"") + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - dialog.setTipMessage(spannableString); - dialog.setDefaultVerifyMessage(getResources().getString(R.string.family_group_join_hint)); - dialog.setOnOperationListener(new FamilyJoinDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog, String str) { - dialog.dismiss(); - getMvpPresenter().joinFamilyGroup( - String.valueOf(groupInfo.getId()), - str - ).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_014)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - } - }); - dialog.show(); - } - - /** - * 不在家族中加入家族的群 - */ - private void showNotInFamilyJoinDialog(FamilyGroupInfo groupInfo) { - FamilyJoinDialog dialog = new FamilyJoinDialog(this); - String str = String.format(getResources().getString(R.string.family_group_join_tip_1), - "\"" + getMvpPresenter().getFamilyInfo().getFamilyName() + "\""); - SpannableString spannableString = new SpannableString(str); - StyleSpan styleSpan = new StyleSpan(Typeface.BOLD); - spannableString.setSpan(styleSpan, str.indexOf("\""), str.lastIndexOf("\"") + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - dialog.setTipMessage(spannableString); - dialog.setDefaultVerifyMessage(getResources().getString(R.string.family_group_join_hint)); - - dialog.setOnOperationListener(new FamilyJoinDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog, String str) { - dialog.dismiss(); - getMvpPresenter().joinFamilyGroup( - String.valueOf(groupInfo.getId()), - str - ).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyhomeactivity_015)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - } - }); - dialog.show(); - - } - - @Override - public void onInAppSharingItemClick() { - if (shareDialog != null && shareDialog.isShowing()) { - shareDialog.dismiss(); - } - SelectFriendActivity.startForSharingFamily(this); - } - - @Override - public void onSharePlatformClick(Platform platform) { - FamilyInfo familyInfo = getMvpPresenter().getFamilyInfo(); - if (familyInfo != null) { - ShareModel.get().shareFamily( - platform, familyInfo.getFamilyId(), - familyInfo.getFamilyIcon(), - familyInfo.getFamilyName() - ) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(String s) { - toast(s); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - } - } - - private void showFamilyGuide() { - if (!isFirstInFamily()) { - return; - } - - FamilyGuideDialog guideDialog = new FamilyGuideDialog(this); - guideDialog.show(); - - setFirstInFamily(false); - } - - private boolean isFirstInFamily() { -// return (boolean) SharedPreferenceUtils.get(share_pref_is_first_in_family, new Boolean(true)); - return false; - } - - private void setFirstInFamily(boolean firstInFamily) { - SharedPreferenceUtils.put(share_pref_is_first_in_family, new Boolean(firstInFamily)); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyInfoActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyInfoActivity.java deleted file mode 100644 index d20b36380..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyInfoActivity.java +++ /dev/null @@ -1,227 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.annotation.SuppressLint; -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.jph.takephoto.model.TResult; -import com.makeramen.roundedimageview.RoundedImageView; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.ErbanTakePhotoActivity; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyInfoView; -import com.yizhuan.erban.family.presenter.FamilyInfoPresenter; -import com.yizhuan.erban.family.view.dialog.FamilyDisbandDialog; -import com.yizhuan.erban.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.widget.IOSSwitchView; - -import java.util.ArrayList; -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyInfoPresenter.class) -public class FamilyInfoActivity extends BaseMvpActivity - implements IFamilyInfoView, View.OnClickListener,ErbanTakePhotoActivity.TakePhotoCallBack { - - private LinearLayout llFamilyAvatar; - private RoundedImageView rivFamilyCover; - private LinearLayout llFamilyName; - private TextView tvFamilyName; - private TextView tvFamilyDisband; - private IOSSwitchView svIdentityCheck; - - private FamilyInfo familyInfo; - - public static void start(Activity activity) { - Intent intent = new Intent(activity, FamilyInfoActivity.class); - activity.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_info); - initTitleBar(getString(R.string.family_info)); - - - llFamilyAvatar = (LinearLayout) findViewById(R.id.ll_family_avatar); - rivFamilyCover = (RoundedImageView) findViewById(R.id.riv_family_cover); - llFamilyName = (LinearLayout) findViewById(R.id.ll_family_name); - tvFamilyName = (TextView) findViewById(R.id.tv_family_name); - tvFamilyDisband = (TextView) findViewById(R.id.tv_family_disband); - svIdentityCheck = (IOSSwitchView) findViewById(R.id.sv_identity_check); - - - llFamilyAvatar.setOnClickListener(this); - llFamilyName.setOnClickListener(this); - tvFamilyDisband.setOnClickListener(this); - svIdentityCheck.setOnSwitchStateChangeListener(new IOSSwitchView.OnSwitchStateChangeListener() { - @Override - public void onStateSwitched(boolean isOn) { - svIdentityCheck.setEnabled(false); - getMvpPresenter().changeVerifyStatus(isOn).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyinfoactivity_01)); - svIdentityCheck.setEnabled(true); - } - - @Override - public void onError(Throwable e) { - svIdentityCheck.setEnabled(true); - toast(e.getMessage()); - svIdentityCheck.setOn(!isOn,true,false); - } - }); - } - }); - - initData(); - - } - - private void initData(){ - familyInfo = FamilyModel.Instance().getMyFamily(); - if (familyInfo == null) { - toast(ResUtil.getString(R.string.view_activity_familyinfoactivity_02)); - return; - } - GlideApp.with(this) - .load(familyInfo.getFamilyIcon()) - .dontAnimate() - .into(rivFamilyCover); - - tvFamilyName.setText(familyInfo.getFamilyName()); - if (FamilyInfo.VERIFY_ON == familyInfo.getVerifyType()){ - svIdentityCheck.setOn(true,false); - }else { - svIdentityCheck.setOn(false,false); - } - } - - - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == llFamilyAvatar.getId()){ - ButtonItem buttonItem = new ButtonItem(ResUtil.getString(R.string.view_activity_familyinfoactivity_03), ()->{ - ErbanTakePhotoActivity.startToTakePhoto(this,this); - }); - ButtonItem buttonItem1 = new ButtonItem(ResUtil.getString(R.string.view_activity_familyinfoactivity_04), () -> { - ErbanTakePhotoActivity.startToSelectPhoto(this,this); - }); - List buttonItems = new ArrayList<>(); - buttonItems.add(buttonItem); - buttonItems.add(buttonItem1); - getDialogManager().showCommonPopupDialog(buttonItems, ResUtil.getString(R.string.view_activity_familyinfoactivity_05), false); - - }else if (id == llFamilyName.getId()){ - FamilyTextInputActivity.start(this, familyInfo.getFamilyName(), new FamilyTextInputActivity.CallBack() { - @Override - public void onModify(String str) { - getMvpPresenter().changeFamilyName(str).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - tvFamilyName.setText(str); - toast(ResUtil.getString(R.string.view_activity_familyinfoactivity_06)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - } - }); - - }else if (id == tvFamilyDisband.getId()){ - FamilyDisbandDialog disbandFamilyDialog = new FamilyDisbandDialog(this); - disbandFamilyDialog.show(); - } - } - - /********************************************* 照相上传逻辑 ******************************************************/ - - public void onUpload(String url) { - getDialogManager().dismissDialog(); - GlideApp.with(FamilyInfoActivity.this) - .load(url) - .error(R.drawable.default_avatar) - .into(rivFamilyCover); - - - getMvpPresenter().changeFamilyAvatar(url).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familyinfoactivity_07)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - - } - - public void onUploadFail() { - toast(ResUtil.getString(R.string.view_activity_familyinfoactivity_08)); - getDialogManager().dismissDialog(); - } - - @SuppressLint("CheckResult") - @Override - public void takeSuccess(TResult result) { - getDialogManager().showProgressDialog(FamilyInfoActivity.this, ResUtil.getString(R.string.view_activity_familyinfoactivity_09)); - FileModel.get() - .uploadFile(result.getImage().getCompressPath()) - .compose(bindToLifecycle()) - .subscribe((url, throwable) -> { - if (throwable != null) { - onUploadFail(); - } else { - onUpload(url); - } - }); - } - - @Override - public void takeFail(TResult result, String msg) { - toast(msg); - } - - @Override - public void takeCancel() { - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java deleted file mode 100644 index 0512f584d..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyListActivity.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.erban.family.presenter.FamilyListPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyWeeklyRankBoardAdapter; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyListPresenter.class) -public class FamilyListActivity extends BaseMvpActivity - implements IFamilySearchView,SwipeRefreshLayout.OnRefreshListener { - - private SwipeRefreshLayout swipeRefresh; - private RecyclerView recyclerView; - private FamilyWeeklyRankBoardAdapter adapter; - - public static void start(Context context) { - Intent intent = new Intent(context,FamilyListActivity.class); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_list); - initTitleBar(getString(R.string.family_weekly_rank_board)); - mTitleBar.addAction(new TitleBar.ImageAction(R.drawable.ic_family_list_search) { - @Override - public void performAction(View view) { - FamilySearchActivity.start(FamilyListActivity.this); - } - }); - - swipeRefresh = findViewById(R.id.swipe_refresh); - swipeRefresh.setOnRefreshListener(this); - - recyclerView = findViewById(R.id.recycler_view); - recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL,false)); - if (recyclerView.getItemDecorationCount() == 0) { - int marginStart = SizeUtils.dp2px(this, 16); - recyclerView.addItemDecoration(new ColorDecoration(getResources().getColor(R.color.color_F1F1F1), - 0,1, false, marginStart, marginStart)); - } - adapter = new FamilyWeeklyRankBoardAdapter(this, null); -// View headerView = LayoutInflater.from(this).inflate(R.layout.layout_search_header, null,false); -// adapter.addHeaderView(headerView); - adapter.setOnItemClickListener((adapter1, view, position) -> { - RankingFamilyInfo familyInfo = adapter.getData().get(position); - FamilyHomeActivity.start(FamilyListActivity.this,familyInfo.getId()); - }); - adapter.setEnableLoadMore(false); - - recyclerView.setAdapter(adapter); - - } - - @Override - protected void onResume() { - super.onResume(); - if (ListUtils.isListEmpty(adapter.getData())){ - swipeRefresh.setRefreshing(true); - getMvpPresenter().refreshData().subscribe(new SingleObserver>() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(List familyInfoList) { - swipeRefresh.setRefreshing(false); - if (familyInfoList != null && familyInfoList.size() > 0) { - hideStatus(); - adapter.setNewData(familyInfoList); - adapter.notifyDataSetChanged(); - } else { - showNoData(); - } - } - - @Override - public void onError(Throwable e) { - swipeRefresh.setRefreshing(false); - showNetworkErr(); - toast(e.getMessage()); - } - }); - } - - } - - @Override - public void onRefresh() { - getMvpPresenter().refreshData().subscribe(new SingleObserver>() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(List familyInfoList) { - swipeRefresh.setRefreshing(false); - if (familyInfoList != null && familyInfoList.size() > 0) { - hideStatus(); - adapter.setNewData(familyInfoList); - adapter.notifyDataSetChanged(); - } else { - showNoData(); - } - } - - @Override - public void onError(Throwable e) { - swipeRefresh.setRefreshing(false); - showNetworkErr(); - toast(e.getMessage()); - } - }); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java deleted file mode 100644 index ac130206f..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyManageActivity.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyManageActivityView; -import com.yizhuan.erban.family.presenter.FamilyManagePresenter; -import com.yizhuan.erban.family.view.adapter.FamilyManageAdapter; -import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; - -@CreatePresenter(FamilyManagePresenter.class) -public class FamilyManageActivity extends BaseMvpActivity - implements IFamilyManageActivityView, BaseQuickAdapter.OnItemClickListener{ - - private RecyclerView rvFamilyManage; - private FamilyManageAdapter familyManageAdapter; - - public static void start(Context context) { - Intent intent = new Intent(context,FamilyManageActivity.class); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_manage_activty); - initTitleBar(getString(R.string.family_manage_title)); - - rvFamilyManage = (RecyclerView) findViewById(R.id.rv_family_manage); - rvFamilyManage.setLayoutManager(new LinearLayoutManager(this)); - //rvFamilyManage.addItemDecoration(new ColorDecoration(getResources().getColor(R.color.color_F5F5F5),1,1,false)); - - List manageItemInfos = new ArrayList<>(); - - if (FamilyModel.Instance().getMyFamily().isOpenMoney()) { - FamilyManageItemInfo itemInfo = new FamilyManageItemInfo(); - itemInfo.setId(FamilyManageItemInfo.ID_FAMILY_MANAGE_CURRENCY); - itemInfo.setName(ResUtil.getString(R.string.view_activity_familymanageactivity_01)); - itemInfo.setImg(R.drawable.ic_family_manage_currency); - manageItemInfos.add(itemInfo); - } - - FamilyManageItemInfo itemInfo2 = new FamilyManageItemInfo(); - itemInfo2.setId(FamilyManageItemInfo.ID_FAMILY_MANAGE_MEMBER); - itemInfo2.setName(ResUtil.getString(R.string.view_activity_familymanageactivity_02)); - itemInfo2.setImg(R.drawable.ic_family_manage_member); - manageItemInfos.add(itemInfo2); - - FamilyManageItemInfo itemInfo3 = new FamilyManageItemInfo(); - itemInfo3.setId(FamilyManageItemInfo.ID_FAMILY_MANAGE_INFO); - itemInfo3.setName(ResUtil.getString(R.string.view_activity_familymanageactivity_03)); - itemInfo3.setImg(R.drawable.ic_family_manage_info); - manageItemInfos.add(itemInfo3); - - familyManageAdapter = new FamilyManageAdapter(manageItemInfos); - familyManageAdapter.setOnItemClickListener(this); - rvFamilyManage.setAdapter(familyManageAdapter); - - } - - - @Override - public void onItemClick(BaseQuickAdapter adapter, View view, int position) { - FamilyManageItemInfo itemInfo = (FamilyManageItemInfo) adapter.getData().get(position); - if (FamilyManageItemInfo.ID_FAMILY_MANAGE_CURRENCY == itemInfo.getId()){ - FamilyCurrencyActivity.start(this); - - }else if (FamilyManageItemInfo.ID_FAMILY_MANAGE_MEMBER == itemInfo.getId()){ - FamilyMemberListActivity.start(this,FamilyMemberListActivity.TYPE_REMOVE_MEMBER); - - }else if (FamilyManageItemInfo.ID_FAMILY_MANAGE_INFO == itemInfo.getId()){ - FamilyInfoActivity.start(this); - - } - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java deleted file mode 100644 index f2711e876..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberCurrencyActivity.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.jay.widget.StickyHeadersLinearLayoutManager; -import com.jzxiang.pickerview.TimePickerDialog; -import com.jzxiang.pickerview.data.Type; -import com.jzxiang.pickerview.listener.OnDateSetListener; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyCurrencyView; -import com.yizhuan.erban.family.presenter.FamilyMemberCurrencyPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyCurrencyBillAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -@CreatePresenter(FamilyMemberCurrencyPresenter.class) -public class FamilyMemberCurrencyActivity extends BaseMvpActivity - implements IFamilyCurrencyView, SwipeRefreshLayout.OnRefreshListener, BaseQuickAdapter.RequestLoadMoreListener, OnDateSetListener { - - private SwipeRefreshLayout swipeRefresh; - private RecyclerView rvFamilyCurrency; - private FamilyCurrencyBillAdapter adapter; - - protected TimePickerDialog.Builder mDialogYearMonthDayBuild; - - private String selectDate; - private long uid; - - public static void start(Context context, long uid) { - Intent intent = new Intent(context, FamilyMemberCurrencyActivity.class); - intent.putExtra(BundleKeys.KEY_EXTRA_1, uid); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - uid = getIntent().getLongExtra(BundleKeys.KEY_EXTRA_1,0); - setContentView(R.layout.activity_family_member_currency); - - initTitleBar(getString(R.string.family_currency)); - - swipeRefresh = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh); - swipeRefresh.setOnRefreshListener(this); - - rvFamilyCurrency = (RecyclerView) findViewById(R.id.rv_family_currency); - rvFamilyCurrency.setItemAnimator(null); - rvFamilyCurrency.setLayoutManager(new StickyHeadersLinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); - adapter = new FamilyCurrencyBillAdapter(this,null); - adapter.setEnableLoadMore(true); - adapter.setOnLoadMoreListener(this, rvFamilyCurrency); - adapter.setOnDateSelectListener(new FamilyCurrencyBillAdapter.OnDateSelectListener() { - @Override - public void onDateSelect() { - mDialogYearMonthDayBuild.build().show(getSupportFragmentManager(), "year_month"); - } - }); - rvFamilyCurrency.setAdapter(adapter); - - mDialogYearMonthDayBuild = new TimePickerDialog.Builder() - .setType(Type.YEAR_MONTH) - .setTitleStringId(ResUtil.getString(R.string.view_activity_familymembercurrencyactivity_01)) - .setThemeColor(getResources().getColor(R.color.line_background)) - .setWheelItemTextNormalColor(getResources().getColor(R.color - .timetimepicker_default_text_color)) - .setWheelItemTextSelectorColor(getResources().getColor(R.color.black)) - .setCallBack(this); - - this.selectDate = String.valueOf(System.currentTimeMillis()); - } - - @Override - protected void onResume() { - super.onResume(); - if (ListUtils.isListEmpty(getMvpPresenter().getBillItemInfos())){ - swipeRefresh.setRefreshing(true); - getMvpPresenter().onRefreshRecordList(selectDate, String.valueOf(uid)); - - } - } - - @Override - public void onRefresh() { - this.selectDate = String.valueOf(System.currentTimeMillis()); - getMvpPresenter().onRefreshRecordList(selectDate, String.valueOf(uid)); - } - - @Override - public void onLoadMoreRequested() { - getMvpPresenter().onLoadMoreRecordList(selectDate, String.valueOf(uid)); - } - - @Override - public void onDateSet(TimePickerDialog timePickerView, long millseconds) { - this.selectDate = String.valueOf(millseconds); - getMvpPresenter().onRefreshRecordList(selectDate, String.valueOf(uid)); - } - - @Override - public void onLoadData(List billItemInfos, int page, int dataSize) { - if (page == Constants.PAGE_START){ - swipeRefresh.setRefreshing(false); - adapter.setNewData(billItemInfos); - }else { - if (dataSize > 0) { - adapter.loadMoreComplete(); - adapter.notifyDataSetChanged(); - }else { - adapter.loadMoreEnd(true); - } - } - } - - @Override - public void showErrorView(String message) { - toast(message); - } - - @Override - public void refreshData() { - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java deleted file mode 100644 index d658054dd..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberListActivity.java +++ /dev/null @@ -1,299 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.app.Activity; -import android.content.DialogInterface; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberListView; -import com.yizhuan.erban.family.presenter.FamilyMemberListPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyMemberListAdapter; -import com.yizhuan.erban.family.view.dialog.FamilyTransferDialog; -import com.yizhuan.erban.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyMemberListPresenter.class) -public class FamilyMemberListActivity extends BaseMvpActivity - implements IFamilyMemberListView, View.OnClickListener, BaseQuickAdapter.RequestLoadMoreListener, SwipeRefreshLayout.OnRefreshListener { - - public static final int TYPE_SHOW_MEMBER = 1;// 查看成员方式 - public static final int TYPE_SELECT_MEMBER = 2;//选择成员方式 - public static final int TYPE_REMOVE_MEMBER = 3;//移除成员方式 - public static final int TYPE_CHECK_MEMBER_CURRENCY = 4;//查看家族成员家族币记录 - - private LinearLayout llSearch; - private TextView tvMemberCount; - private RecyclerView rvMember; - private FamilyMemberListAdapter familyMemberListAdapter; - private int optType = TYPE_SHOW_MEMBER; - private SwipeRefreshLayout swipeRefresh; - - private TitleBar.Action searchAction = new TitleBar.Action() { - @Override - public String getText() { - return null; - } - - @Override - public int getDrawable() { - return R.drawable.ic_family_search; - } - - @Override - public int getTextColor() { - return 0; - } - - @Override - public int getTextDrawableLeft() { - return 0; - } - - @Override - public void performAction(View view) { - FamilyMemberSearchActivity.start(FamilyMemberListActivity.this, optType); - } - }; - public static void start(Activity activity, int optType) { - Intent intent = new Intent(activity, FamilyMemberListActivity.class); - Bundle b = new Bundle(); - b.putInt(BundleKeys.KEY_EXTRA_1, optType); - intent.putExtras(b); - activity.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - optType = getIntent().getIntExtra(BundleKeys.KEY_EXTRA_1, TYPE_SHOW_MEMBER); - setContentView(R.layout.activity_family_list_member); - - initTitleBar(getString(R.string.family_member_list)); - - llSearch = (LinearLayout) findViewById(R.id.ll_search); - tvMemberCount = (TextView) findViewById(R.id.tv_member_count); - rvMember = (RecyclerView) findViewById(R.id.rv_member); - - - swipeRefresh = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh); - swipeRefresh.setOnRefreshListener(this); - rvMember.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)); - familyMemberListAdapter = new FamilyMemberListAdapter(this, null, optType); - familyMemberListAdapter.setEnableLoadMore(true); - familyMemberListAdapter.setOnLoadMoreListener(this, rvMember); - familyMemberListAdapter.setActionListener(new FamilyMemberListAdapter.ActionListener() { - @Override - public void onRemoveMember(FamilyMemberInfo familyMemberInfo) { - //移除成员 - showRemoveFamilyMemberDialog(familyMemberInfo); - - } - - @Override - public void onTransferCurrency(FamilyMemberInfo familyMemberInfo) { - showTransferDialog(familyMemberInfo); - } - - @Override - public void onClickAvatar(FamilyMemberInfo item) { - UserInfoActivity.Companion.start(FamilyMemberListActivity.this, item.getUid()); - } - - @Override - public void onCheckMemberCurrency(FamilyMemberInfo item) { - - } - }); - rvMember.setAdapter(familyMemberListAdapter); - - mTitleBar.addAction(searchAction); - llSearch.setOnClickListener(this); - - } - - @Override - protected void onResume() { - super.onResume(); - if (ListUtils.isListEmpty(this.familyMemberListAdapter.getData())) { - refreshData(); - } - - } - - private void refreshData() { - showLoading(); - swipeRefresh.setRefreshing(true); - getMvpPresenter().refreshData() - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(RespFamilymember respFamilymember) { - swipeRefresh.setRefreshing(false); - tvMemberCount.setText(String.format( - getString(R.string.family_member_label2), - String.valueOf(respFamilymember.getCount()) - )); - - onLoadData(respFamilymember.getMembers()); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - swipeRefresh.setRefreshing(false); - showNetworkErr(); - } - } - ); - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == llSearch.getId()) { - FamilyMemberSearchActivity.start(this, optType); - } - } - - @Override - public void onLoadData(List memberInfoList) { - if (!ListUtils.isListEmpty(memberInfoList)) { - hideStatus(); - familyMemberListAdapter.setNewData(memberInfoList); - familyMemberListAdapter.notifyDataSetChanged(); - } else { - showNoData(); - } - } - - @Override - public void onReloadDate() { - super.onReloadDate(); - refreshData(); - } - - @Override - public void reloadFamilyMember() { - refreshData(); - } - - @Override - public void onLoadMoreRequested() { - getMvpPresenter().loadMoreData() - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(RespFamilymember respFamilymember) { - List memberInfos = respFamilymember.getMembers(); - if (!ListUtils.isListEmpty(memberInfos)) { - familyMemberListAdapter.addData(memberInfos); - familyMemberListAdapter.loadMoreComplete(); - } else { - familyMemberListAdapter.loadMoreEnd(true); - } - - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - } - - @Override - public void onRefresh() { - refreshData(); - } - - - private void showTransferDialog(FamilyMemberInfo familyMemberInfo) { - FamilyTransferDialog dialog = new FamilyTransferDialog(this, getMvpPresenter().getFamilyInfo(), familyMemberInfo); - dialog.setOnOperationListener(new FamilyTransferDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog, FamilyMemberInfo familyMemberInfo, double count) { - dialog.dismiss(); - getMvpPresenter().transferCurrency(familyMemberInfo, count) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(String s) { - toast(getResources().getString(R.string.family_transfer_currency_success)); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - } - }); - dialog.show(); - } - - - private void showRemoveFamilyMemberDialog(FamilyMemberInfo familyMemberInfo) { - getDialogManager().showOkCancelWithTitleDialog(new String[]{ResUtil.getString(R.string.view_activity_familymemberlistactivity_01), ResUtil.getString(R.string.view_activity_familymemberlistactivity_02), ResUtil.getString(R.string.view_activity_familymemberlistactivity_03), - familyMemberInfo.getName(), ResUtil.getString(R.string.view_activity_familymemberlistactivity_04)}, - () -> getMvpPresenter().removeFamilyMember(familyMemberInfo) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familymemberlistactivity_05)); - refreshData(); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - })); - - } - - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java deleted file mode 100644 index 76f6080c0..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyMemberSearchActivity.java +++ /dev/null @@ -1,317 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.os.Bundle; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.View; -import android.view.inputmethod.EditorInfo; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyMemberSearchView; -import com.yizhuan.erban.family.presenter.FamilyMemberSearchPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyMemberListAdapter; -import com.yizhuan.erban.family.view.dialog.FamilyRemoveMemberDialog; -import com.yizhuan.erban.family.view.dialog.FamilyTransferDialog; -import com.yizhuan.erban.ui.user.activity.UserInfoActivity; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyMemberSearchPresenter.class) -public class FamilyMemberSearchActivity extends BaseMvpActivity - implements IFamilyMemberSearchView, View.OnClickListener, BaseQuickAdapter.RequestLoadMoreListener { - - private RecyclerView recyclerView; - private FamilyMemberListAdapter searchAdapter; - private EditText searchEdit; - private ImageView ivBack; - private TextView tvSearch; - private ImageView ivClearText; - private int optType; - private String searchStr; - - public static void start(Context context,int optType) { - Intent intent = new Intent(context,FamilyMemberSearchActivity.class); - Bundle b = new Bundle(); - b.putInt(BundleKeys.KEY_EXTRA_1,optType); - intent.putExtras(b); - context.startActivity(intent); - } - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - optType = getIntent().getIntExtra(BundleKeys.KEY_EXTRA_1,FamilyMemberListActivity.TYPE_SHOW_MEMBER); - setContentView(R.layout.activity_family_member_search); - - initView(); - - } - - private void initView() { - recyclerView = (RecyclerView) findViewById(R.id.recycler_view); - searchEdit = (EditText) findViewById(R.id.search_edit); - searchEdit.addTextChangedListener(textWatcher); - searchEdit.setImeOptions(EditorInfo.IME_ACTION_SEARCH); - searchEdit.setOnEditorActionListener(new TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_ACTION_SEARCH || (event!=null && event.getKeyCode()== KeyEvent.KEYCODE_ENTER)) { - String str = v.getText().toString(); - if (TextUtils.isEmpty(str)){ -// Toast.makeText(v.getContext(),ResUtil.getString(R.string.view_activity_familymembersearchactivity_01),Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_activity_familymembersearchactivity_02)); - return true; - } - searchStr = str; - search(str); - hideIME(); - return true; - } - return false; - - } - }); - recyclerView.setLayoutManager(new LinearLayoutManager(this,LinearLayoutManager.VERTICAL,false)); - if (recyclerView.getItemDecorationCount() == 0) { - recyclerView.addItemDecoration(new ColorDecoration(getResources().getColor(R.color.color_F1F1F1), 0,1, false)); - } - searchAdapter = new FamilyMemberListAdapter(this, null,optType); - View headerView = LayoutInflater.from(this).inflate(R.layout.layout_search_header, null,false); - searchAdapter.addHeaderView(headerView); - searchAdapter.setActionListener(new FamilyMemberListAdapter.ActionListener() { - @Override - public void onRemoveMember(FamilyMemberInfo familyMemberInfo) { - showRemoveFamilyMemberDialog(familyMemberInfo); - } - - @Override - public void onTransferCurrency(FamilyMemberInfo familyMemberInfo) { - showTransferDialog(familyMemberInfo); - } - @Override - public void onClickAvatar(FamilyMemberInfo item) { - UserInfoActivity.Companion.start(FamilyMemberSearchActivity.this, item.getUid()); - } - - @Override - public void onCheckMemberCurrency(FamilyMemberInfo item) { - FamilyMemberCurrencyActivity.start(FamilyMemberSearchActivity.this, item.getUid()); - } - }); - //搜索去掉分页 -// searchAdapter.setEnableLoadMore(true); -// searchAdapter.setOnLoadMoreListener(this,recyclerView); - recyclerView.setAdapter(searchAdapter); - - ivBack = (ImageView) findViewById(R.id.iv_back); - ivBack.setOnClickListener(this); - - tvSearch = (TextView) findViewById(R.id.tv_search); - tvSearch.setOnClickListener(this); - - ivClearText = (ImageView) findViewById(R.id.iv_clear_text); - ivClearText.setOnClickListener(this); - ivClearText.setVisibility(View.GONE); - - } - - private TextWatcher textWatcher = new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (TextUtils.isEmpty(s.toString())) { - ivClearText.setVisibility(View.GONE); - } else { - ivClearText.setVisibility(View.VISIBLE); - } - } - }; - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == ivBack.getId()){ - finish(); - }else if (id == tvSearch.getId()){ - String str = searchEdit.getText().toString(); - if (TextUtils.isEmpty(str)){ -// Toast.makeText(this,ResUtil.getString(R.string.view_activity_familymembersearchactivity_03),Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_activity_familymembersearchactivity_04)); - return; - } - searchStr = str; - search(str); - hideIME(); - - }else if (id == ivClearText.getId()){ - searchEdit.setText(""); - } - - } - - private void search(String str){ - getMvpPresenter().search(str) - .subscribe(new SingleObserver>() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(List memberInfos) { - update(memberInfos); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - } - - - @Override - public void update(List memberInfos) { - if (memberInfos != null && memberInfos.size() > 0) { - hideStatus(); - searchAdapter.setNewData(memberInfos); - searchAdapter.notifyDataSetChanged(); - } else { - showNoData(); - } - } - - @Override - public void onLoadMoreRequested() { -// getMvpPresenter().loadMoreData() -// .subscribe(new SingleObserver>() { -// @Override -// public void onSubscribe(Disposable d) { -// mCompositeDisposable.add(d); -// } -// -// @Override -// public void onSuccess(List memberInfos) { -// if (!ListUtils.isListEmpty(memberInfos)){ -// searchAdapter.addData(memberInfos); -// searchAdapter.loadMoreComplete(); -// }else { -// searchAdapter.loadMoreEnd(false); -// } -// } -// -// @Override -// public void onError(Throwable e) { -// toast(e.getMessage()); -// } -// }); - } - - - - private void showTransferDialog(FamilyMemberInfo familyMemberInfo) { - FamilyTransferDialog dialog = new FamilyTransferDialog(this, getMvpPresenter().getFamilyInfo(),familyMemberInfo); - dialog.setOnOperationListener(new FamilyTransferDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog, FamilyMemberInfo familyMemberInfo, double count) { - dialog.dismiss(); - getMvpPresenter().transferCurrency(familyMemberInfo, count) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(String s) { - toast(getResources().getString(R.string.family_transfer_currency_success)); - - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - - } - }); - dialog.show(); - } - - - private void showRemoveFamilyMemberDialog(FamilyMemberInfo familyMemberInfo) { - FamilyRemoveMemberDialog familyRemoveMemberDialog = new FamilyRemoveMemberDialog(this,familyMemberInfo); - familyRemoveMemberDialog.setOnOperationListener(new FamilyRemoveMemberDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog, FamilyMemberInfo familyMemberInfo) { - dialog.dismiss(); - getMvpPresenter().removeFamilyMember(familyMemberInfo) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(String s) { - toast(ResUtil.getString(R.string.view_activity_familymembersearchactivity_05)); - search(searchStr); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - } - }); - } - }); - familyRemoveMemberDialog.show(); - - - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java deleted file mode 100644 index caad55273..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyPlazaActivity.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.LinearLayout; -import android.widget.TextView; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyPlazaActivityView; -import com.yizhuan.erban.family.presenter.FamilyPlazaPresenter; -import com.yizhuan.erban.family.view.adapter.FamilyWeeklyRankBoardAdapter; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.erban.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.SizeUtils; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilyPlazaPresenter.class) -public class FamilyPlazaActivity extends BaseMvpActivity - implements IFamilyPlazaActivityView,View.OnClickListener, SwipeRefreshLayout.OnRefreshListener { - - - private SwipeRefreshLayout srlRefreshContainer; - private LinearLayout llFamilyContainer; - private TextView tvGetMore; - - private FamilyWeeklyRankBoardAdapter familyWeeklyRankBoardAdapter; - - private boolean isFirstLoad = true; - - public static void start(Context context) { - Intent intent = new Intent(context,FamilyPlazaActivity.class); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_plaza); - initTitleBar(getString(R.string.family_plaza)); - - mTitleBar.addAction(new TitleBar.ImageAction(R.drawable.ic_family_list_search) { - @Override - public void performAction(View view) { - FamilySearchActivity.start(FamilyPlazaActivity.this); - } - }); - - srlRefreshContainer = findViewById(R.id.srl_refresh_container); - - llFamilyContainer = findViewById(R.id.ll_family_container); - RecyclerView rvList = findViewById(R.id.rv_list); - tvGetMore = findViewById(R.id.tv_get_more); - - srlRefreshContainer.setOnRefreshListener(this); - - rvList.setItemAnimator(null); - rvList.setFocusable(false); - rvList.setLayoutManager(new FullyLinearLayoutManager(this, LinearLayoutManager.VERTICAL,false)); - if (rvList.getItemDecorationCount() == 0) { - int marginStart = SizeUtils.dp2px(this, 16); - rvList.addItemDecoration(new ColorDecoration(getResources().getColor(R.color.color_F1F1F1), - 0,1, false, marginStart, marginStart)); - } - familyWeeklyRankBoardAdapter = new FamilyWeeklyRankBoardAdapter(this, null); - familyWeeklyRankBoardAdapter.setOnItemClickListener((adapter, view, position) -> { - RankingFamilyInfo familyInfo = (RankingFamilyInfo) adapter.getData().get(position); - FamilyHomeActivity.start(FamilyPlazaActivity.this, familyInfo.getId()); - }); - rvList.setAdapter(familyWeeklyRankBoardAdapter); - - tvGetMore.setOnClickListener(this); - - } - - @Override - protected void onResume() { - super.onResume(); - if (isFirstLoad){ - isFirstLoad = false; - srlRefreshContainer.setRefreshing(true); - loadData(); - } - - } - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == tvGetMore.getId()) { - FamilyListActivity.start(this); - } - } - - @Override - public void onRefresh() { - loadData(); - } - - private void loadData(){ - getMvpPresenter().loadWeeklyRankData() - .doAfterTerminate(() -> srlRefreshContainer.setRefreshing(false)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(RespFamilyRankList respFamily) { - if (ListUtils.isListEmpty(respFamily.getFamilys())){ - llFamilyContainer.setVisibility(View.GONE); - tvGetMore.setVisibility(View.GONE); - return; - } - llFamilyContainer.setVisibility(View.VISIBLE); - if (respFamily.getCount() <= 6){ - tvGetMore.setVisibility(View.GONE); - } - familyWeeklyRankBoardAdapter.setNewData(respFamily.getFamilys()); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - - } - }); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java deleted file mode 100644 index e5f434464..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySearchActivity.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.View; -import android.view.inputmethod.EditorInfo; -import android.widget.EditText; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.erban.family.presenter.FamilySearchPresent; -import com.yizhuan.erban.family.view.adapter.FamilyAdapter; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -@CreatePresenter(FamilySearchPresent.class) -public class FamilySearchActivity extends BaseMvpActivity - implements IFamilySearchView, View.OnClickListener, BaseQuickAdapter.RequestLoadMoreListener { - - - private RecyclerView recyclerView; - private FamilyAdapter searchAdapter; - private EditText searchEdit; - private ImageView ivBack; - private TextView tvSearch; - private ImageView ivClearText; - - private String searchText; - - public static void start(Context context) { - Intent intent = new Intent(context,FamilySearchActivity.class); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_search); - - initView(); - } - - - private void initView() { - recyclerView = (RecyclerView) findViewById(R.id.recycler_view); - searchEdit = (EditText) findViewById(R.id.search_edit); - searchEdit.addTextChangedListener(textWatcher); - searchEdit.setImeOptions(EditorInfo.IME_ACTION_SEARCH); - searchEdit.setOnEditorActionListener(new TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_ACTION_SEARCH || (event!=null && event.getKeyCode()== KeyEvent.KEYCODE_ENTER)) { - searchText = v.getText().toString(); - if (TextUtils.isEmpty(searchText)){ -// Toast.makeText(v.getContext(),ResUtil.getString(R.string.view_activity_familysearchactivity_01),Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_activity_familysearchactivity_02)); - return true; - } - searchFamily(searchText); - hideIME(); - return true; - } - return false; - - } - }); - recyclerView.setLayoutManager(new LinearLayoutManager(this,LinearLayoutManager.VERTICAL,false)); - if (recyclerView.getItemDecorationCount() == 0) { - recyclerView.addItemDecoration(new ColorDecoration(getResources().getColor(R.color.color_F1F1F1), 0,1, false)); - } - searchAdapter = new FamilyAdapter(this, null); - View headerView = LayoutInflater.from(this).inflate(R.layout.layout_search_header, null,false); - searchAdapter.addHeaderView(headerView); - searchAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { - @Override - public void onItemClick(BaseQuickAdapter adapter, View view, int position) { - FamilyInfo familyInfo = (FamilyInfo) adapter.getData().get(position); - FamilyHomeActivity.start(FamilySearchActivity.this,familyInfo.getFamilyId()); - } - }); - //搜索去掉分页 -// searchAdapter.setEnableLoadMore(true); -// searchAdapter.setOnLoadMoreListener(this, recyclerView); - recyclerView.setAdapter(searchAdapter); - - ivBack = (ImageView) findViewById(R.id.iv_back); - ivBack.setOnClickListener(this); - - tvSearch = (TextView) findViewById(R.id.tv_search); - tvSearch.setOnClickListener(this); - - ivClearText = (ImageView) findViewById(R.id.iv_clear_text); - ivClearText.setOnClickListener(this); - ivClearText.setVisibility(View.GONE); - - } - - private TextWatcher textWatcher = new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (TextUtils.isEmpty(s.toString())) { - ivClearText.setVisibility(View.GONE); - } else { - ivClearText.setVisibility(View.VISIBLE); - } - } - }; - - @Override - public void onClick(View v) { - int id = v.getId(); - if (id == ivBack.getId()){ - finish(); - }else if (id == tvSearch.getId()){ - searchText = searchEdit.getText().toString(); - if (TextUtils.isEmpty(searchText)){ -// Toast.makeText(this,ResUtil.getString(R.string.view_activity_familysearchactivity_03),Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_activity_familysearchactivity_04)); - return; - } - hideIME(); - searchFamily(searchText); - - }else if (id == ivClearText.getId()){ - searchEdit.setText(""); - } - - } - - @Override - public void onReloadDate() { - super.onReloadDate(); -// searchFamily(searchText); - } - - private void searchFamily(String key){ - showLoading(); - getMvpPresenter().search(key).subscribe(new SingleObserver>() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(List familyInfoList) { - if (familyInfoList != null && familyInfoList.size() > 0) { - hideStatus(); - searchAdapter.setNewData(familyInfoList); - searchAdapter.notifyDataSetChanged(); - } else { - showNoData(); - } - } - - @Override - public void onError(Throwable e) { - showNetworkErr(); - toast(e.getMessage()); - } - }); - } - - - - @Override - public void onLoadMoreRequested() { - getMvpPresenter().loadMoreData().subscribe(new SingleObserver>() { - @Override - public void onSubscribe(Disposable d) { - mCompositeDisposable.add(d); - } - - @Override - public void onSuccess(List familyInfoList) { - if (ListUtils.isListEmpty(familyInfoList)){ - searchAdapter.loadMoreEnd(true); - return; - } - searchAdapter.addData(familyInfoList); - searchAdapter.loadMoreComplete(); - } - - @Override - public void onError(Throwable e) { - toast(e.getMessage()); - searchAdapter.loadMoreComplete(); - } - }); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java deleted file mode 100644 index f45bdf67f..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilySelectFriendActivity.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.app.Activity; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.os.Bundle; - -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.common.ViewPagerAdapter; -import com.yizhuan.erban.decoration.view.widgets.CarMagicIndicator; -import com.yizhuan.erban.family.contract.viewinterface.IFamilySelectFriendActivityView; -import com.yizhuan.erban.family.presenter.FamilySelectFriendPresenter; -import com.yizhuan.erban.family.view.dialog.FamilyInviteConfirmDialog; -import com.yizhuan.erban.family.view.fragment.FamilyAttentionFragment; -import com.yizhuan.erban.family.view.fragment.FamilyFansListFragment; -import com.yizhuan.erban.family.view.fragment.FamilyFriendListFragment; -import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; - -@CreatePresenter(FamilySelectFriendPresenter.class) -public class FamilySelectFriendActivity extends BaseMvpActivity - implements IFamilySelectFriendActivityView, CarMagicIndicator.OnItemSelectListener { - - private TitleBar titleBar; - private MagicIndicator viewIndicator; - private ViewPager viewpager; - - private static SelectFriendCallBack callBack; - - private int pageLimitSize = 3; - private String[] titles = {ResUtil.getString(R.string.view_activity_familyselectfriendactivity_01), ResUtil.getString(R.string.view_activity_familyselectfriendactivity_02), ResUtil.getString(R.string.view_activity_familyselectfriendactivity_03)}; - - public static void start(Context context,SelectFriendCallBack selectFriendCallBack) { - callBack = selectFriendCallBack; - Intent intent = new Intent(context,FamilySelectFriendActivity.class); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_family_select_friend); - init(); - } - - private void init() { - titleBar = findViewById(R.id.title_bar); - initTitleBar(getString(R.string.title_select_friend)); -// titleBar.addAction(new TitleBar.Action() { -// @Override -// public String getText() { -// return null; -// } -// -// @Override -// public int getDrawable() { -// return R.drawable.ic_send_search; -// } -// -// @Override -// public void performAction(View view) { -// AitFriendsSearchActivity.startForSharing(FamilySelectFriendActivity.this); -// } -// }); - - viewIndicator = findViewById(R.id.view_indicator); - viewpager = findViewById(R.id.viewpager); - - viewpager.setOffscreenPageLimit(pageLimitSize); - viewpager.setAdapter(new ViewPagerAdapter(getSupportFragmentManager(), getFragment(), titles)); - - List tabInfoList = new ArrayList<>(2); - tabInfoList.add(new TabInfo(1, getString(R.string.tab_title_friends))); - tabInfoList.add(new TabInfo(2, getString(R.string.tab_title_attentions))); - tabInfoList.add(new TabInfo(3, getString(R.string.tab_title_fans))); - CommonNavigator commonNavigator = new CommonNavigator(this); - commonNavigator.setAdjustMode(true); - CarMagicIndicator indicator = new CarMagicIndicator(this, tabInfoList, 0); - indicator.setOnItemSelectListener(this); - commonNavigator.setAdapter(indicator); - viewIndicator.setNavigator(commonNavigator); - ViewPagerHelper.bind(viewIndicator, viewpager); - } - - private List getFragment() { - List list = new ArrayList<>(); - list.add(FamilyFriendListFragment.newInstances()); - list.add(FamilyAttentionFragment.newInstance()); - list.add(FamilyFansListFragment.newInstances()); - return list; - } - - @Override - public void onItemSelect(int position) { - viewpager.setCurrentItem(position); - } - - - public void onSelectFriend(UserInfo userInfo){ - showConfirmDialog(userInfo); - } - - private void showConfirmDialog(UserInfo userInfo) { - FamilyInviteConfirmDialog dialog = new FamilyInviteConfirmDialog(this); - dialog.setAvatar(userInfo.getAvatar()); - dialog.setName(userInfo.getNick()); - dialog.setOnOperationListener(new FamilyInviteConfirmDialog.OnOperationListener() { - @Override - public void onCancel(DialogInterface dialog) { - dialog.dismiss(); - } - - @Override - public void onOk(DialogInterface dialog) { - dialog.dismiss(); - if (callBack != null){ - callBack.onSelectFriend(FamilySelectFriendActivity.this, userInfo.getUid()); - } - finish(); - } - }); - dialog.show(); - } - - @Override - protected void onDestroy() { - callBack = null; - super.onDestroy(); - } - - public interface SelectFriendCallBack{ - void onSelectFriend(Activity activity, long uid); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyTextInputActivity.java b/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyTextInputActivity.java deleted file mode 100644 index 98c6b162f..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/activity/FamilyTextInputActivity.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.yizhuan.erban.family.view.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.EditText; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.constants.BundleKeys; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -public class FamilyTextInputActivity extends BaseMvpActivity implements IMvpBaseView{ - - public static final String CONTENT = "content"; - private EditText etInput; - private TitleBar titleBar; - - private static CallBack listener; - - - public static void start(Context context, String familyName, CallBack callBack){ - listener = callBack; - Intent intent = new Intent(context,FamilyTextInputActivity.class); - intent.putExtra(BundleKeys.KEY_EXTRA_1,familyName); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - String originalText = getIntent().getStringExtra(BundleKeys.KEY_EXTRA_1); - setContentView(R.layout.activity_family_text_input); - - titleBar = (TitleBar) findViewById(R.id.title_bar); - etInput = (EditText) findViewById(R.id.et_input); - etInput.setText(originalText); - - initTitleBar(getResources().getString(R.string.family_name_hint)); - titleBar.setActionTextColor(R.color.text_color_primary); - titleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.view_activity_familytextinputactivity_01)) { - @Override - public void performAction(View view) { - String content = etInput.getText().toString(); - //修改个人介绍 - if (!content - .trim() - .replaceAll("　","") - .isEmpty()) { - if (listener != null){ - listener.onModify(content); - } - finish(); - } else { - toast(ResUtil.getString(R.string.view_activity_familytextinputactivity_02)); - } - } - }); - - } - - @Override - protected void onDestroy() { - listener = null; - super.onDestroy(); - } - - public interface CallBack{ - void onModify(String str); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java deleted file mode 100644 index f34ee291d..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAdapter.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/4/16 - */ - -public class FamilyAdapter extends BaseQuickAdapter { - - private Context mContext; - private int mRound = 10; - - public FamilyAdapter(Context context, @Nullable List data) { - super(R.layout.item_family_list, data); - this.mContext = context; - - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, FamilyInfo familyInfo) { - SquareImageView ivCover = (SquareImageView) baseViewHolder.getView(R.id.iv_cover); - - GlideApp.with(mContext) - .load(familyInfo.getFamilyIcon()) - .placeholder(R.drawable.default_cover) - .transforms(new CenterCrop(), new RoundedCorners(mRound)) - .into(ivCover); - - TextView tvFamilyName = (TextView) baseViewHolder.getView(R.id.tv_family_name); - TextView tvFamilyId = (TextView) baseViewHolder.getView(R.id.tv_family_id); - TextView tvFamilyMemberCount = (TextView) baseViewHolder.getView(R.id.tv_family_member_count); - - tvFamilyName.setText(familyInfo.getFamilyName()); - tvFamilyId.setText(String.format(mContext.getResources().getString(R.string.family_id),familyInfo.getFamilyId())); - tvFamilyMemberCount.setText(String.format(mContext.getResources().getString(R.string.family_member_count),String.valueOf(familyInfo.getMemberCount()))); - - - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java deleted file mode 100644 index e3cd8c6fb..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyAttentionListAdapter.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.text.TextUtils; -import android.view.View; - -import androidx.appcompat.widget.AppCompatImageView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/5 - */ - -public class FamilyAttentionListAdapter extends BaseQuickAdapter { - - public FamilyAttentionListAdapter(List attentionInfoList) { - super(R.layout.family_attention_item, attentionInfoList); - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, AttentionInfo attentionInfo) { - if (attentionInfo == null) return; - - baseViewHolder.setText(R.id.tv_userName, attentionInfo.getNick()) - .setText(R.id.tv_user_desc, attentionInfo.getUserDesc() != null ? - attentionInfo.getUserDesc() - : baseViewHolder.itemView.getContext().getResources().getString(R.string.msg_no_user_desc)) - .setVisible(R.id.view_line, baseViewHolder.getLayoutPosition() != getItemCount() - 1); - - - AppCompatImageView ivGender = baseViewHolder.getView(R.id.iv_gender); - if (attentionInfo.getGender() == 1) { - ivGender.setImageResource(R.drawable.ic_gender_male); - } else { - ivGender.setImageResource(R.drawable.ic_gender_female); - } - - AppCompatImageView ivNobleLevel = baseViewHolder.getView(R.id.iv_noble_level); - if (attentionInfo.nobleUsers != null) { - ivNobleLevel.setVisibility(View.VISIBLE); - String badgeByLevel = NobleUtil.getBadgeByLevel(attentionInfo.nobleUsers.getLevel()); - if (!TextUtils.isEmpty(badgeByLevel)) { - NobleUtil.loadResource(badgeByLevel, ivNobleLevel); - } else { - ivNobleLevel.setVisibility(View.GONE); - } - } else { - ivNobleLevel.setVisibility(View.GONE); - } - - NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view); - nobleAvatarView.setSize(50, 75, 15); - nobleAvatarView.setData(attentionInfo.avatar, attentionInfo.nobleUsers); - - AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level); - ivUserLevel.setVisibility(View.GONE); - if (attentionInfo.userLevelVo != null && !TextUtils.isEmpty(attentionInfo.userLevelVo.getExperUrl())) { - ivUserLevel.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(mContext, attentionInfo.userLevelVo.getExperUrl(), ivUserLevel); - } - - AppCompatImageView ivCharmLevel = baseViewHolder.getView(R.id.iv_charm_level); - ivCharmLevel.setVisibility(View.GONE); - if (attentionInfo.userLevelVo != null && !TextUtils.isEmpty(attentionInfo.userLevelVo.getCharmUrl())) { - ivCharmLevel.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(mContext, attentionInfo.userLevelVo.getCharmUrl(), ivCharmLevel); - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyBannerAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyBannerAdapter.java deleted file mode 100644 index 0ece7cfa7..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyBannerAdapter.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.activity.AVRoomActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.rollviewpager.adapter.StaticPagerAdapter; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; - -import java.util.List; - - -public class FamilyBannerAdapter extends StaticPagerAdapter { - private Context context; - private List bannerInfoList; - private LayoutInflater mInflater; - - public FamilyBannerAdapter(List bannerInfoList, Context context) { - this.context = context; - this.bannerInfoList = bannerInfoList; - mInflater = LayoutInflater.from(context); - } - - public void setNewData(List data){ - this.bannerInfoList = data; - notifyDataSetChanged(); - } - - - @Override - public View getView(ViewGroup container, int position) { - FindBannerInfo bannerInfo = bannerInfoList.get(position); - String url = bannerInfo.getSkipUri(); - ImageView imgBanner = (ImageView) mInflater.inflate(R.layout.layout_family_banner_page_item, container, false); - //和游戏、首页tab一样，加载带大圆角的图 - ImageLoadUtils.loadGameBannerRoundBackground(context, bannerInfo.getBannerPic(), imgBanner); - - imgBanner.setOnClickListener(v -> { - if (TextUtils.isEmpty(url)) return; - if (bannerInfo.getSkipType() == FindBannerInfo.SKIP_TYP_H5) { - CommonWebViewActivity.start(context,url); - - } else if (bannerInfo.getSkipType() == FindBannerInfo.SKIP_TYP_CHAT_ROOM) { - if (TextUtils.isEmpty(url)) return; - try { - AVRoomActivity.start(context, Long.valueOf(url)); - } catch (NumberFormatException e) { - e.printStackTrace(); - } - } - }); - return imgBanner; - } - - @Override - public int getCount() { - if (bannerInfoList == null) { - return 0; - } else - return bannerInfoList.size(); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java deleted file mode 100644 index 369651360..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyCurrencyBillAdapter.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.view.View; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.jay.widget.StickyHeaders; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/5/30 - */ - -public class FamilyCurrencyBillAdapter extends BaseMultiItemQuickAdapter implements StickyHeaders { - - private Context mContext; - - public FamilyCurrencyBillAdapter(Context context, @Nullable List data) { - super(data); - this.mContext = context; - addItemType(VMBillItemInfo.TYPE_DATE_DIV, R.layout.item_family_currency_bill_date);//月份分割 - addItemType(VMBillItemInfo.TYPE_TRANSACTION_RECORD, R.layout.item_family_currency_transaction_record);//交易记录 - addItemType(VMBillItemInfo.TYPE_EMPTY_TIP, R.layout.item_family_currency_empty);//无记录 - } - - - @Override - protected void convert(BaseViewHolder helper, VMBillItemInfo item) { - if (item.getItemType() == VMBillItemInfo.TYPE_DATE_DIV){ - covertDateDIV(helper,(BillDateDivInfo) item.getData()); - } else if (item.getItemType() == VMBillItemInfo.TYPE_TRANSACTION_RECORD){ - covertTransactionRecord(helper, (TransactionRecordInfo) item.getData()); - } - } - - - private void covertDateDIV(BaseViewHolder helper, BillDateDivInfo item) { - if (null == item) return; - String currencyName = item.getMoneyName(); - - TextView tvDate = (TextView) helper.getView(R.id.tv_date); - TextView tvSummary = (TextView) helper.getView(R.id.tv_summary); - tvDate.setText(item.getDate()); - tvSummary.setText(String.format(mContext.getResources().getString(R.string.family_currency_bill_summary), - FormatUtils.formatToShortDown(item.getExpend()), - currencyName, - FormatUtils.formatToShortDown(item.getIncome()), - currencyName)); - tvDate.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (null != onDateSelectListener){ - onDateSelectListener.onDateSelect(); - } - } - }); - - - } - - private void covertTransactionRecord(BaseViewHolder helper, TransactionRecordInfo item) { - if (null == item) return; - - CircleImageView civImg = (CircleImageView) helper.getView(R.id.civ_img); - TextView tvDesc = (TextView) helper.getView(R.id.tv_desc); - TextView tvFrom = (TextView) helper.getView(R.id.tv_from); - TextView tvData = (TextView) helper.getView(R.id.tv_data); - TextView tvTime = (TextView) helper.getView(R.id.tv_time); - - - GlideApp.with(mContext) - .load(item.getAvatar()) - .placeholder(R.drawable.default_avatar) - .dontAnimate() - .into(civImg); - - civImg.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (item.getUid() > 0) { - UserInfoDialog.showNewUserInfoDialog(mContext,item.getUid()); - } - } - }); - - tvDesc.setText(item.getTitle()); - tvFrom.setText(item.getDesc()); - tvData.setText(FormatUtils.formatToShortDown(item.getData()) + item.getMoneyName()); - if (item.getData() >= 0) { - tvData.setTextColor(mContext.getResources().getColor(R.color.appColor)); - }else { - tvData.setTextColor(mContext.getResources().getColor(R.color.color_333333)); - } - tvTime.setText(item.getDate()); - - - } - - @Override - public boolean isStickyHeader(int i) { - return getItemViewType(i) == VMBillItemInfo.TYPE_DATE_DIV ; - } - - private OnDateSelectListener onDateSelectListener; - - public void setOnDateSelectListener(OnDateSelectListener onDateSelectListener) { - this.onDateSelectListener = onDateSelectListener; - } - - public interface OnDateSelectListener{ - public void onDateSelect(); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java deleted file mode 100644 index c0c42f5f2..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFansViewAdapter.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.text.TextUtils; -import android.view.View; - -import androidx.appcompat.widget.AppCompatImageView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/5 - */ - -public class FamilyFansViewAdapter extends BaseQuickAdapter { - - public FamilyFansViewAdapter(List fansInfoList) { - super(R.layout.family_fans_list_item, fansInfoList); - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, FansInfo fansInfo) { - if (fansInfo == null) return; - baseViewHolder.setText(R.id.tv_userName, fansInfo.getNick()) - .setText(R.id.tv_user_desc, fansInfo.getUserDesc() != null ? - fansInfo.getUserDesc() - : baseViewHolder.itemView.getContext().getResources().getString(R.string.msg_no_user_desc)) - .setVisible(R.id.view_line, baseViewHolder.getLayoutPosition() != getItemCount() - 1); - - NobleAvatarView nobleAvatarView = baseViewHolder.getView(R.id.noble_avatar_view); - nobleAvatarView.setSize(50, 75, 15); - nobleAvatarView.setData(fansInfo.getAvatar(), fansInfo.getNobleUsers()); - - AppCompatImageView ivGender = baseViewHolder.getView(R.id.iv_gender); - if (fansInfo.getGender() == 1) { - ivGender.setImageResource(R.drawable.ic_gender_male); - } else { - ivGender.setImageResource(R.drawable.ic_gender_female); - } - - AppCompatImageView ivNobleLevel = baseViewHolder.getView(R.id.iv_noble_level); - if (fansInfo.getNobleUsers() != null) { - ivNobleLevel.setVisibility(View.VISIBLE); - String badgeByLevel = NobleUtil.getBadgeByLevel(fansInfo.getNobleUsers().getLevel()); - if (!TextUtils.isEmpty(badgeByLevel)) { - NobleUtil.loadResource(badgeByLevel, ivNobleLevel); - } else { - ivNobleLevel.setVisibility(View.GONE); - } - } else { - ivNobleLevel.setVisibility(View.GONE); - } - - AppCompatImageView ivUserLevel = baseViewHolder.getView(R.id.iv_user_level); - ivUserLevel.setVisibility(View.GONE); - if (fansInfo.getUserLevelVo() != null && !TextUtils.isEmpty(fansInfo.getUserLevelVo().getExperUrl())) { - ivUserLevel.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(mContext, fansInfo.getUserLevelVo().getExperUrl(), ivUserLevel); - } - - AppCompatImageView ivCharmLevel = baseViewHolder.getView(R.id.iv_charm_level); - ivCharmLevel.setVisibility(View.GONE); - if (fansInfo.getUserLevelVo() != null && !TextUtils.isEmpty(fansInfo.getUserLevelVo().getCharmUrl())) { - ivCharmLevel.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(mContext, fansInfo.getUserLevelVo().getCharmUrl(), ivCharmLevel); - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java deleted file mode 100644 index f1eab7fa2..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyFriendListAdapter.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.text.TextUtils; -import android.view.View; - -import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatImageView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ - -public class FamilyFriendListAdapter extends BaseQuickAdapter { - private Context context; - - public FamilyFriendListAdapter(Context context, @Nullable List data) { - super(R.layout.family_list_item_friend, data); - this.context = context; - } - - @Override - protected void convert(BaseViewHolder helper, UserInfo item) { - if (item == null) return; - - helper.setText(R.id.tv_userName, item.getNick()) - .setText(R.id.tv_user_desc, item.getUserDesc() != null ? - item.getUserDesc() - : helper.itemView.getContext().getResources().getString(R.string.msg_no_user_desc)); - - NobleAvatarView mNobleAvatarView = helper.getView(R.id.noble_avatar_view); - mNobleAvatarView.setSize(47, 70, 13); - mNobleAvatarView.setData(item.getAvatar(), item.getNobleUsers()); - - AppCompatImageView ivGender = helper.getView(R.id.iv_gender); - if (item.getGender() == 1) { - ivGender.setImageResource(R.drawable.ic_gender_male); - } else { - ivGender.setImageResource(R.drawable.ic_gender_female); - } - - AppCompatImageView ivNobleLevel = helper.getView(R.id.iv_noble_level); - if (item.getNobleUsers() != null) { - ivNobleLevel.setVisibility(View.VISIBLE); - String badgeByLevel = NobleUtil.getBadgeByLevel(item.getNobleUsers().getLevel()); - if (!TextUtils.isEmpty(badgeByLevel)) { - NobleUtil.loadResource(badgeByLevel, ivNobleLevel); - } else { - ivNobleLevel.setVisibility(View.GONE); - } - } else { - ivNobleLevel.setVisibility(View.GONE); - } - - AppCompatImageView ivUserLevel = helper.getView(R.id.iv_user_level); - ivUserLevel.setVisibility(View.GONE); - if (item.getUserLevelVo() != null && !TextUtils.isEmpty(item.getUserLevelVo().getExperUrl())) { - ivUserLevel.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(mContext, item.getUserLevelVo().getExperUrl(), ivUserLevel); - } - - AppCompatImageView ivCharmLevel = helper.getView(R.id.iv_charm_level); - ivCharmLevel.setVisibility(View.GONE); - if (item.getUserLevelVo() != null && !TextUtils.isEmpty(item.getUserLevelVo().getCharmUrl())) { - ivCharmLevel.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(mContext, item.getUserLevelVo().getCharmUrl(), ivCharmLevel); - } - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java deleted file mode 100644 index 528757576..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGameListAdapter.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.text.TextUtils; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.makeramen.roundedimageview.RoundedImageView; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/23 - */ - -public class FamilyGameListAdapter extends BaseQuickAdapter { - - private Context mContext; - public FamilyGameListAdapter(Context context, @Nullable List data) { - super(R.layout.item_family_game_list,data); - this.mContext = context; - - } - - @Override - protected void convert(BaseViewHolder helper, FamilyGameInfo item) { - RoundedImageView rivCover = (RoundedImageView) helper.getView(R.id.riv_cover); - TextView tvName = (TextView) helper.getView(R.id.tv_name); - - GlideApp.with(mContext) - .load(TextUtils.isEmpty(item.getIcon()) ? R.drawable.default_cover : item.getIcon()) - .placeholder(R.drawable.default_cover) - .error(R.drawable.default_cover) - .into(rivCover); - - tvName.setText(item.getName()); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java deleted file mode 100644 index 761e75627..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGamesAdapter.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.text.TextUtils; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.makeramen.roundedimageview.RoundedImageView; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; - -import java.util.List; - -/** - * @author jack - */ - -public class FamilyGamesAdapter extends BaseQuickAdapter { - - private Context mContext; - - public FamilyGamesAdapter(Context context, @Nullable List data) { - super(R.layout.item_family_games, data); - this.mContext = context; - } - - @Override - protected void convert(BaseViewHolder helper, FamilyGameInfo item) { - RoundedImageView rivCover = helper.getView(R.id.riv_cover); - TextView tvName = helper.getView(R.id.tv_name); - - GlideApp.with(mContext) - .load(TextUtils.isEmpty(item.getIcon()) ? R.drawable.default_cover : item.getIcon()) - .placeholder(R.drawable.default_cover) - .error(R.drawable.default_cover) - .into(rivCover); - - tvName.setText(item.getName()); - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java deleted file mode 100644 index 667a9becd..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyGroupAdapter.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyGroupInfo; - -import java.util.List; - -/** - * @author jack - */ -public class FamilyGroupAdapter extends BaseQuickAdapter { - - private Context mContext; - - public FamilyGroupAdapter(Context context, @Nullable List data) { - super(R.layout.item_family_group, data); - this.mContext = context; - } - - @Override - protected void convert(BaseViewHolder helper, FamilyGroupInfo item) { - SquareImageView ivCover = helper.getView(R.id.iv_cover); - TextView tvFamilyGroupName = helper.getView(R.id.tv_family_group_name); - TextView tvFamilyGroupDesc = helper.getView(R.id.tv_family_group_desc); - - TextView tvJoinGroup = helper.getView(R.id.tv_join_group); - ImageView ivArrowRight = helper.getView(R.id.iv_arrow_right); - - GlideApp.with(mContext) - .load(TextUtils.isEmpty(item.getIcon()) ? R.drawable.default_cover : item.getIcon()) - .placeholder(R.drawable.default_cover) - .error(R.drawable.default_cover) - .transforms(new CenterCrop(), new RoundedCorners(10)) - .into(ivCover); - - tvFamilyGroupName.setText(item.getName()); - tvFamilyGroupDesc.setText(String.format( - mContext.getResources().getString(R.string.family_member_count), - String.valueOf(item.getMemberCount()))); - - if (item.isExists()){ - tvJoinGroup.setVisibility(View.GONE); - ivArrowRight.setVisibility(View.VISIBLE); - helper.itemView.setOnClickListener(v -> { - if (actionListener != null){ - actionListener.onGotoGroup(item); - } - }); - } else { - tvJoinGroup.setVisibility(View.VISIBLE); - ivArrowRight.setVisibility(View.GONE); - tvJoinGroup.setOnClickListener(v -> { - if (actionListener != null){ - actionListener.onJoin(item); - } - }); - } - - } - - private ActionListener actionListener; - - public void setActionListener(ActionListener actionListener) { - this.actionListener = actionListener; - } - - public interface ActionListener{ - void onJoin(FamilyGroupInfo groupInfo); - void onGotoGroup(FamilyGroupInfo groupInfo); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java deleted file mode 100644 index 7b4ac8d9b..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyManageAdapter.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/4/16 - */ - -public class FamilyManageAdapter extends BaseQuickAdapter { - - public FamilyManageAdapter( @Nullable List data) { - super(R.layout.item_family_manage_rv, data); - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, FamilyManageItemInfo familyManageItemInfo) { - SquareImageView ivImg = (SquareImageView) baseViewHolder.getView(R.id.iv_img); - ivImg.setImageResource(familyManageItemInfo.getImg()); - TextView tvName = (TextView) baseViewHolder.getView(R.id.tv_name); - tvName.setText(familyManageItemInfo.getName()); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java deleted file mode 100644 index 0cdb2956c..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberAdapter.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.text.TextUtils; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.common.util.Utils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/5/25 - */ - -public class FamilyMemberAdapter extends BaseQuickAdapter { - - private Context mContext; - - - public FamilyMemberAdapter(Context context, @Nullable List data) { - super(R.layout.item_family_member, data); - this.mContext = context; - } - - @Override - protected void convert(BaseViewHolder helper, FamilyMemberInfo item) { - - - View view = helper.itemView; - ViewGroup.LayoutParams lp = view.getLayoutParams(); - lp.width = (Utils.getWindowWidth(mContext) - Utils.dip2px(mContext,30 + 20*4)) / 5; - view.setLayoutParams(lp); - - CircleImageView rivCover = (CircleImageView) helper.getView(R.id.riv_cover); - ImageView ivPatriarchTag = (ImageView) helper.getView(R.id.iv_patriarch_tag); - TextView tvName = (TextView) helper.getView(R.id.tv_name); - - GlideApp.with(mContext) - .load(TextUtils.isEmpty(item.getIcon()) ? R.drawable.default_avatar : item.getIcon()) - .placeholder(R.drawable.default_avatar) - .error(R.drawable.default_avatar) - .into(rivCover); - tvName.setText(item.getName()); - if (item.getPosition() == FamilyMemberInfo.LEVEL_PATRIARCH){ - ivPatriarchTag.setVisibility(View.VISIBLE); - }else { - ivPatriarchTag.setVisibility(View.GONE); - } - - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java deleted file mode 100644 index 25db173ad..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyMemberListAdapter.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageButton; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/5/28 - */ - -public class FamilyMemberListAdapter extends BaseQuickAdapter { - - private Context mContext; - private int optType; - - public FamilyMemberListAdapter(Context context, @Nullable List data, int optType) { - super(R.layout.item_family_member_list,data); - this.mContext = context; - this.optType = optType; - } - - @Override - protected void convert(BaseViewHolder helper, FamilyMemberInfo item) { - - CircleImageView civAvatar = (CircleImageView) helper.getView(R.id.civ_avatar); - - ImageView ivPatriarchTag = helper.getView(R.id.iv_patriarch_tag); - - TextView tvName = (TextView) helper.getView(R.id.tv_name); - TextView tvErbanId = (TextView) helper.getView(R.id.tv_erban_id); - - if (item.getGender() == 1) { - helper.setImageResource(R.id.iv_gender, R.drawable.ic_gender_male); - } else { - helper.setImageResource(R.id.iv_gender, R.drawable.ic_gender_female); - } - - - ImageButton tvMemberRemove = helper.getView(R.id.tv_member_remove); - UserLevelVo userLevelVo = item.getUserLevelVo(); - ImageView ivUserLevel = helper.getView(R.id.iv_user_level); - ImageView ivUserCharm = helper.getView(R.id.iv_user_charm); - ivUserLevel.setVisibility(userLevelVo == null ? View.GONE : View.VISIBLE); - ivUserLevel.setVisibility(userLevelVo == null ? View.GONE : View.VISIBLE); - if (userLevelVo != null) { - ivUserLevel.setVisibility(TextUtils.isEmpty(userLevelVo.getExperUrl()) ? View.GONE : View.VISIBLE); - if (!TextUtils.isEmpty(userLevelVo.getExperUrl())) { - ImageLoadUtils.loadImage(mContext, userLevelVo.getExperUrl(), ivUserLevel); - } - ivUserCharm.setVisibility(TextUtils.isEmpty(userLevelVo.getCharmUrl()) ? View.GONE : View.VISIBLE); - if (!TextUtils.isEmpty(userLevelVo.getCharmUrl())) { - ivUserCharm.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(mContext, userLevelVo.getCharmUrl(), ivUserCharm); - } - } - GlideApp.with(mContext) - .load(TextUtils.isEmpty(item.getIcon()) ? R.drawable.default_avatar : item.getIcon()) - .placeholder(R.drawable.default_avatar) - .error(R.drawable.default_avatar) - .into(civAvatar); - tvName.setText(item.getName()); - tvErbanId.setText(String.format( - mContext.getResources().getString(R.string.family_member_erban_id), - String.valueOf(item.getErbanNo()) - )); - - if (item.getPosition() == FamilyMemberInfo.LEVEL_PATRIARCH){ - ivPatriarchTag.setVisibility(View.VISIBLE); - }else { - ivPatriarchTag.setVisibility(View.GONE); - } - civAvatar.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (null != actionListener){ - actionListener.onClickAvatar(item); - } - } - }); - if (optType == FamilyMemberListActivity.TYPE_SELECT_MEMBER){ - tvMemberRemove.setVisibility(View.GONE); - helper.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (null != actionListener){ - actionListener.onTransferCurrency(item); - } - } - }); - }else if (optType == FamilyMemberListActivity.TYPE_REMOVE_MEMBER){ - if (item.getPosition() == FamilyMemberInfo.LEVEL_PATRIARCH) { - tvMemberRemove.setVisibility(View.GONE); - }else { - tvMemberRemove.setVisibility(View.VISIBLE); - tvMemberRemove.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (null != actionListener){ - actionListener.onRemoveMember(item); - } - } - }); - } - }else if (optType == FamilyMemberListActivity.TYPE_SHOW_MEMBER){ - tvMemberRemove.setVisibility(View.GONE); - - }else if (optType == FamilyMemberListActivity.TYPE_CHECK_MEMBER_CURRENCY){ - tvMemberRemove.setVisibility(View.GONE); - helper.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (null != actionListener){ - actionListener.onCheckMemberCurrency(item); - } - } - }); - } - - } - - private ActionListener actionListener; - - public void setActionListener(ActionListener actionListener) { - this.actionListener = actionListener; - } - - public interface ActionListener{ - public void onRemoveMember(FamilyMemberInfo familyMemberInfo); - public void onTransferCurrency(FamilyMemberInfo familyMemberInfo); - void onClickAvatar(FamilyMemberInfo item); - void onCheckMemberCurrency(FamilyMemberInfo item); - } - - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java b/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java deleted file mode 100644 index 8259ff8f9..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/adapter/FamilyWeeklyRankBoardAdapter.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.yizhuan.erban.family.view.adapter; - -import android.content.Context; -import android.view.View; -import android.widget.TextView; - -import androidx.annotation.Nullable; - -import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/4/16 - */ - -public class FamilyWeeklyRankBoardAdapter extends BaseQuickAdapter { - - private Context mContext; - private int mRound = 10; - - public FamilyWeeklyRankBoardAdapter(Context context, @Nullable List data) { - super(R.layout.item_family_weekly_rank_list, data); - this.mContext = context; - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, RankingFamilyInfo familyInfo) { - SquareImageView ivCover = baseViewHolder.getView(R.id.iv_cover); - - GlideApp.with(mContext) - .load(familyInfo.getIcon()) - .placeholder(R.drawable.default_cover) - .transforms(new CenterCrop(), new RoundedCorners(mRound)) - .into(ivCover); - - TextView tvRanking = baseViewHolder.getView(R.id.tv_ranking); - TextView tvCharm = baseViewHolder.getView(R.id.tv_charm); - TextView tvCharmLabel = baseViewHolder.getView(R.id.tv_charm_label); - TextView tvFamilyName = baseViewHolder.getView(R.id.tv_family_name); - TextView tvFamilyId = baseViewHolder.getView(R.id.tv_family_id); - - tvFamilyName.setText(familyInfo.getName()); - tvFamilyId.setText(String.format(mContext.getResources().getString(R.string.family_id),familyInfo.getId())); - - int position = getItemPositionInList(getData(),familyInfo); - if (position == 0){ - tvCharmLabel.setVisibility(View.GONE); - tvCharm.setVisibility(View.VISIBLE); - tvCharm.setText("No.1"); - }else { - tvCharmLabel.setVisibility(View.VISIBLE); - tvCharm.setVisibility(View.VISIBLE); - RankingFamilyInfo previousOne = getData().get(position - 1); - long charmDiff = previousOne.getFamilyCharm() - familyInfo.getFamilyCharm(); - tvCharm.setText(FormatUtils.formatToShortHalfUp(charmDiff)); - } - - if (position == 0){ - tvRanking.setBackgroundResource(R.mipmap.ic_family_weekly_ranking_1); - tvRanking.setText(""); - }else if (position == 1){ - tvRanking.setBackgroundResource(R.mipmap.ic_family_weekly_ranking_2); - tvRanking.setText(""); - }else if (position == 2){ - tvRanking.setBackgroundResource(R.mipmap.ic_family_weekly_ranking_3); - tvRanking.setText(""); - }else { - tvRanking.setText(String.valueOf(position + 1)); - tvRanking.setBackgroundResource(R.drawable.shape_circle_gray_small); - } - - } - - private int getItemPositionInList(List list,RankingFamilyInfo familyInfo){ - int pos = -1; - for (int i = 0; i < list.size(); i++) { - if (familyInfo.getId().equals(list.get(i).getId())){ - pos = i; - break; - } - } - return pos; - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java deleted file mode 100644 index 27ec0fa76..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyContributionDialog.java +++ /dev/null @@ -1,163 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.view.View; -import android.widget.EditText; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -/** - * @author jack - * @Description 贡献家族币 - * @Date 2018/5/30 - */ - -public class FamilyContributionDialog extends Dialog { - - private TextView tvTitle; - private TextView tvFamilyCurrencyBalanceTip; - private TextView tvFamilyCurrencyBalanceValue; - private TextView tvMemberName; - private EditText etInput; - private TextView tvCurrencyName; - private TextView tvCancel; - private TextView tvOk; - - private FamilyMoneyManagementInfo familyMoneyManagementInfo; - - public FamilyContributionDialog(@NonNull Context context) { - super(context, R.style.easy_dialog_style); - } - - public FamilyContributionDialog(Context context, FamilyMoneyManagementInfo familyMoneyManagementInfo) { - this(context); - this.familyMoneyManagementInfo = familyMoneyManagementInfo; - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - init(); - } - - private void init() { - setCancelable(false); - setCanceledOnTouchOutside(false); - - setContentView(R.layout.dialog_family_currency_contribution); - - tvTitle = (TextView) findViewById(R.id.tv_title); - tvFamilyCurrencyBalanceTip = (TextView) findViewById(R.id.tv_family_currency_balance_tip); - tvFamilyCurrencyBalanceValue = (TextView) findViewById(R.id.tv_family_currency_balance_value); - tvMemberName = (TextView) findViewById(R.id.tv_member_name); - etInput = (EditText) findViewById(R.id.et_input); - tvCurrencyName = (TextView) findViewById(R.id.tv_currency_name); - tvCancel = (TextView) findViewById(R.id.tv_cancel); - tvOk = (TextView) findViewById(R.id.tv_ok); - - tvTitle.setText(String.format( - ResUtil.getString(R.string.family_currency_contribution), - familyMoneyManagementInfo.getMoneyName() - )); - tvFamilyCurrencyBalanceTip.setText(String.format( - ResUtil.getString(R.string.family_currency_contribution_balance_tip), - familyMoneyManagementInfo.getMoneyName() - )); - tvFamilyCurrencyBalanceValue.setText(String.format( - ResUtil.getString(R.string.family_currency_count), - FormatUtils.formatToShortDown(familyMoneyManagementInfo.getTotalAmount()), - familyMoneyManagementInfo.getMoneyName() - )); - tvCurrencyName.setText(familyMoneyManagementInfo.getMoneyName()); - - tvCancel.setOnClickListener(v -> { - ImeUtil.hideIME(getContext(),etInput); - if (null != onOperationListener){ - onOperationListener.onCancel(FamilyContributionDialog.this); - } - }); - - tvOk.setOnClickListener(v -> { - ImeUtil.hideIME(getContext(),etInput); - String str = etInput.getText().toString().trim(); - if (TextUtils.isEmpty(str)){ - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_dialog_familycontributiondialog_02)); - return; - } - double count = Double.valueOf(str); - if (count < 0.01f){ - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_dialog_familycontributiondialog_04)); - return; - } - if (null != onOperationListener){ - onOperationListener.onOk(FamilyContributionDialog.this, count); - } - }); - - - etInput.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - if (s.toString().contains(".")) { - if (s.length() - 1 - s.toString().indexOf(".") > 2) { - s = s.toString().subSequence(0, - s.toString().indexOf(".") + 3); - etInput.setText(s); - etInput.setSelection(s.length()); - } - } - if (s.toString().trim().substring(0).equals(".")) { - s = "0" + s; - etInput.setText(s); - etInput.setSelection(2); - } - - if (s.toString().startsWith("0") - && s.toString().trim().length() > 1) { - if (!s.toString().substring(1, 2).equals(".")) { - etInput.setText(s.subSequence(0, 1)); - etInput.setSelection(1); - return; - } - } - - } - - @Override - public void afterTextChanged(Editable s) { - - } - }); - - } - - private OnOperationListener onOperationListener; - - public void setOnOperationListener(OnOperationListener onOperationListener) { - this.onOperationListener = onOperationListener; - } - - public interface OnOperationListener{ - void onCancel(DialogInterface dialog); - void onOk(DialogInterface dialog, double count); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java deleted file mode 100644 index 6651033a7..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyDisbandDialog.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.os.Bundle; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.xchat_android_core.family.bean.CustomServiceInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyCustomServiceInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -/** - * @author jack - */ - -public class FamilyDisbandDialog extends Dialog { - - private TextView tvDisbandTip; - private CustomServiceInfo serviceInfo; - - - public FamilyDisbandDialog(@NonNull Context context) { - super(context, R.style.easy_dialog_style); - init(); - } - - private void init() { - setCancelable(false); - setCanceledOnTouchOutside(false); - - setContentView(R.layout.dialog_disband_family); - tvDisbandTip = findViewById(R.id.tv_disband_tip); - TextView tvCancel = findViewById(R.id.tv_cancel); - TextView tvContactService = findViewById(R.id.tv_contact_service); - - tvCancel.setOnClickListener(v -> dismiss()); - tvContactService.setOnClickListener(v -> { - dismiss(); - if (null != serviceInfo) { - NimP2PMessageActivity.start(getContext(), serviceInfo.getUid()); - }else { -// Toast.makeText(getContext(),ResUtil.getString(R.string.view_dialog_familydisbanddialog_01),Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_dialog_familydisbanddialog_02)); - } - }); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - FamilyCustomServiceInfo customServiceInfo = FamilyModel.Instance().getCustomServiceInfo(); - if (null == customServiceInfo){ -// Toast.makeText(getContext(),ResUtil.getString(R.string.view_dialog_familydisbanddialog_03),Toast.LENGTH_SHORT).show(); - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_dialog_familydisbanddialog_04)); - return; - } - - String str = ""; - for (int i = 0; i < customServiceInfo.getServices().size(); i++) { - CustomServiceInfo item = customServiceInfo.getServices().get(i); - if (item.getType() == CustomServiceInfo.TYPE_ONLINE){ - serviceInfo = item; - str = serviceInfo.getContent(); - } - } - - tvDisbandTip.setText(String.format(getContext().getResources().getString(R.string.family_disband_tip1), str)); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java deleted file mode 100644 index edb5004f4..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyExitTipDialog.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.view.View; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; - -/** - * @author jack - * @Description - * @Date 2018/6/19 - */ - -public class FamilyExitTipDialog extends Dialog { - - private TextView tvMessage; - private TextView tvCancel; - private TextView tvContactService; - - private FamilyInfo familyInfo; - - public FamilyExitTipDialog(@NonNull Context context, FamilyInfo familyInfo) { - super(context, R.style.easy_dialog_style); - this.familyInfo = familyInfo; - init(); - } - - private void init() { - setCancelable(true); - setCanceledOnTouchOutside(true); - - setContentView(R.layout.dialog_family_exit); - tvMessage = (TextView) findViewById(R.id.tv_message); - tvCancel = (TextView) findViewById(R.id.tv_cancel); - tvContactService = (TextView) findViewById(R.id.tv_contact_service); - - tvCancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (onOperationListener != null){ - onOperationListener.onCancel(FamilyExitTipDialog.this); - } - } - }); - tvContactService.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (onOperationListener != null){ - onOperationListener.onOk(FamilyExitTipDialog.this, familyInfo); - } - } - }); - } - - - private OnOperationListener onOperationListener; - - public void setOnOperationListener(OnOperationListener onOperationListener) { - this.onOperationListener = onOperationListener; - } - - public interface OnOperationListener{ - void onCancel(DialogInterface dialog); - void onOk(DialogInterface dialog, FamilyInfo familyInfo); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java deleted file mode 100644 index 1078b0c29..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyGuideDialog.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.os.Bundle; -import android.view.Gravity; -import android.view.View; -import android.view.Window; -import android.view.WindowManager; -import android.widget.ImageView; - -import androidx.annotation.NonNull; - -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/18 - */ - -public class FamilyGuideDialog extends Dialog { - - private ImageView ivGuide1; - private List guidePics = new ArrayList<>(); - private Iterator iterator; - - public FamilyGuideDialog(@NonNull Context context) { - super(context, R.style.common_dialog_theme); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - Window window = getWindow(); - if (window != null){ - window.getDecorView().setPadding(0,0,0,0); - WindowManager.LayoutParams lp = window.getAttributes(); - lp.width = WindowManager.LayoutParams.MATCH_PARENT; - lp.height = WindowManager.LayoutParams.MATCH_PARENT; - lp.gravity = Gravity.CENTER; - window.setAttributes(lp); - - } - - setContentView(R.layout.dialog_family_guide); - - - guidePics.add(R.mipmap.bg_family_guide_1); - guidePics.add(R.mipmap.bg_family_guide_2); - guidePics.add(R.mipmap.bg_family_guide_3); - iterator = guidePics.iterator(); - - ivGuide1 = (ImageView) findViewById(R.id.iv_guide_1); - GlideApp.with(getContext()) - .load(iterator.next()) - .dontAnimate() - .into(ivGuide1); - - ivGuide1.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (iterator.hasNext()){ - GlideApp.with(getContext()) - .load(iterator.next()) - .dontAnimate() - .into(ivGuide1); - }else { - dismiss(); - } - } - }); - - } - - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java deleted file mode 100644 index 5a55bacd4..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyInviteConfirmDialog.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.view.View; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.CircleImageView; - -/** - * @author jack - * @Description - * @Date 2018/6/19 - */ - -public class FamilyInviteConfirmDialog extends Dialog { - - private CircleImageView civAvatar; - private TextView tvMessage; - private TextView tvCancel; - private TextView tvContactService; - - private String avatar; - private CharSequence name; - - public FamilyInviteConfirmDialog(@NonNull Context context) { - super(context, R.style.easy_dialog_style); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - init(); - } - - private void init() { - setCancelable(true); - setCanceledOnTouchOutside(true); - setContentView(R.layout.dialog_family_invite_confirm); - - civAvatar = (CircleImageView) findViewById(R.id.civ_avatar); - tvMessage = (TextView) findViewById(R.id.tv_message); - tvCancel = (TextView) findViewById(R.id.tv_cancel); - tvContactService = (TextView) findViewById(R.id.tv_contact_service); - - tvCancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (onOperationListener != null){ - onOperationListener.onCancel(FamilyInviteConfirmDialog.this); - } - } - }); - tvContactService.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (onOperationListener != null){ - onOperationListener.onOk(FamilyInviteConfirmDialog.this); - } - } - }); - if (avatar != null){ - GlideApp.with(getContext()) - .load(avatar) - .dontAnimate() - .into(civAvatar); - } - if (name != null){ - tvMessage.setText(name); - } - } - - public void setAvatar(String avatar){ - this.avatar = avatar; - } - - public void setName(CharSequence name){ - this.name = name; - } - - - private OnOperationListener onOperationListener; - - public void setOnOperationListener(OnOperationListener onOperationListener) { - this.onOperationListener = onOperationListener; - } - - public interface OnOperationListener{ - void onCancel(DialogInterface dialog); - void onOk(DialogInterface dialog); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java deleted file mode 100644 index 091c4c094..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyJoinDialog.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.text.TextUtils; -import android.view.View; -import android.widget.EditText; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_library.utils.ImeUtil; - -/** - * @author jack - */ -public class FamilyJoinDialog extends Dialog { - - private TextView tvFamilyJoinTip; - private EditText etInput; - private TextView tvCancel; - private TextView tvOk; - - private String defaultVerifyMessage = ""; - - public FamilyJoinDialog(@NonNull Context context) { - super(context, R.style.easy_dialog_style); - init(); - } - - private void init() { - setCancelable(false); - setCanceledOnTouchOutside(false); - - setContentView(R.layout.dialog_family_join); - - - tvFamilyJoinTip = findViewById(R.id.tv_family_join_tip); - etInput = findViewById(R.id.et_input); - tvCancel = findViewById(R.id.tv_cancel); - tvOk = findViewById(R.id.tv_ok); - - etInput.setHint(getContext().getResources().getString(R.string.family_join_hint)); - - tvCancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - ImeUtil.hideIME(getContext(),etInput); - if (null != onOperationListener){ - onOperationListener.onCancel(FamilyJoinDialog.this); - } - } - }); - - tvOk.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - ImeUtil.hideIME(getContext(),etInput); - String str = etInput.getText().toString(); - if (!TextUtils.isEmpty(str)){ - defaultVerifyMessage = str; - } - if (null != onOperationListener){ - onOperationListener.onOk(FamilyJoinDialog.this,defaultVerifyMessage); - } - } - }); - - } - - /** - * 设置提示语句 - * @param msg - */ - public void setTipMessage(CharSequence msg){ - tvFamilyJoinTip.setText(msg); - } - - /** - * 设置默认验证信息 - * @param str - */ - public void setDefaultVerifyMessage(String str){ - etInput.setHint(str); - this.defaultVerifyMessage = str; - } - - - private OnOperationListener onOperationListener; - - public void setOnOperationListener(OnOperationListener onOperationListener) { - this.onOperationListener = onOperationListener; - } - - public interface OnOperationListener{ - void onCancel(DialogInterface dialog); - void onOk(DialogInterface dialog, String str); - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java deleted file mode 100644 index 43f048138..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyMenuDialog.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.graphics.drawable.Drawable; -import android.view.Gravity; -import android.view.View; -import android.view.Window; -import android.view.WindowManager; - -import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; - -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_library.utils.SizeUtils; -import com.yizhuan.xchat_android_library.widget.DrawableCenterTextView; - -/** - * @author jack - */ -public class FamilyMenuDialog extends Dialog { - - private FamilyInfo familyInfo; - - private Context mContext; - - public FamilyMenuDialog(@NonNull Context context, FamilyInfo familyInfo) { - super(context, R.style.easy_dialog_style); - mContext = context; - this.familyInfo = familyInfo; - init(null); - } - public FamilyMenuDialog(@NonNull Context context, FamilyInfo familyInfo, View attachView) { - super(context, R.style.easy_dialog_style); - mContext = context; - this.familyInfo = familyInfo; - init(attachView); - } - - private void init(View attachView) { - Window window = getWindow(); - WindowManager.LayoutParams lp = window.getAttributes(); - lp.gravity = Gravity.TOP | Gravity.END; - if (attachView != null) { - lp.x = attachView.getWidth() / 2 - SizeUtils.dp2px(mContext, 9); - lp.y = attachView.getHeight() + SizeUtils.dp2px(mContext, 10); - } - window.setAttributes(lp); - - setContentView(R.layout.dialog_family_menu); - - setCanceledOnTouchOutside(true); - - boolean isPatriarch = familyInfo.getPosition() == FamilyInfo.LEVEL_PATRIARCH; - - DrawableCenterTextView tvMenu1 = findViewById(R.id.tv_menu1); - View divider = findViewById(R.id.v_divider_family); - tvMenu1.setVisibility(isPatriarch ? View.VISIBLE : View.GONE); - divider.setVisibility(isPatriarch ? View.VISIBLE : View.GONE); - if (isPatriarch) { - tvMenu1.setOnClickListener(v -> { - if (null != onMenuClickListener){ - onMenuClickListener.onInviteFriends(FamilyMenuDialog.this,familyInfo); - } - }); - } - - DrawableCenterTextView tvMenu2 = findViewById(R.id.tv_menu2); - tvMenu2.setText(isPatriarch ? - getContext().getResources().getString(R.string.family_disband) : getContext().getResources().getString(R.string.family_exit_family)); - Drawable drawable = isPatriarch ? - ContextCompat.getDrawable(mContext, R.drawable.ic_dissolve_family) : ContextCompat.getDrawable(mContext, R.drawable.ic_exit_family); - tvMenu2.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null); - tvMenu2.setOnClickListener(v -> { - if (null != onMenuClickListener){ - if (familyInfo.getPosition() == FamilyInfo.LEVEL_PATRIARCH) { - onMenuClickListener.onDisbandFamily(FamilyMenuDialog.this, familyInfo); - }else { - onMenuClickListener.onExitFamily(FamilyMenuDialog.this, familyInfo); - } - } - }); - - } - - private OnMenuClickListener onMenuClickListener; - public void setOnMenuClickListener(OnMenuClickListener listener){ - this.onMenuClickListener = listener; - } - - public interface OnMenuClickListener{ - void onExitFamily(DialogInterface dialog, FamilyInfo familyInfo); - void onDisbandFamily(DialogInterface dialog, FamilyInfo familyInfo); - void onInviteFriends(DialogInterface dialog, FamilyInfo familyInfo); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java deleted file mode 100644 index a2a5e96ef..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyRemoveMemberDialog.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.os.Bundle; -import android.view.View; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; - -/** - * @author jack - * @Description - * @Date 2018/5/29 - */ - -public class FamilyRemoveMemberDialog extends Dialog { - - private TextView tvMessage; - private TextView tvCancel; - private TextView tvContactService; - - private FamilyMemberInfo familyMemberInfo; - - - public FamilyRemoveMemberDialog(@NonNull Context context, FamilyMemberInfo familyMemberInfo) { - super(context, R.style.easy_dialog_style); - this.familyMemberInfo = familyMemberInfo; - init(); - } - - private void init() { - setCancelable(false); - setCanceledOnTouchOutside(false); - - setContentView(R.layout.dialog_family_remove_member); - tvMessage = (TextView) findViewById(R.id.tv_message); - tvCancel = (TextView) findViewById(R.id.tv_cancel); - tvContactService = (TextView) findViewById(R.id.tv_contact_service); - - tvCancel.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (onOperationListener != null){ - onOperationListener.onCancel(FamilyRemoveMemberDialog.this); - } - } - }); - tvContactService.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (onOperationListener != null){ - onOperationListener.onOk(FamilyRemoveMemberDialog.this, familyMemberInfo); - } - } - }); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - tvMessage.setText(String.format( - getContext().getResources().getString(R.string.family_remove_member_tip), - familyMemberInfo.getName())); - - } - - - private OnOperationListener onOperationListener; - - public void setOnOperationListener(OnOperationListener onOperationListener) { - this.onOperationListener = onOperationListener; - } - - public interface OnOperationListener{ - void onCancel(DialogInterface dialog); - void onOk(DialogInterface dialog, FamilyMemberInfo familyMemberInfo); - } - - - - -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java b/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java deleted file mode 100644 index fe14e2adb..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/dialog/FamilyTransferDialog.java +++ /dev/null @@ -1,166 +0,0 @@ -package com.yizhuan.erban.family.view.dialog; - -import android.app.Dialog; -import android.content.Context; -import android.content.DialogInterface; -import android.text.Editable; -import android.text.TextUtils; -import android.text.TextWatcher; -import android.view.View; -import android.widget.EditText; -import android.widget.TextView; - -import androidx.annotation.NonNull; - -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ImeUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -/** - * @author jack - * @Description - * @Date 2018/5/30 - */ - -public class FamilyTransferDialog extends Dialog { - - private TextView tvTitle; - private TextView tvFamilyCurrencyBalanceTip; - private TextView tvFamilyCurrencyBalanceValue; - private TextView tvMemberName; - private EditText etInput; - private TextView tvCurrencyName; - private TextView tvCancel; - private TextView tvOk; - - private FamilyInfo familyInfo; - private FamilyMemberInfo familyMemberInfo; - - public FamilyTransferDialog(@NonNull Context context, FamilyInfo familyInfo, FamilyMemberInfo familyMemberInfo) { - super(context, R.style.easy_dialog_style); - this.familyInfo = familyInfo; - this.familyMemberInfo = familyMemberInfo; - init(); - } - - - private void init() { - setCancelable(false); - setCanceledOnTouchOutside(false); - - setContentView(R.layout.dialog_family_currency_transfer); - - tvTitle = (TextView) findViewById(R.id.tv_title); - tvFamilyCurrencyBalanceTip = (TextView) findViewById(R.id.tv_family_currency_balance_tip); - tvFamilyCurrencyBalanceValue = (TextView) findViewById(R.id.tv_family_currency_balance_value); - tvMemberName = (TextView) findViewById(R.id.tv_member_name); - etInput = (EditText) findViewById(R.id.et_input); - tvCurrencyName = (TextView) findViewById(R.id.tv_currency_name); - tvCancel = (TextView) findViewById(R.id.tv_cancel); - tvOk = (TextView) findViewById(R.id.tv_ok); - - tvTitle.setText(String.format( - ResUtil.getString(R.string.family_currency_transfer), - familyInfo.getMoneyName())); - - tvFamilyCurrencyBalanceTip.setText(String.format( - ResUtil.getString(R.string.family_currency_transfer_label1), - familyInfo.getMoneyName()) - ); - tvFamilyCurrencyBalanceValue.setText(String.format( - ResUtil.getString(R.string.family_currency_count), - FormatUtils.formatToShortDown(familyInfo.getFamilyMoney()), - familyInfo.getMoneyName() - ) - ); - tvMemberName.setText(familyMemberInfo.getName()); - tvCurrencyName.setText(familyInfo.getMoneyName()); - - - tvCancel.setOnClickListener(v -> { - ImeUtil.hideIME(getContext(),etInput); - if (null != onOperationListener){ - onOperationListener.onCancel(FamilyTransferDialog.this); - } - - }); - - tvOk.setOnClickListener(v -> { - ImeUtil.hideIME(getContext(),etInput); - if (familyMemberInfo.getUid() == AuthModel.get().getCurrentUid()){ - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_dialog_familytransferdialog_02)); - return; - } - String str = etInput.getText().toString().trim(); - if (TextUtils.isEmpty(str)){ - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_dialog_familytransferdialog_04)); - return; - } - double count = Double.valueOf(etInput.getText().toString().trim()); - if (count < 0.01f){ - SingleToastUtil.showToastShort(ResUtil.getString(R.string.view_dialog_familytransferdialog_06)); - return; - } - - if (null != onOperationListener){ - onOperationListener.onOk(FamilyTransferDialog.this, familyMemberInfo, count); - } - }); - - etInput.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - if (s.toString().contains(".")) { - if (s.length() - 1 - s.toString().indexOf(".") > 2) { - s = s.toString().subSequence(0, - s.toString().indexOf(".") + 3); - etInput.setText(s); - etInput.setSelection(s.length()); - } - } - if (s.toString().trim().substring(0).equals(".")) { - s = "0" + s; - etInput.setText(s); - etInput.setSelection(2); - } - - if (s.toString().startsWith("0") - && s.toString().trim().length() > 1) { - if (!s.toString().substring(1, 2).equals(".")) { - etInput.setText(s.subSequence(0, 1)); - etInput.setSelection(1); - return; - } - } - - } - - @Override - public void afterTextChanged(Editable s) { - - } - }); - - } - - private OnOperationListener onOperationListener; - - public void setOnOperationListener(OnOperationListener onOperationListener) { - this.onOperationListener = onOperationListener; - } - - public interface OnOperationListener{ - void onCancel(DialogInterface dialog); - void onOk(DialogInterface dialog, FamilyMemberInfo familyMemberInfo, double count); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java deleted file mode 100644 index 28c030097..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyAttentionFragment.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.yizhuan.erban.family.view.fragment; - -import android.app.Activity; -import android.view.View; - -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyAttentionFragmentView; -import com.yizhuan.erban.family.presenter.FamilyAttentionPresenter; -import com.yizhuan.erban.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.erban.family.view.adapter.FamilyAttentionListAdapter; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ -@CreatePresenter(FamilyAttentionPresenter.class) -public class FamilyAttentionFragment extends BaseMvpFragment - implements IFamilyAttentionFragmentView { - - private SwipeRefreshLayout swipeRefresh; - private RecyclerView userLiveRecyclerView; - - private FamilySelectFriendActivity activity; - - private FamilyAttentionListAdapter adapter; - - public static Fragment newInstance() { - return new FamilyAttentionFragment(); - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (activity instanceof FamilySelectFriendActivity){ - this.activity = (FamilySelectFriendActivity) activity; - } - } - @Override - public int getRootLayoutId() { - return R.layout.fragment_family_attention; - } - - @Override - public void onFindViews() { - swipeRefresh = (SwipeRefreshLayout) getView().findViewById(R.id.swipe_refresh); - userLiveRecyclerView = (RecyclerView) getView().findViewById(R.id.user_live_recyclerView); - - } - - @Override - public void onSetListener() { - swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - getMvpPresenter().refreshData(); - } - }); - - - } - - @Override - public void initiate() { - userLiveRecyclerView.setLayoutManager(new LinearLayoutManager(getContext(),LinearLayoutManager.VERTICAL,false)); - - adapter = new FamilyAttentionListAdapter(null); - adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { - @Override - public void onItemClick(BaseQuickAdapter adapter, View view, int position) { - AttentionInfo item = (AttentionInfo) adapter.getData().get(position); - UserInfo userInfo = new UserInfo(); - userInfo.setUid(item.getUid()); - userInfo.setNick(item.getNick()); - userInfo.setAvatar(item.getAvatar()); - activity.onSelectFriend(userInfo); - } - }); - adapter.setEnableLoadMore(true); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - getMvpPresenter().loadMoreData(); - } - }, userLiveRecyclerView); - - userLiveRecyclerView.setAdapter(adapter); - - - } - - @Override - public void onResume() { - super.onResume(); - if (ListUtils.isListEmpty(adapter.getData())){ - swipeRefresh.setRefreshing(true); - getMvpPresenter().refreshData(); - } - } - - @Override - public void onRefreshData(List attentionInfoList) { - swipeRefresh.setRefreshing(false); - if (!ListUtils.isListEmpty(attentionInfoList)){ - adapter.setNewData(attentionInfoList); - } else { - showNoData(getString(R.string.no_attention_text)); - } - } - - @Override - public void onRefreshDataFail(String error) { - swipeRefresh.setRefreshing(false); - showNetworkErr(); - toast(error); - } - - @Override - public void onLoadMoreData(List attentionInfoList) { - adapter.loadMoreComplete(); - if (!ListUtils.isListEmpty(attentionInfoList)){ - adapter.addData(attentionInfoList); - }else { - adapter.loadMoreEnd(true); - } - } - - @Override - public void onLoadMoreDataFail(String error) { - adapter.loadMoreComplete(); - adapter.loadMoreFail(); - toast(error); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyEmptyFragment.java b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyEmptyFragment.java deleted file mode 100644 index 86a976825..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyEmptyFragment.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.yizhuan.erban.family.view.fragment; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.TextView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.AbsStatusFragment; - -/** - * Created by xujiexing on 14-4-9. - */ -public class FamilyEmptyFragment extends AbsStatusFragment { - - private View.OnClickListener mOnClickListener; - private LinearLayout rlCenter; - - /** - * 通过设置负数top以达到有title状态下居中，无title状态下默认居中 - */ - public static FamilyEmptyFragment newInstance(int topPx) { - FamilyEmptyFragment fragment = new FamilyEmptyFragment(); - Bundle bundle = new Bundle(); - bundle.putInt("topPx", topPx); - fragment.setArguments(bundle); - return fragment; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = LayoutInflater.from(getActivity()).inflate(R.layout.fragment_family_empty, container, false); - - rlCenter = view.findViewById(R.id.rl_family_empty_center); - - Bundle bundle = this.getArguments(); - if (bundle != null) { - int topPx = bundle.getInt("topPx", 0); - setRlCenterTop(topPx); - } - - TextView textView = view.findViewById(R.id.tv_family_plaza); - textView.setOnClickListener(v -> { - if (mOnClickListener != null) { - mOnClickListener.onClick(v); - } - }); - return view; - } - - /** - * @param topPx px - */ - public void setRlCenterTop(int topPx) { - if (rlCenter != null) { - LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) rlCenter.getLayoutParams(); - layoutParams.setMargins(layoutParams.leftMargin, topPx, layoutParams.rightMargin, layoutParams.bottomMargin); - rlCenter.setLayoutParams(layoutParams); - } - } - - public void setOnClickListener(View.OnClickListener onClickListener) { - this.mOnClickListener = onClickListener; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java deleted file mode 100644 index 90675e4d7..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFansListFragment.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.yizhuan.erban.family.view.fragment; - -import android.app.Activity; -import android.view.View; - -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFansListFragmentView; -import com.yizhuan.erban.family.presenter.FamilyFansListPresenter; -import com.yizhuan.erban.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.erban.family.view.adapter.FamilyFansViewAdapter; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ -@CreatePresenter(FamilyFansListPresenter.class) -public class FamilyFansListFragment extends BaseMvpFragment - implements IFamilyFansListFragmentView { - - private SwipeRefreshLayout swipeRefresh; - private RecyclerView recyclerView; - private FamilySelectFriendActivity activity; - private FamilyFansViewAdapter adapter; - - public static Fragment newInstances() { - return new FamilyFansListFragment(); - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (activity instanceof FamilySelectFriendActivity){ - this.activity = (FamilySelectFriendActivity) activity; - } - } - @Override - public int getRootLayoutId() { - return R.layout.fragment_family_fans_list; - } - - @Override - public void onFindViews() { - swipeRefresh = (SwipeRefreshLayout) getView().findViewById(R.id.swipe_refresh); - recyclerView = (RecyclerView) getView().findViewById(R.id.recycler_view); - - } - - @Override - public void onSetListener() { - swipeRefresh.setOnRefreshListener(() -> { - getMvpPresenter().refreshData(); - }); - - } - - @Override - public void initiate() { - recyclerView.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.VERTICAL, false)); - adapter = new FamilyFansViewAdapter(null); - adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { - @Override - public void onItemClick(BaseQuickAdapter adapter, View view, int position) { - FansInfo item = (FansInfo) adapter.getData().get(position); - UserInfo userInfo = new UserInfo(); - userInfo.setUid(item.getUid()); - userInfo.setNick(item.getNick()); - userInfo.setAvatar(item.getAvatar()); - activity.onSelectFriend(userInfo); - } - }); - adapter.setEnableLoadMore(true); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - getMvpPresenter().loadMoreData(); - } - },recyclerView); - recyclerView.setAdapter(adapter); - - } - - @Override - public void onResume() { - super.onResume(); - if (ListUtils.isListEmpty(adapter.getData())){ - swipeRefresh.setRefreshing(true); - getMvpPresenter().refreshData(); - } - } - - @Override - public void onRefreshData(FansListInfo fansListInfo) { - swipeRefresh.setRefreshing(false); - adapter.setNewData(fansListInfo.getFansList()); - } - - @Override - public void onRefreshDataFail(String message) { - swipeRefresh.setRefreshing(false); - showNetworkErr(); - toast(message); - } - - @Override - public void onLoadMoreData(FansListInfo fansListInfo) { - adapter.loadMoreComplete(); - if (!ListUtils.isListEmpty(fansListInfo.getFansList())){ - adapter.addData(fansListInfo.getFansList()); - }else { - adapter.setEnableLoadMore(false); - adapter.loadMoreEnd(true); - } - } - - - - @Override - public void onLoadMoreDataFail(String message) { - adapter.loadMoreComplete(); - adapter.loadMoreFail(); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java b/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java deleted file mode 100644 index f86ca3399..000000000 --- a/app/src/main/java/com/yizhuan/erban/family/view/fragment/FamilyFriendListFragment.java +++ /dev/null @@ -1,147 +0,0 @@ -package com.yizhuan.erban.family.view.fragment; - -import android.content.Context; -import android.view.View; - -import androidx.fragment.app.Fragment; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.family.contract.viewinterface.IFamilyFriendListFragmentView; -import com.yizhuan.erban.family.presenter.FamilyFriendListPresenter; -import com.yizhuan.erban.family.view.activity.FamilySelectFriendActivity; -import com.yizhuan.erban.family.view.adapter.FamilyFriendListAdapter; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.List; - -/** - * @author jack - * @Description - * @Date 2018/7/4 - */ -@CreatePresenter(FamilyFriendListPresenter.class) -public class FamilyFriendListFragment extends BaseMvpFragment - implements IFamilyFriendListFragmentView { - - private SwipeRefreshLayout swipeRefresh; - private RecyclerView recyclerView; - private FamilyFriendListAdapter adapter; - - FamilySelectFriendActivity activity; - - @Override - public void onAttach(Context context) { - super.onAttach(context); - if (context instanceof FamilySelectFriendActivity) { - activity = (FamilySelectFriendActivity) context; - } - } - - @Override - public int getRootLayoutId() { - return R.layout.fragment_family_friend_list; - } - - public static Fragment newInstances() { - return new FamilyFriendListFragment(); - } - - @Override - public void onFindViews() { - swipeRefresh = (SwipeRefreshLayout) getView().findViewById(R.id.swipe_refresh); - recyclerView = (RecyclerView) getView().findViewById(R.id.recycler_view); - - } - - @Override - public void onSetListener() { - swipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() { - @Override - public void onRefresh() { - getMvpPresenter().refreshData(); - } - }); - } - - @Override - public void initiate() { - recyclerView.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL,false)); - adapter = new FamilyFriendListAdapter(getContext(),null); - adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { - @Override - public void onItemClick(BaseQuickAdapter adapter, View view, int position) { - UserInfo userInfo = (UserInfo) adapter.getData().get(position); - activity.onSelectFriend(userInfo); - } - }); - adapter.setEnableLoadMore(true); - adapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - getMvpPresenter().loadMoreData(); - } - },recyclerView); - recyclerView.setAdapter(adapter); - - } - - @Override - public void onResume() { - super.onResume(); - if (ListUtils.isListEmpty(adapter.getData())) { - swipeRefresh.setRefreshing(true); - getMvpPresenter().refreshData(); - } - } - - @Override - public void onReloadData() { - super.onReloadData(); - swipeRefresh.setRefreshing(true); - getMvpPresenter().refreshData(); - } - - @Override - public void onRefreshData(List userInfos) { - swipeRefresh.setRefreshing(false); - if (!ListUtils.isListEmpty(userInfos)) { - adapter.setNewData(userInfos); - }else { - showNoData(getString(R.string.no_frenids_text)); - } - } - - @Override - public void onRefreshDataFail(String message) { - swipeRefresh.setRefreshing(false); - showNetworkErr(); - toast(message); - } - - @Override - public void onLoadMoreData(List userInfos) { - adapter.loadMoreComplete(); - if (!ListUtils.isListEmpty(userInfos)){ - adapter.addData(userInfos); - }else { - adapter.setEnableLoadMore(false); - adapter.loadMoreEnd(true); - } - } - - - - @Override - public void onLoadMoreDataFail(String message) { - adapter.loadMoreComplete(); - adapter.loadMoreFail(); - toast(message); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/pay/fragment/GiveDiamondFragment.kt b/app/src/main/java/com/yizhuan/erban/pay/fragment/GiveDiamondFragment.kt index 6bb9e1a90..9c85f90e2 100644 --- a/app/src/main/java/com/yizhuan/erban/pay/fragment/GiveDiamondFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/pay/fragment/GiveDiamondFragment.kt @@ -9,9 +9,7 @@ import com.yizhuan.erban.base.BaseViewBindingFragment import com.yizhuan.erban.common.EmptyViewHelper import com.yizhuan.erban.databinding.FragmentGiveDiamondBinding import com.yizhuan.erban.pay.GiveGoldModel -import com.yizhuan.erban.pay.activity.GiveGoldDetailActivity import com.yizhuan.erban.pay.adapter.GiveDiamondDetailAdapter -import com.yizhuan.erban.pay.adapter.LatelyGiveAdapter import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo import com.yizhuan.xchat_android_library.utils.ResUtil diff --git a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java deleted file mode 100644 index 516750a32..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/activity/RadishRecordActivity.java +++ /dev/null @@ -1,128 +0,0 @@ -package com.yizhuan.erban.radish.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.View; -import android.widget.TextView; - -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; -import androidx.lifecycle.Observer; -import androidx.viewpager.widget.ViewPager; - -import com.netease.nim.uikit.StatusBarUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.radish.presenter.RadishRecordPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordView; -import com.yizhuan.erban.radish.wallet.RadishWalletManager; -import com.yizhuan.erban.radish.widget.RadishRecordNavAdapter; -import com.yizhuan.erban.ui.radish.RadishRecordFragment; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.radish.RadishWalletInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; - -@CreatePresenter(RadishRecordPresenter.class) -public class RadishRecordActivity extends BaseMvpActivity implements IRadishRecordView { - - private MagicIndicator mMagicIndicator; - private ViewPager mVpRadishRecord; - private TextView tvTotalRadish; - - public static void startActivity(Context context) { - Intent intent = new Intent(context, RadishRecordActivity.class); - context.startActivity(intent); - } - - @Override - protected boolean needSteepStateBar() { - return true; - } - - @Override - protected void setStatusBar() { - super.setStatusBar(); - StatusBarUtil.transparencyBar(this); - StatusBarUtil.StatusBarLightMode(this); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setContentView(R.layout.activity_radish_record); - findView(); - initTitleBar(ResUtil.getString(R.string.radish_activity_radishrecordactivity_02)); - setTotalRadish(0L); - - ArrayList fragments = new ArrayList<>(2); - fragments.add(RadishRecordFragment.newInstance(RadishRecordFragment.TYPE_RADISH_INCOME)); - fragments.add(RadishRecordFragment.newInstance(RadishRecordFragment.TYPE_RADISH_EXPAND)); - mVpRadishRecord.setAdapter(new RoomContributeListAdapter(getSupportFragmentManager(), fragments)); - CommonNavigator commonNavigator = new CommonNavigator(this); - commonNavigator.setAdjustMode(true); - - RadishRecordNavAdapter indicator = new RadishRecordNavAdapter(); - indicator.setOnItemSelectListener(position -> mVpRadishRecord.setCurrentItem(position)); - commonNavigator.setAdapter(indicator); - mMagicIndicator.setNavigator(commonNavigator); - ViewPagerHelper.bind(mMagicIndicator, mVpRadishRecord); - - RadishWalletManager.get().registerRadishNum(this, new Observer() { - @Override - public void onChanged(@Nullable RadishWalletInfo radishWalletInfo) { - if (radishWalletInfo != null) { - setTotalRadish(radishWalletInfo.getAmount()); - } - } - }); - getMvpPresenter().getRadishWallet(); - } - - private void findView() { - mMagicIndicator = findViewById(R.id.mi_radish_record); - mVpRadishRecord = findViewById(R.id.vp_radish_record); - tvTotalRadish = findViewById(R.id.tv_total_radish); - } - - private void setTotalRadish(long total) { - if (tvTotalRadish != null) - tvTotalRadish.setText(getMvpPresenter().formatBigDecimal(total)); - } - - @Override - public void initTitleBar(String title) { - if (mTitleBar != null) { - mTitleBar.setTitle(title); - mTitleBar.setImmersive(true); - mTitleBar.setTitleColor(getResources().getColor(R.color.white)); - mTitleBar.setLeftImageResource(R.drawable.arrow_left); - mTitleBar.setBackgroundColor(getResources().getColor(R.color.transparent)); - mTitleBar.setLeftClickListener(v -> finish()); - } - - addAction(); - } - - private void addAction() { - if (mTitleBar != null) { - mTitleBar.addAction(new TitleBar.ImageAction(R.mipmap.common_ic_help_white) { - @Override - public void performAction(View view) { - CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.JAVA_WEB_URL + "/peko/modules/rule/radish.html"); - } - }); - } - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java b/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java deleted file mode 100644 index a2cb63409..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/adapter/RadishRecordAdapter.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.yizhuan.erban.radish.adapter; - -import static com.yizhuan.erban.ui.radish.RadishRecordFragment.TYPE_RADISH_INCOME; - -import androidx.core.content.ContextCompat; - -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordInfo; -import com.yizhuan.xchat_android_library.utils.TimeUtils; - -import java.util.List; - -public class RadishRecordAdapter extends BillBaseAdapter { - private byte mType; - - public RadishRecordAdapter(List billItemEntityList, byte type) { - super(billItemEntityList); - addItemType(BillItemEntity.ITEM_NORMAL, R.layout.item_radish_record); - - mType = type; - } - - @Override - public void convertNormal(BaseViewHolder baseViewHolder, BillItemEntity billItemEntity) { - - RadishRecordInfo radishRecordInfo = billItemEntity.mRadishRecordInfo; - if (radishRecordInfo == null) return; - baseViewHolder.setText(R.id.tv_record_name, radishRecordInfo.getDescribeStr()) - .setText(R.id.tv_record_hmd, TimeUtils.getDateTimeString(radishRecordInfo.getCreateTime(), "HH:mm:ss")) - .setText(R.id.tv_record_value, radishRecordInfo.getAmountStr()) - .setTextColor(R.id.tv_record_value, - ContextCompat.getColor(mContext, mType == TYPE_RADISH_INCOME ? R.color.appColor : R.color.color_333333)); - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java b/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java deleted file mode 100644 index b23b114f9..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/helper/PrizeAnimUiHelper.java +++ /dev/null @@ -1,285 +0,0 @@ -package com.yizhuan.erban.radish.helper; - -import android.animation.AnimatorSet; -import android.animation.ObjectAnimator; -import android.annotation.SuppressLint; -import android.content.Context; -import android.graphics.drawable.Drawable; -import android.text.TextUtils; -import android.view.View; -import android.view.animation.DecelerateInterpolator; -import android.widget.ImageView; -import android.widget.TextView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.ShareDialog; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -import java.util.concurrent.TimeUnit; - -import cn.sharesdk.framework.Platform; -import io.reactivex.Single; -import io.reactivex.SingleObserver; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; - -/** - * 动画界面，签到和任务界面一样，整合一处 - * create by lvzebiao @2019/3/26 - */ -public class PrizeAnimUiHelper { - - /** - * 任务界面 - */ - public final static int TYPE_TASK_PAGE = 1; - - /** - * 签到界面 - */ - public final static int TYPE_SIGN_IN_PAGE = 2; - /** - * 累计奖励 - */ - public final static int TYPE_REWARD_PAGE = 3; - /** - * 瓜分钻石 - */ - public final static int TYPE_DRAW_GOLD = 4; - - private ImageView ivRewardBg; - private ImageView ivRewardContent; - private TextView tvDetailPrizeName; - private TextView tvLabelNum; - private TextView tvDetailPrizeNumber; - private TextView tvDetailTips; - private TextView tvDetailShare; - - private AnimatorSet contentAllSet; - - private AnimatorSet bgSet; - - private View clRewardAnimContainer; - - private Context context; - - private int mType; - - private PrizeAnim prizeAnim; - - private DialogManager dialogManager; - - private void close() { - clRewardAnimContainer.setVisibility(View.GONE); - prizeAnim = null; - } - - public void onCreate(Context context, View parent, int type, DialogManager dialogManager) { - this.context = context; - findView(); - this.clRewardAnimContainer = parent; - clRewardAnimContainer.setOnClickListener(v -> close()); - this.mType = type; - if (dialogManager == null) { - dialogManager = new DialogManager(context); - } - this.dialogManager = dialogManager; - clRewardAnimContainer.setVisibility(View.GONE); - if (mType == TYPE_TASK_PAGE) { - tvDetailTips.setVisibility(View.VISIBLE); - tvDetailShare.setVisibility(View.GONE); - } else { - tvDetailTips.setVisibility(View.GONE); - tvDetailShare.setVisibility(View.VISIBLE); - tvDetailShare.setOnClickListener(v -> { - if (prizeAnim == null) { - return; - } - final String day = String.valueOf(prizeAnim.getSignDays()) + ResUtil.getString(R.string.radish_helper_prizeanimuihelper_01); - final String reward = prizeAnim.getPrizeName(); - ShareDialog shareDialog = new ShareDialog(context); - shareDialog.setType(ShareDialog.TYPE_SHARE_H5); - shareDialog.setOnShareDialogItemClick(new ShareDialog.OnShareDialogItemClick() { - @Override - public void onInAppSharingItemClick() { - - } - - @Override - public void onSharePlatformClick(Platform platform) { - toShare(platform, day, reward); - } - }); - shareDialog.show(); - }); - } - - } - - private void findView() { - ivRewardBg = clRewardAnimContainer.findViewById(R.id.iv_reward_bg); - ivRewardContent = clRewardAnimContainer.findViewById(R.id.iv_reward_content); - tvDetailPrizeName = clRewardAnimContainer.findViewById(R.id.tv_detail_prize_name); - tvLabelNum = clRewardAnimContainer.findViewById(R.id.tv_label_number); - tvDetailPrizeNumber = clRewardAnimContainer.findViewById(R.id.tv_detail_prize_number); - tvDetailTips = clRewardAnimContainer.findViewById(R.id.tv_detail_tips); - tvDetailShare = clRewardAnimContainer.findViewById(R.id.tv_detail_share); - } - - public void showPrizeInfoUi(PrizeAnim prizeAnim) { - if (prizeAnim == null) { - return; - } - this.prizeAnim = prizeAnim; - clRewardAnimContainer.setVisibility(View.VISIBLE); - if (!TextUtils.isEmpty(prizeAnim.getPrizePic())) { - ImageLoadUtils.loadDrawable(context, prizeAnim.getPrizePic()) - .compose(RxHelper.bindContext(context)) - .subscribe(new BeanObserver() { - @Override - public void onErrorMsg(String error) { - - } - - @Override - public void onSuccess(Drawable drawable) { - playAnim(drawable); - } - }); - } else - playAnim(ivRewardContent.getContext().getResources().getDrawable(R.drawable.icon_draw_gold)); - - tvDetailPrizeName.setText(prizeAnim.getPrizeName()); - tvLabelNum.setVisibility(View.GONE); - tvDetailPrizeNumber.setVisibility(View.GONE); - - if (mType == TYPE_TASK_PAGE) { - tvDetailTips.setText(prizeAnim.getTips()); - } - } - - public void setType(int type) { - this.mType = type; - } - - @SuppressLint("CheckResult") - private void playAnim(Drawable drawable) { - - ivRewardBg.setImageResource(R.drawable.icon_reward_bg); - ivRewardContent.setImageDrawable(drawable); - - playRewardContentAnim(ivRewardContent); - ivRewardBg.setVisibility(View.INVISIBLE); - //noinspection ResultOfMethodCallIgnored - Single.timer(200, TimeUnit.MILLISECONDS, AndroidSchedulers.mainThread()) - .compose(RxHelper.bindContext(context)) - .subscribe(aLong -> { - playRewardBgAnim(ivRewardBg); - ivRewardBg.setVisibility(View.VISIBLE); - }); - } - - private void playRewardContentAnim(View ivRewardContent) { - //内容的动画 - //透明度 - ObjectAnimator contentAlpha = ObjectAnimator.ofFloat(ivRewardContent, "alpha", 0f, 1f); - contentAlpha.setDuration(200); - //缩放 - ObjectAnimator contentScaleX = ObjectAnimator.ofFloat(ivRewardContent, "scaleX", 0f, 1.15f, 1f); - ObjectAnimator contentScaleY = ObjectAnimator.ofFloat(ivRewardContent, "scaleY", 0f, 1.15f, 1f); - AnimatorSet contentScale = new AnimatorSet(); - contentScale.play(contentScaleX).with(contentScaleY); - contentScale.setDuration(640); - //内容的放一起 - contentAllSet = new AnimatorSet(); - contentAllSet.play(contentAlpha).with(contentScale); - contentAllSet.setInterpolator(new DecelerateInterpolator()); - contentAllSet.start(); - } - - private void playRewardBgAnim(View ivRewardBg) { - //背景动画 - ObjectAnimator animatorScaleY = ObjectAnimator.ofFloat(ivRewardBg, "scaleY", 0f, 1.1f, 1f); - ObjectAnimator animatorScaleX = ObjectAnimator.ofFloat(ivRewardBg, "scaleX", 0f, 1.1f, 1f); - - ObjectAnimator animatorAlpha = ObjectAnimator.ofFloat(ivRewardBg, "alpha", 0.4f, 1f); - animatorAlpha.setDuration(120); - - bgSet = new AnimatorSet(); - bgSet.play(animatorScaleX).with(animatorScaleY).with(animatorAlpha); - bgSet.setDuration(720); - bgSet.setInterpolator(new DecelerateInterpolator()); - bgSet.start(); - } - - public boolean onBackPressed() { - boolean hasHandle = false; - if (clRewardAnimContainer.getVisibility() == View.VISIBLE) { - clRewardAnimContainer.setVisibility(View.GONE); - hasHandle = true; - } - return hasHandle; - } - - public void onDestroy() { - if (contentAllSet != null) { - contentAllSet.cancel(); - } - if (bgSet != null) { - bgSet.cancel(); - } - } - - private void toShare(Platform platform, String day, String reward) { - - int shareType = SignInModel.SHARE_TYPE_REWARD; // 累计奖励 - if (mType == TYPE_DRAW_GOLD) - shareType = SignInModel.SHARE_TYPE_DRAW_GOLD; // 瓜分钻石 - - dialogManager.showProgressDialog(context, "", true); - new SignInModel().getShareImage(shareType, day, reward) - .subscribe(new BeanObserver() { - @Override - public void onErrorMsg(String error) { - SingleToastUtil.showToast(error); - dialogManager.dismissDialog(); - } - - @Override - public void onSuccess(String s) { - getShareImageSuccess(platform, s); - } - }); - } - - private void getShareImageSuccess(Platform platform, String s) { - ShareModel.get().shareImageForSignIn(platform, s).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(String s) { - dialogManager.dismissDialog(); - SignInModel signInModel = new SignInModel(); - signInModel.signShare(); - } - - @Override - public void onError(Throwable e) { - dialogManager.dismissDialog(); - } - }); - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/helper/TaskCenterDialogHelper.java b/app/src/main/java/com/yizhuan/erban/radish/helper/TaskCenterDialogHelper.java deleted file mode 100644 index 3339183cf..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/helper/TaskCenterDialogHelper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.yizhuan.erban.radish.helper; - -import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; - -public class TaskCenterDialogHelper { - - private Context mContext; - private DialogManager mDialogManager; - - public TaskCenterDialogHelper(Context context) { - this.mContext = context; - mDialogManager = new DialogManager(mContext); - } - - public void showDialog(String picUrl) { - View view1 = LayoutInflater.from(mContext).inflate(R.layout.dialog_task, null); - ImageView imageView = view1.findViewById(R.id.iv_task_guide); - if (imageView != null) - ImageLoadUtils.loadImage(mContext, picUrl, imageView); - - TextView cancel = view1.findViewById(R.id.btn_cancel); - cancel.setOnClickListener(v -> mDialogManager.dismissDialog()); - - mDialogManager.showCustomViewDialog(view1); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordFrgPresenter.java b/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordFrgPresenter.java deleted file mode 100644 index 72cd0917d..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordFrgPresenter.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.yizhuan.erban.radish.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordFrgView; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.RadishRecordResult; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -public class RadishRecordFrgPresenter extends BaseMvpPresenter { - - public void getRadishRecord(int page, int pageSize, long date, byte type) { - RadishModel.get().getRadishRecord(page, pageSize, date, type) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(RadishRecordResult radishRecordResult) { - if (radishRecordResult != null && radishRecordResult.isSuccess()) { - if (mMvpView != null) - mMvpView.getRadishRecordSuccess(radishRecordResult.getData()); - } else if (radishRecordResult != null){ - if (mMvpView != null) - mMvpView.getRadishRecordFail(radishRecordResult.getError()); - } - } - - @Override - public void onError(Throwable e) { - if (mMvpView != null) - mMvpView.getRadishRecordFail(e.getMessage()); - - } - }); - - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordPresenter.java b/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordPresenter.java deleted file mode 100644 index f5b8575af..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/presenter/RadishRecordPresenter.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yizhuan.erban.radish.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordView; -import com.yizhuan.xchat_android_core.radish.RadishModel; - -import java.math.RoundingMode; -import java.text.DecimalFormat; - -public class RadishRecordPresenter extends BaseMvpPresenter { - public void getRadishWallet() { - RadishModel.get().updateRadishWallet() - .subscribe(); - } - - public String formatBigDecimal(long bigDecimal) { - try { - DecimalFormat decimalFormat = new DecimalFormat("#,###"); - decimalFormat.setRoundingMode(RoundingMode.HALF_UP); - return decimalFormat.format(bigDecimal); - } catch (Exception e) { - } - return "0"; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java b/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java deleted file mode 100644 index 74c184325..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/activity/TaskCenterActivity.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.yizhuan.erban.radish.task.activity; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.view.ViewStub; - -import androidx.fragment.app.Fragment; -import androidx.viewpager.widget.ViewPager; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter; -import com.yizhuan.erban.base.BaseMvpActivity; -import com.yizhuan.erban.radish.helper.PrizeAnimUiHelper; -import com.yizhuan.erban.radish.task.fragment.TaskCenterFragment; -import com.yizhuan.erban.radish.task.presenter.TaskCenterPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterView; -import com.yizhuan.erban.radish.widget.TaskCenterNavAdapter; -import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; - -/** - * 任务中心 - * create by lvzebiao @2019/3/26 - */ -@CreatePresenter(TaskCenterPresenter.class) -public class TaskCenterActivity extends BaseMvpActivity implements ITaskCenterView { - - public interface FromPage { - String GIFT = ResUtil.getString(R.string.task_activity_taskcenteractivity_01); - String FIND = ResUtil.getString(R.string.task_activity_taskcenteractivity_02); - String RADISH_NOT_ENOUGH_DIALOG = ResUtil.getString(R.string.task_activity_taskcenteractivity_03); - } - - private MagicIndicator magicIndicator; - private ViewPager viewPager; - private ViewStub vsStartTips; - - PrizeAnimUiHelper priceAnimUiHelper; - - public static void start(Context context, String fromPage) { - Intent intent = new Intent(context, TaskCenterActivity.class); - context.startActivity(intent); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_task_center); - findView(); - initTitleBar(context.getResources().getString(R.string.task_center)); - priceAnimUiHelper = new PrizeAnimUiHelper(); - priceAnimUiHelper.onCreate(this, findViewById(R.id.cl_reward_anim_container), - PrizeAnimUiHelper.TYPE_TASK_PAGE, getDialogManager()); - - ArrayList fragments = new ArrayList<>(2); - TaskCenterFragment days = TaskCenterFragment.newInstance(TaskCenterFragment.TYPE_TASK); - days.setiTaskCenterView(this); - TaskCenterFragment task = TaskCenterFragment.newInstance(TaskCenterFragment.TYPE_ACHIEVEMENT); - task.setiTaskCenterView(this); - fragments.add(days); - fragments.add(task); - - viewPager.setAdapter(new RoomContributeListAdapter(getSupportFragmentManager(), fragments)); - CommonNavigator commonNavigator = new CommonNavigator(this); - commonNavigator.setAdjustMode(true); - - TaskCenterNavAdapter indicator = new TaskCenterNavAdapter(); - indicator.setOnItemSelectListener(position -> viewPager.setCurrentItem(position)); - commonNavigator.setAdapter(indicator); - magicIndicator.setNavigator(commonNavigator); - ViewPagerHelper.bind(magicIndicator, viewPager); - -// showStartTips(); - } - - private void findView() { - magicIndicator = findViewById(R.id.mi_task); - viewPager = findViewById(R.id.vp_task_center); - vsStartTips = findViewById(R.id.vs_start_tips); - } - - @Override - public void onBackPressed() { - if (priceAnimUiHelper.onBackPressed()) { - return; - } - super.onBackPressed(); - } - - @Override - public void playPriceAnim(TaskInfo info) { - if (priceAnimUiHelper != null && info != null) - priceAnimUiHelper.showPrizeInfoUi(PrizeAnim.formatTaskInfo(info)); - } - - public void initTitleBar(String title) { - mTitleBar = findViewById(R.id.title_bar); - if (mTitleBar != null) { - mTitleBar.setTitle(title); - mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.white)); - mTitleBar.setLeftImageResource(R.mipmap.common_ic_back_white); - mTitleBar.setBackgroundResource(R.color.transparent); - mTitleBar.setLeftClickListener(v -> onLeftClickListener()); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - priceAnimUiHelper.onDestroy(); - } - - private int indexTips = 0; - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/adpter/TaskCenterAdapter.java b/app/src/main/java/com/yizhuan/erban/radish/task/adpter/TaskCenterAdapter.java deleted file mode 100644 index 8863db61c..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/adpter/TaskCenterAdapter.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.yizhuan.erban.radish.task.adpter; - -import android.content.Context; -import android.text.TextUtils; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; - -/** - * create by lvzebiao @2019/3/26 - */ -public class TaskCenterAdapter extends BaseQuickAdapter { - - private Context context; - - public TaskCenterAdapter(Context context) { - super(R.layout.item_task); - this.context = context; - } - - @Override - protected void convert(BaseViewHolder helper, TaskInfo item) { - helper.setText(R.id.tv_task_name, item.getName()); - helper.setText(R.id.tv_task_desc, item.getDescription()); - - TextView tvOperationStatus = helper.getView(R.id.tv_operation_status); - helper.addOnClickListener(R.id.tv_operation_status); - tvOperationStatus.setClickable(true); - if (item.getStatus() == TaskInfo.STATUS_HAS_RECEIVED) { - //已完成 - tvOperationStatus.setText(R.string.task_done); - tvOperationStatus.setBackgroundResource(R.drawable.icon_task_has_received); - tvOperationStatus.setTextColor(context.getResources().getColor(R.color.color_B3B3B3)); - tvOperationStatus.setClickable(false); - } else if (item.getStatus() == TaskInfo.STATUS_FINISHED_NOT_RECEIVE) { - //完成未领取 - tvOperationStatus.setText(R.string.task_receive); - tvOperationStatus.setBackgroundResource(R.drawable.icon_task_finished_not_receive); - tvOperationStatus.setTextColor(context.getResources().getColor(R.color.white)); - } else { - //未完成 - tvOperationStatus.setText(R.string.task_go_to_finish); - tvOperationStatus.setBackgroundResource(R.drawable.icon_task_un_finish); - tvOperationStatus.setTextColor(context.getResources().getColor(R.color.white)); - } - - ImageView ivPrizeIcon = helper.getView(R.id.iv_prize_icon); - if (TextUtils.isEmpty(item.getPrizeIcon())) { - ivPrizeIcon.setVisibility(View.INVISIBLE); - } else { - ivPrizeIcon.setVisibility(View.VISIBLE); - ImageLoadUtils.loadImage(context, item.getPrizeIcon(), ivPrizeIcon); - } - - TextView tvPrizeNum = helper.getView(R.id.tv_prize_num); - if (item.getPrizeNum() > 0) { - tvPrizeNum.setVisibility(View.VISIBLE); - tvPrizeNum.setText("x" + item.getPrizeNum()); - } else { - tvPrizeNum.setVisibility(View.INVISIBLE); - } - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/fragment/TaskCenterFragment.java b/app/src/main/java/com/yizhuan/erban/radish/task/fragment/TaskCenterFragment.java deleted file mode 100644 index 6208bc97b..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/fragment/TaskCenterFragment.java +++ /dev/null @@ -1,193 +0,0 @@ -package com.yizhuan.erban.radish.task.fragment; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.view.View; - -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.SimpleItemAnimator; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseMvpFragment; -import com.yizhuan.erban.radish.helper.TaskCenterDialogHelper; -import com.yizhuan.erban.radish.task.adpter.TaskCenterAdapter; -import com.yizhuan.erban.radish.task.presenter.TaskCenterFrgPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterView; -import com.yizhuan.erban.radish.task.view.ITaskCenterViewFrg; -import com.yizhuan.erban.ui.im.RouterHandler; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.radish.task.ITaskModel; -import com.yizhuan.xchat_android_core.radish.task.TaskModel; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -@CreatePresenter(TaskCenterFrgPresenter.class) -public class TaskCenterFragment extends BaseMvpFragment implements ITaskCenterViewFrg{ - - public static final int TYPE_TASK = 1; - public static final int TYPE_ACHIEVEMENT = 2; - - private RecyclerView rvTaskList; - private SwipeRefreshLayout swipeRefresh; - - private TaskCenterAdapter adapter; - ITaskModel model = new TaskModel(); - private ITaskCenterView iTaskCenterView; - - public static TaskCenterFragment newInstance(int type) { - TaskCenterFragment fragment = new TaskCenterFragment(); - Bundle bundle = new Bundle(); - bundle.putInt("type", type); - fragment.setArguments(bundle); - return fragment; - } - - public void setiTaskCenterView(ITaskCenterView iTaskCenterView) { - this.iTaskCenterView = iTaskCenterView; - } - - @Override - public int getRootLayoutId() { - return R.layout.fragment_task_center; - } - - @Override - public void onFindViews() { - rvTaskList = mView.findViewById(R.id.rv_task_list); - swipeRefresh = mView.findViewById(R.id.swipe_refresh); - - rvTaskList.setLayoutManager(new LinearLayoutManager(mContext)); - rvTaskList.addItemDecoration(new HorizontalDecoration(UIUtil.dip2px(mContext, 12), true, true)); - ((SimpleItemAnimator) rvTaskList.getItemAnimator()).setSupportsChangeAnimations(false); // 禁recyclerView动画, 防止图片闪烁 - - adapter = new TaskCenterAdapter(mContext); - adapter.setHasStableIds(true); // 禁recyclerView动画, 防止图片闪烁 - adapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() { - @Override - public void onItemChildClick(BaseQuickAdapter adp, View view, int position) { - if (!(view.getId() == R.id.tv_operation_status)) { - return; - } - TaskInfo info = null; - if (position < adapter.getData().size()) { - info = adapter.getData().get(position); - } - if (info == null) { - return; - } - final TaskInfo item = info; - if (!item.isSupport()) { - SingleToastUtil.showToast(XChatConstants.UPDATE_VERSION_TIPS); - return; - } - if (item.getStatus() == TaskInfo.STATUS_FINISHED_NOT_RECEIVE) { - view.setClickable(false); - - new TaskModel().receivePrice(item.getConfigId(), item.getPrizeType()) - .compose(RxHelper.bindContext(mContext)) - .subscribe(new DontWarnObserver() { - @Override - public void accept(String s, String error) { - super.accept(s, error); - if (error != null) { - view.setClickable(true); - SingleToastUtil.showToast(error); - } else { - item.setStatus(TaskInfo.STATUS_HAS_RECEIVED); - adapter.notifyItemChanged(position); - //播放动画 - if (iTaskCenterView != null) - iTaskCenterView.playPriceAnim(item); - } - } - }); - - } else if (item.getStatus() == TaskInfo.STATUS_UN_FINISH) { - boolean record = false; - if (item.getSkipType() == TaskInfo.SHIP_TYPE_APP) { - boolean result = RouterHandler.handle(mContext, item.getRouterType(), item.getRouterValue()); - if (!result) { - SingleToastUtil.showToast(XChatConstants.UPDATE_VERSION_TIPS); - return; - } - - record = true; - - } else if (item.getSkipType() == TaskInfo.SHIP_TYPE_TASK){ - TaskCenterDialogHelper helper = new TaskCenterDialogHelper(mContext); - helper.showDialog(item.getStepPic()); - record = true; - - } else - SingleToastUtil.showToast(XChatConstants.UPDATE_VERSION_TIPS); - - if (record) { - - } - } - } - }); - - rvTaskList.setAdapter(adapter); - swipeRefresh.setOnRefreshListener(this::loadData); - } - - @Override - public void onResume() { - super.onResume(); - loadData(); - } - - @SuppressLint("CheckResult") - private void loadData() { - //noinspection ResultOfMethodCallIgnored - if (mType == TYPE_TASK) { - model.getTaskList() - .compose(bindToLifecycle()) - .subscribe((taskInfos, throwable) -> { - swipeRefresh.setRefreshing(false); - if (throwable != null) { - toast(throwable.getMessage()); - } else { - adapter.setNewData(taskInfos); - } - }); - - } else if (mType == TYPE_ACHIEVEMENT) { - model.getAchievementTaskList() - .compose(bindToLifecycle()) - .subscribe((taskInfos, throwable) -> { - swipeRefresh.setRefreshing(false); - if (throwable != null) { - toast(throwable.getMessage()); - } else { - adapter.setNewData(taskInfos); - } - }); - - } - - } - - @Override - public void onSetListener() { - - } - - private int mType = 1; - @Override - public void initiate() { - Bundle bundle = getArguments(); - if (bundle != null) - mType = bundle.getInt("type", 1); - - } -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterFrgPresenter.java b/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterFrgPresenter.java deleted file mode 100644 index da4835cef..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterFrgPresenter.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.erban.radish.task.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterViewFrg; - -public class TaskCenterFrgPresenter extends BaseMvpPresenter { -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterPresenter.java b/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterPresenter.java deleted file mode 100644 index 9b5b1acf2..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/presenter/TaskCenterPresenter.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.erban.radish.task.presenter; - -import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.radish.task.view.ITaskCenterView; - -/** - * create by lvzebiao @2019/3/27 - */ -public class TaskCenterPresenter extends BaseMvpPresenter { - - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterView.java b/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterView.java deleted file mode 100644 index 9a748c4ed..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterView.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.erban.radish.task.view; - -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -/** - * create by lvzebiao @2019/3/27 - */ -public interface ITaskCenterView extends IMvpBaseView { - void playPriceAnim(TaskInfo info); -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterViewFrg.java b/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterViewFrg.java deleted file mode 100644 index b726bb91b..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/task/view/ITaskCenterViewFrg.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.radish.task.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface ITaskCenterViewFrg extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordFrgView.java b/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordFrgView.java deleted file mode 100644 index df5dba45e..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordFrgView.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.yizhuan.erban.radish.view; - -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IRadishRecordFrgView extends IMvpBaseView { - void getRadishRecordSuccess(RadishRecordListInfo list); - void getRadishRecordFail(String message); -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordView.java b/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordView.java deleted file mode 100644 index f09a90de2..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/view/IRadishRecordView.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.erban.radish.view; - -import com.yizhuan.xchat_android_library.base.IMvpBaseView; - -public interface IRadishRecordView extends IMvpBaseView { -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/wallet/RadishWalletManager.java b/app/src/main/java/com/yizhuan/erban/radish/wallet/RadishWalletManager.java deleted file mode 100644 index 21b32e060..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/wallet/RadishWalletManager.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.yizhuan.erban.radish.wallet; - -import androidx.lifecycle.LifecycleOwner; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.Observer; - -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.RadishWalletInfo; -import com.yizhuan.xchat_android_core.radish.event.RadishWalletInfoUpdateEvent; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -/** - * 萝卜数据统一管理，与data层接通数据 - * 连接UI层显示 - * create by lvzebiao @2019/3/25 - */ -public class RadishWalletManager { - - private static final class Helper { - public static final RadishWalletManager INSTANCE = new RadishWalletManager(); - } - - private RadishWalletManager() { - EventBus.getDefault().register(this); - ldRadishWallet.setValue(new RadishWalletInfo()); - } - - public static RadishWalletManager get() { - return Helper.INSTANCE; - } - - private MutableLiveData ldRadishWallet = new MutableLiveData<>(); - - public void registerRadishNum(LifecycleOwner owner, Observer observer) { - ldRadishWallet.observe(owner, observer); - } - - public MutableLiveData getLdRadishNumber() { - return ldRadishWallet; - } - - public void updateRadishNum(long newNum) { - RadishWalletInfo info = RadishModel.get().getRadishWalletInfo(); - info.setAmount(newNum); - ldRadishWallet.setValue(info); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onRadishWalletInfoUpdateEvent(RadishWalletInfoUpdateEvent event) { - RadishWalletInfo info = RadishModel.get().getRadishWalletInfo(); - if (info != null) { - ldRadishWallet.setValue(info); - } - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/widget/RadishRecordNavAdapter.java b/app/src/main/java/com/yizhuan/erban/radish/widget/RadishRecordNavAdapter.java deleted file mode 100644 index 2dea256b6..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/widget/RadishRecordNavAdapter.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yizhuan.erban.radish.widget; - -import android.content.Context; -import android.graphics.Color; -import android.view.ViewGroup; -import android.widget.FrameLayout; - -import androidx.core.content.ContextCompat; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; - -public class RadishRecordNavAdapter extends CommonNavigatorAdapter { - - private List mTitleList = new ArrayList<>(); - - public RadishRecordNavAdapter() { - mTitleList.add(ResUtil.getString(R.string.radish_widget_radishrecordnavadapter_01)); - mTitleList.add(ResUtil.getString(R.string.radish_widget_radishrecordnavadapter_02)); - } - - @Override - public int getCount() { - return mTitleList.size(); - } - - @Override - public IPagerTitleView getTitleView(Context context, int index) { - BadgeScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new BadgeScaleTransitionPagerTitleView(context); - scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_B3FFFFFF)); - scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.white)); - scaleTransitionPagerTitleView.setMinScale(1.0f); - scaleTransitionPagerTitleView.setTextSize(16); - scaleTransitionPagerTitleView.setText(mTitleList.get(index)); - - scaleTransitionPagerTitleView.setOnClickListener(view -> { - if (mOnItemSelectListener != null) { - mOnItemSelectListener.onItemSelect(index); - } - }); - return scaleTransitionPagerTitleView; - } - - @Override - public IPagerIndicator getIndicator(Context context) { - LinePagerIndicator indicator = new LinePagerIndicator(context); - indicator.setMode(LinePagerIndicator.MODE_EXACTLY); - indicator.setLineHeight(UIUtil.dip2px(context, 0)); - indicator.setRoundRadius(UIUtil.dip2px(context, 0)); - indicator.setLineWidth(UIUtil.dip2px(context, 0)); - indicator.setColors(Color.parseColor("#FF894F")); - FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - //lp.bottomMargin = 0; - indicator.setLayoutParams(lp); - return indicator; - } - - - private OnItemSelectListener mOnItemSelectListener; - - public void setOnItemSelectListener(OnItemSelectListener mOnItemSelectListener) { - this.mOnItemSelectListener = mOnItemSelectListener; - } - - public interface OnItemSelectListener { - void onItemSelect(int position); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java b/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java deleted file mode 100644 index 7a0d51110..000000000 --- a/app/src/main/java/com/yizhuan/erban/radish/widget/TaskCenterNavAdapter.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yizhuan.erban.radish.widget; - -import android.content.Context; -import android.graphics.Color; -import android.view.ViewGroup; -import android.widget.FrameLayout; - -import androidx.core.content.ContextCompat; - -import com.yizhuan.erban.R; -import com.yizhuan.erban.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import java.util.ArrayList; -import java.util.List; - -public class TaskCenterNavAdapter extends CommonNavigatorAdapter { - - private List mTitleList = new ArrayList<>(); - - public TaskCenterNavAdapter() { - mTitleList.add(ResUtil.getString(R.string.radish_widget_taskcenternavadapter_01)); - mTitleList.add(ResUtil.getString(R.string.radish_widget_taskcenternavadapter_02)); - } - - @Override - public int getCount() { - return mTitleList.size(); - } - - @Override - public IPagerTitleView getTitleView(Context context, int index) { - BadgeScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new BadgeScaleTransitionPagerTitleView(context); - scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_B3FFFFFF)); - scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.white)); - scaleTransitionPagerTitleView.setMinScale(1.0f); - scaleTransitionPagerTitleView.setTextSize(16); - scaleTransitionPagerTitleView.setText(mTitleList.get(index)); - - scaleTransitionPagerTitleView.setOnClickListener(view -> { - if (mOnItemSelectListener != null) { - mOnItemSelectListener.onItemSelect(index); - } - }); - return scaleTransitionPagerTitleView; - } - - @Override - public IPagerIndicator getIndicator(Context context) { - LinePagerIndicator indicator = new LinePagerIndicator(context); - indicator.setMode(LinePagerIndicator.MODE_EXACTLY); - indicator.setLineHeight(UIUtil.dip2px(context, 4)); - indicator.setRoundRadius(UIUtil.dip2px(context, 2)); - indicator.setLineWidth(UIUtil.dip2px(context, 17)); - indicator.setColors(Color.parseColor("#FFFFFF")); - FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); - //lp.bottomMargin = 0; - indicator.setLayoutParams(lp); - return indicator; - } - - - private OnItemSelectListener mOnItemSelectListener; - - public void setOnItemSelectListener(OnItemSelectListener mOnItemSelectListener) { - this.mOnItemSelectListener = mOnItemSelectListener; - } - - public interface OnItemSelectListener { - void onItemSelect(int position); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java b/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java index 827a29c23..951281c5f 100644 --- a/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/team/adapter/TeamMemberListAdapter.java @@ -42,13 +42,11 @@ public class TeamMemberListAdapter extends BaseAdapter { @Override protected void convert(BindingViewHolder helper, TeamMemberInfo item) { - ViewDataBinding binding = helper.getBinding(); HeadImageView ivAvatar = helper.getView(R.id.iv_avatar); ImageView officePosition = helper.getView(R.id.iv_user_office_position); TextView tvName = helper.getView(R.id.tv_name); TextView tvErbanId = helper.getView(R.id.tv_erban_id); - TextView tvMemberRemove = helper.getView(R.id.tv_member_remove); GlideApp.with(context) @@ -78,12 +76,6 @@ public class TeamMemberListAdapter extends BaseAdapter { } } -// if (item.getUid() == AuthModel.get().getCurrentUid()) { -// button.setVisibility(View.GONE); -// } else { -// button.setVisibility(View.VISIBLE); -// } -// int role = TeamModel.get().getTeamInfoCache(item.getTid()).getRole(); switch (item.getRole()) { case TeamMemberInfo.ROLE_TEAM_OWNER: officePosition.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java index 906903a1b..1a8d8425e 100644 --- a/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java +++ b/app/src/main/java/com/yizhuan/erban/team/view/NimTeamMessageActivity.java @@ -30,7 +30,6 @@ import com.netease.nimlib.sdk.team.model.TeamMember; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.common.widget.DragLayout; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.team.viewmodel.TeamVM; import com.yizhuan.erban.ui.im.actions.FamilyGameAction; import com.yizhuan.erban.ui.im.actions.LuckyMoneyAction; @@ -102,11 +101,11 @@ public class NimTeamMessageActivity extends BaseMessageActivity { managementView = findViewById(R.id.iv_team_member_list); teamAvatarLayout = (DragLayout) findViewById(R.id.avatar_image_layout); teamAvatar = (ImageView) findViewById(R.id.avatar_image); - teamAvatarLayout.setOnClickListener(v -> { - if (FamilyModel.Instance().getMyFamily() != null) { - FamilyHomeActivity.start(this, FamilyModel.Instance().getMyFamily().getFamilyId()); - } - }); +// teamAvatarLayout.setOnClickListener(v -> { +// if (FamilyModel.Instance().getMyFamily() != null) { +// FamilyHomeActivity.start(this, FamilyModel.Instance().getMyFamily().getFamilyId()); +// } +// }); if (FamilyModel.Instance().getMyFamily() != null) { ImageLoadUtils.loadAvatar(getApplicationContext(), FamilyModel.Instance().getMyFamily().getFamilyIcon(), teamAvatar, true); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index 725dd072d..585b11633 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -16,7 +16,6 @@ import com.yizhuan.erban.base.DialogManagerInterface; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.decoration.view.DecorationStoreActivity; import com.yizhuan.erban.decoration.view.MyDecorationActivity; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.fansteam.FansTeamListActivity; import com.yizhuan.erban.home.activity.CollectionRoomActivity; import com.yizhuan.erban.home.activity.VisitorListActivity; @@ -27,7 +26,6 @@ import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity; import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity; import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; -import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; import com.yizhuan.erban.relation.cp.activity.CpHomeActivity; import com.yizhuan.erban.relation.cp.activity.CpInviteRecordActivity; import com.yizhuan.erban.relation.cp.activity.CpTaskActivity; @@ -134,10 +132,6 @@ public class RouterHandler { case RouterType.USER_CARD_WEAR: MyDecorationActivity.start(context, 3); break; - case RouterType.FAMILY: - FamilyHomeActivity.start(context, routerValue); - break; - case RouterType.TEAM: NimTeamMessageActivity.start(context, routerValue); break; @@ -209,9 +203,6 @@ public class RouterHandler { case RouterType.MENTORING_RELATIONSHIP_HOME: MentoringRelationshipActivity.start(context); break; - case RouterType.DO_TASK: - TaskCenterActivity.start(context, TaskCenterActivity.FromPage.FIND); - break; case RouterType.GAME_LIST: break; case RouterType.PERSION_SETTING: diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/actions/FamilyGameAction.java b/app/src/main/java/com/yizhuan/erban/ui/im/actions/FamilyGameAction.java index abe70f9d5..25b83f419 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/actions/FamilyGameAction.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/actions/FamilyGameAction.java @@ -2,7 +2,6 @@ package com.yizhuan.erban.ui.im.actions; import com.netease.nim.uikit.business.session.actions.BaseAction; import com.yizhuan.erban.R; -import com.yizhuan.erban.family.view.activity.FamilyGameListActivity; /** * Created by MadisonRong on 29/05/2018. @@ -26,6 +25,6 @@ public class FamilyGameAction extends BaseAction { @Override public void onClick() { - FamilyGameListActivity.start(getActivity()); +// FamilyGameListActivity.start(getActivity()); } } diff --git a/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java b/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java deleted file mode 100644 index 514cee61b..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/radish/RadishRecordFragment.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.yizhuan.erban.ui.radish; - -import android.os.Bundle; -import android.text.TextUtils; - -import androidx.core.content.ContextCompat; -import androidx.fragment.app.Fragment; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.erban.R; -import com.yizhuan.erban.bills.adapter.BillBaseAdapter; -import com.yizhuan.erban.bills.fragmemt.BaseBillsFragment; -import com.yizhuan.erban.radish.adapter.RadishRecordAdapter; -import com.yizhuan.erban.radish.presenter.RadishRecordFrgPresenter; -import com.yizhuan.erban.radish.view.IRadishRecordFrgView; -import com.yizhuan.erban.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordInfo; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; -import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; -import com.yizhuan.xchat_android_library.utils.ListUtils; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -@CreatePresenter(RadishRecordFrgPresenter.class) -public class RadishRecordFragment extends BaseBillsFragment implements IRadishRecordFrgView{ - - public static final byte TYPE_RADISH_EXPAND = 1; - public static final byte TYPE_RADISH_INCOME = 2; - private static final String TYPE = "type_radish"; - private BillBaseAdapter mAdapter; - - private byte mType = TYPE_RADISH_INCOME; - - public static Fragment newInstance(byte type) { - Fragment fragment = new RadishRecordFragment(); - Bundle bundle = new Bundle(); - bundle.putByte(TYPE, type); - fragment.setArguments(bundle); - return fragment; - } - - @Override - public void loadData() { - getMvpPresenter().getRadishRecord(mCurrentCounter, PAGE_SIZE, mTime, mType); - } - - private void firstLoadDate() { - mCurrentCounter = Constants.PAGE_START; - showLoading(); - loadData(); - } - - @Override - public void initiate() { - super.initiate(); - - setRlyDateBackground(ContextCompat.getColor(mContext, R.color.color_F8F9FB)); - Bundle bundle = getArguments(); - if (bundle != null) { - mType = bundle.getByte(TYPE, TYPE_RADISH_INCOME); - } - - mAdapter = new RadishRecordAdapter(mBillItemEntityList, mType); - mAdapter.setOnLoadMoreListener(new BaseQuickAdapter.RequestLoadMoreListener() { - @Override - public void onLoadMoreRequested() { - mCurrentCounter++; - loadData(); - } - }, mRecyclerView); - - RecyclerViewNoBugLinearLayoutManager manager = new RecyclerViewNoBugLinearLayoutManager(mContext); - mRecyclerView.setLayoutManager(manager); - mRecyclerView.setAdapter(mAdapter); - firstLoadDate(); - - } - - @Override - public void getRadishRecordSuccess(RadishRecordListInfo list) { - mRefreshLayout.setRefreshing(false); - if (null != list) { - if (mCurrentCounter == Constants.PAGE_START) { - hideStatus(); - mBillItemEntityList.clear(); - mAdapter.setNewData(mBillItemEntityList); - } else { - mAdapter.loadMoreComplete(); - } - List>> billList = list.getBillList(); - if (!billList.isEmpty()) { - int size = mBillItemEntityList.size(); - List billItemEntities = new ArrayList<>(); - BillItemEntity billItemEntity; - 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 (RadishRecordInfo temp : incomeInfos) { - billItemEntity = new BillItemEntity(BillItemEntity.ITEM_NORMAL); - billItemEntity.mRadishRecordInfo = temp; - //目的是为了比较 - billItemEntity.time = key; - billItemEntities.add(billItemEntity); - } - } - } - if (billItemEntities.size() < Constants.BILL_PAGE_SIZE && mCurrentCounter == Constants.PAGE_START) { - mAdapter.setEnableLoadMore(false); - } - mAdapter.addData(billItemEntities); - } else { - if (mCurrentCounter == Constants.PAGE_START) { - showNoData(R.drawable.icon_common_failure, mContext.getString(R.string.tips_radish_record_empty)); - } else { - mAdapter.loadMoreEnd(true); - } - } - } - - } - - @Override - public void getRadishRecordFail(String message) { - if (mCurrentCounter == Constants.PAGE_START) { - showNetworkErr(); - } else { - mAdapter.loadMoreFail(); - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java index 59b672fbf..452f89a3b 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/activity/UserInfoActivity.java @@ -41,9 +41,6 @@ import com.yizhuan.erban.base.BaseBindingActivity; import com.yizhuan.erban.common.widget.dialog.CommonPopupDialog; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityUserInfoBinding; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; -import com.yizhuan.erban.family.view.activity.FamilyMemberListActivity; -import com.yizhuan.erban.family.view.activity.FamilyMemberSearchActivity; import com.yizhuan.erban.ui.im.avtivity.NimFriendModel; import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; import com.yizhuan.erban.ui.user.adapter.SelfPhotoAdapter; @@ -806,18 +803,11 @@ public class UserInfoActivity extends BaseBindingActivity个人主页->家族->个人主页->.... - from = FROM_TYPE_FAMILY; - } intent.putExtra("from", from); context.startActivity(intent); diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java b/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java deleted file mode 100644 index 2eb2cb09a..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/ExchangeGoldActivity.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.yizhuan.erban.ui.wallet; - -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.View; -import android.widget.Button; -import android.widget.EditText; -import android.widget.TextView; - -import androidx.core.content.ContextCompat; - -import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -/** - * @author chenran - * @date 2017/10/2 - */ - -public class ExchangeGoldActivity extends BaseActivity { - private TextView jewNumber; - private TextView goldNumber; - private EditText exchangeJewNumber; - private TextView exchangeGoldNumber; - // private TextView tvExchangeHammarNum; - private Button confirm; - private WalletInfo walletInfo; - private TextView exchangeGoldTips; - private TextView tvInputTip; - - public static void start(Context context) { - if (context == null) return; - Intent intent = new Intent(context, ExchangeGoldActivity.class); - context.startActivity(intent); - } - - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_exchange_gold); - initTitleBar(ResUtil.getString(R.string.ui_wallet_exchangegoldactivity_01)); - walletInfo = PayModel.get().getCurrentWalletInfo(); - initView(); - updateView(); - } - - private void initView() { - tvInputTip = (TextView) findViewById(R.id.tv_input_tip); - jewNumber = (TextView) findViewById(R.id.gew_number); - goldNumber = (TextView) findViewById(R.id.gold_number); - exchangeJewNumber = (EditText) findViewById(R.id.gew_exchange_number); - exchangeGoldNumber = (TextView) findViewById(R.id.gold_exchange_number); -// tvExchangeHammarNum = findViewById(R.id.tv_hammar_exchange_number); - confirm = (Button) findViewById(R.id.confirm_exchange); - exchangeGoldTips = (TextView) findViewById(R.id.tv_exchange_gold_tips); - String tips = getString(R.string.exchange_gold_tips, - String.valueOf(SharedPreferenceUtils.getExchangeGoldRate())); -// tips = tips.replaceAll("\\n", "
"); - exchangeGoldTips.setText(tips); - confirm.setOnClickListener(v -> { - String str = exchangeJewNumber.getText().toString(); - if (isNumeric(str)) { - if (StringUtil.isEmpty(str)) { - toast(ResUtil.getString(R.string.ui_wallet_exchangegoldactivity_02)); - return; - } - - int value = Integer.parseInt(str); - if (!isTenMultiple(value)) { - toast(ResUtil.getString(R.string.ui_wallet_exchangegoldactivity_03)); - return; - } - if (walletInfo == null || value > walletInfo.getDiamondNum()) { - toast(ResUtil.getString(R.string.ui_wallet_exchangegoldactivity_04)); - return; - } - PassWordFragment.newInstace(value, value / 1000 * 2).show(getSupportFragmentManager()); - } - }); - exchangeJewNumber.addTextChangedListener(textWatcher); - } - - private void updateView() { - setWalletNum(walletInfo); - } - - private void setWalletNum(WalletInfo walletNum) { - if (walletNum != null) { - long value = (long) (walletNum.getDiamondNum() - walletNum.getDiamondNum() % 10); - int result = (int) (value * SharedPreferenceUtils.getExchangeGoldRate()); - exchangeJewNumber.setHint(String.format(getString(R.string.please_enter_the_amount_of_diamonds_exchanged), result + "")); - jewNumber.setText(getString(R.string.jewel_format, FormatUtils.formatBigDecimal(walletNum.getDiamondNum()))); - goldNumber.setText(getString(R.string.gold_format, FormatUtils.formatBigDecimal(walletNum.getDiamondNum()))); - exchangeGoldNumber.setText(ResUtil.getString(R.string.empty_diamond)); - changeResultNumStyle(); - PayModel.get().setCurrentWalletInfo(walletNum); - } - } - - private TextWatcher textWatcher = new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - if (exchangeJewNumber.getText().toString().equals("0")) { - exchangeJewNumber.setText(""); - } - boolean btnEnable = false; - String str = exchangeJewNumber.getText().toString(); - if (!StringUtil.isEmpty(str) && isNumeric(str)) { - Long value = Long.parseLong(str); - if (isTenMultiple(value)) { - int result = (int) (value * SharedPreferenceUtils.getExchangeGoldRate()); - exchangeGoldNumber.setText(result + getString(R.string.diamond)); - changeResultNumStyle(); - if (walletInfo != null && value <= walletInfo.getDiamondNum()) { - btnEnable = true; - } - tvInputTip.setVisibility(View.GONE); - exchangeJewNumber.setTextColor(getResources().getColor(R.color.text_tertiary)); - } else { - exchangeGoldNumber.setText(getString(R.string.empty_diamond)); - changeResultNumStyle(); - tvInputTip.setVisibility(View.VISIBLE); - exchangeJewNumber.setTextColor(getResources().getColor(R.color.color_FF3852)); - } - } else { - exchangeGoldNumber.setText(getString(R.string.empty_diamond)); - changeResultNumStyle(); - tvInputTip.setVisibility(View.GONE); - exchangeJewNumber.setTextColor(getResources().getColor(R.color.text_tertiary)); - } - if (btnEnable) { - confirm.setEnabled(true); - confirm.setTextColor(ContextCompat.getColor(ExchangeGoldActivity.this, R.color.color_333333)); - confirm.setBackground(getResources().getDrawable(R.drawable.shape_semi_round_gray_solid)); - } else { - confirm.setEnabled(false); - confirm.setTextColor(ContextCompat.getColor(ExchangeGoldActivity.this, R.color.color_B3B3B3)); - confirm.setBackground(getResources().getDrawable(R.drawable.shape_semi_round_grey_e5_solid)); - } - } - }; - - private boolean isTenMultiple(long number) { - long value = number % 10; - return value == 0; - } - - private boolean isNumeric(String str) { - for (int i = str.length(); --i >= 0; ) { - if (!Character.isDigit(str.charAt(i))) { - return false; - } - } - return true; - } - - private void changeResultNumStyle() { - if (getString(R.string.empty_diamond).equals(exchangeGoldNumber.getText().toString())) { - exchangeGoldNumber.setTextColor(getResources().getColor(R.color.text_color_secondary)); - } else { - exchangeGoldNumber.setTextColor(getResources().getColor(R.color.text_color_primary)); - } - } - - public void onExchangeGold(WalletInfo walletInfo) { - getDialogManager().dismissDialog(); - toast(getString(R.string.exchange_success)); - exchangeJewNumber.setText(""); - if (walletInfo == null) { - return; - } - this.walletInfo.setDiamondNum(walletInfo.getDiamondNum()); - setWalletNum(walletInfo); - } - - public void onExchangeGoldFail(String error) { - getDialogManager().dismissDialog(); - toast(error); - } - - public void commit(long value, int hammerNum, String pwd) { - getDialogManager().showProgressDialog(ExchangeGoldActivity.this, getString(R.string.erban_base_baseactivity_01)); - PayModel.get().exchangeGold((int) value, hammerNum, DESAndBase64(pwd)) - .subscribe(new BeanObserver() { - @Override - public void onSuccess(WalletInfo info) { - onExchangeGold(info); - } - - @Override - public void onErrorMsg(String error) { - onExchangeGoldFail(error); - } - }); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawJewelAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawJewelAdapter.java deleted file mode 100644 index 4a37b5ef5..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawJewelAdapter.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.yizhuan.erban.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.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_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/yizhuan/erban/ui/wallet/adapter/WithdrawRedListAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawRedListAdapter.java deleted file mode 100644 index 5183a2642..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/adapter/WithdrawRedListAdapter.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.yizhuan.erban.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.yizhuan.erban.R; -import com.yizhuan.xchat_android_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/yizhuan/erban/ui/wallet/sendgold/SendGoldActivity.java b/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldActivity.java deleted file mode 100644 index cc7c690a8..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldActivity.java +++ /dev/null @@ -1,298 +0,0 @@ -package com.yizhuan.erban.ui.wallet.sendgold; - -import android.content.Context; -import android.content.Intent; -import android.text.Editable; -import android.text.TextUtils; -import android.text.style.ForegroundColorSpan; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; - -import androidx.recyclerview.widget.GridLayoutManager; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseViewBindingActivity; -import com.yizhuan.erban.bills.activities.ChargeBillsActivity; -import com.yizhuan.erban.databinding.ActivitySendGoldBinding; -import com.yizhuan.erban.ui.utils.ImageLoadUtils; -import com.yizhuan.erban.ui.widget.TextWatcherSimple; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.erban.ui.widget.password.PasswordEvent; -import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemDecoration; -import com.yizhuan.erban.utils.RegexUtil; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.pay.GoldGiveModel; -import com.yizhuan.xchat_android_core.pay.IGoldGiveModel; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.SendGoldSuccessEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.JavaUtil; -import com.yizhuan.xchat_android_library.utils.ResUtil; -import com.yizhuan.xchat_android_library.utils.SingleToastUtil; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -import java.util.List; - -/** - * create by lvzebiao @2019/12/1 - */ -public class SendGoldActivity extends BaseViewBindingActivity implements View.OnClickListener { - - private IGoldGiveModel model = new GoldGiveModel(); - - private SendGoldListAdpater adapter; - - private int sendGoldValue = 0; - - private UserInfo doneeInfo; - - public static void start(Context context) { - UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); - if (userInfo == null) { - SingleToastUtil.showToast(ResUtil.getString(R.string.wallet_sendgold_sendgoldactivity_01)); - return; - } - if (!userInfo.isBindPhone() || !userInfo.isBindPaymentPwd()) { - SingleToastUtil.showToast(ResUtil.getString(R.string.wallet_sendgold_sendgoldactivity_02)); - return; - } - Intent intent = new Intent(context, SendGoldActivity.class); - context.startActivity(intent); - } - - @Override - public void init() { - initTitleBar(R.string.gold_give); - EventBus.getDefault().register(this); - //查询钱包 - PayModel.get().getWalletInfo(AuthModel.get().getCurrentUid()) - .subscribe(); - initRvGoldList(); - initView(); - //获取钻石转赠列表 - model.getGiveItemList() - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new DontWarnObserver>() { - @Override - public void accept(List giveInfos, String error) { - super.accept(giveInfos, error); - if (error != null) { - toast(error); - return; - } - for (int i = 0; i < giveInfos.size(); i++) { - giveInfos.get(i).setSelected(i == 0); - } - adapter.setNewData(giveInfos); - } - }); - } - - private void initRvGoldList() { - binding.rvGold.setLayoutManager(new GridLayoutManager(context, 2)); - binding.rvGold.addItemDecoration(new GridSpacingItemDecoration(context, 2, 15)); - adapter = new SendGoldListAdpater(); - binding.rvGold.setAdapter(adapter); - - adapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { - @Override - public void onItemClick(BaseQuickAdapter a, View view, int position) { - binding.etCustomInput.setText(""); - binding.etCustomInput.clearFocus(); - adapter.selectItem(position); - updateViewStatus(); - } - }); - } - - private void initView() { - binding.etAccount.addTextChangedListener(new TextWatcherSimple() { - @Override - public void afterTextChanged(Editable s) { - updateViewStatus(); - } - }); - binding.etCustomInput.clearFocus(); - binding.etCustomInput.addTextChangedListener(new TextWatcherSimple() { - @Override - public void afterTextChanged(Editable s) { - adapter.clearAllSelected(); - updateViewStatus(); - } - }); - - binding.btnGive.setOnClickListener(this); - binding.tvMyGiveRecord.setOnClickListener(this); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onGetWalletInfo(GetWalletInfoEvent event) { - WalletInfo walletInfo = PayModel.get().getCurrentWalletInfo(); - if (walletInfo == null) { - return; - } - updateGoldRemain(walletInfo.chargeGoldNum); - } - - private void updateGoldRemain(double value) { - binding.tvWallGoldRemain.setText(FormatUtils.formatBigDecimal(value)); - } - - private void updateViewStatus() { - if (TextUtils.isEmpty(binding.etCustomInput.getText().toString())) { - binding.etCustomInput.setBackgroundResource(R.drawable.shape_gold_input_false); - } else { - binding.etCustomInput.setBackgroundResource(R.drawable.shape_gold_input_true); - } - if (TextUtils.isEmpty(binding.etAccount.getText().toString())) { - binding.btnGive.setEnabled(false); - return; - } - if (adapter.hasSelectedItem()) { - binding.btnGive.setEnabled(true); - return; - } - if (!TextUtils.isEmpty(binding.etCustomInput.getText().toString())) { - binding.btnGive.setEnabled(true); - } else { - binding.btnGive.setEnabled(false); - } - } - - @Override - public void onClick(View view) { - switch (view.getId()) { - case R.id.btn_give: - this.doneeInfo = null; - getDialogManager().showProgressDialog(context); - UserModel.get().getSimpleUser(binding.etAccount.getText().toString()) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new DontWarnObserver() { - @Override - public void accept(UserInfo info, String error) { - super.accept(info, error); - getDialogManager().dismissDialog(); - if (error != null) { - toast(error); - return; - } - doneeInfo = info; - sendGoldValue = getSendGoldValue(); - if (isValidSendValue()) { - handleConfirmSendGoldView(info); - } - } - }); - break; - case R.id.tv_my_give_record: - startActivity(new Intent(context, ChargeBillsActivity.class)); - break; - } - } - - private void handleConfirmSendGoldView(UserInfo info) { - View confirmSendGoldView = View.inflate(context, R.layout.dialog_custom_confirm_send_gold, null); - ImageView ivAvatar = confirmSendGoldView.findViewById(R.id.iv_avatar); - TextView tvInfo = confirmSendGoldView.findViewById(R.id.tv_info); - TextView tvSendNumber = confirmSendGoldView.findViewById(R.id.tv_send_number); - - ImageLoadUtils.loadAvatar(info.getAvatar(), ivAvatar); - tvInfo.setText(getString(R.string.send_gold_confirm_info, RegexUtil.getPrintableString(info.getNick()), - String.valueOf(info.getErbanNo()))); - SpannableBuilder builder = new SpannableBuilder(); - builder.append(ResUtil.getString(R.string.wallet_sendgold_sendgoldactivity_03)) - .append(String.valueOf(sendGoldValue), new ForegroundColorSpan(getResources().getColor(R.color.color_FE4C62))) - .append(ResUtil.getString(R.string.wallet_sendgold_sendgoldactivity_04)); - tvSendNumber.setText(builder.build()); - getDialogManager().showOkCancelCustomDialog(confirmSendGoldView, false, () -> { - hideIME(); - PassWordFragment.newInstance(PassWordFragment.TYPE_SEND_GOLD) - .show(getSupportFragmentManager()); - }); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onPasswordEvent(PasswordEvent event) { - if (TextUtils.isEmpty(event.getPassword())) { - toast(ResUtil.getString(R.string.wallet_sendgold_sendgoldactivity_05)); - return; - } - - if (event.getType() != PassWordFragment.TYPE_SEND_GOLD) { - return; - } - if (!isValidSendValue()) { - return; - } - if (doneeInfo == null) { - return; - } - getDialogManager().showProgressDialog(context, "", false, false, null); - model.giveGold(doneeInfo.getUid(), sendGoldValue, event.getPassword()) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new DontWarnObserver() { - @Override - public void accept(Integer integer, String error) { - super.accept(integer, error); - getDialogManager().dismissDialog(); - doneeInfo = null; - if (error != null) { - toast(error); - return; - } - toast(ResUtil.getString(R.string.wallet_sendgold_sendgoldactivity_06)); - } - }); - } - - public int getSendGoldValue() { - int value; - String customInput = binding.etCustomInput.getText().toString(); - if (!TextUtils.isEmpty(customInput)) { - value = JavaUtil.str2int(customInput); - } else { - value = adapter.getSelectItemValue(); - } - return value; - } - - private boolean isValidSendValue() { - if (sendGoldValue <= 0) { - toast(ResUtil.getString(R.string.wallet_sendgold_sendgoldactivity_07)); - } - return sendGoldValue > 0; - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void onSendGoldSuccessEvent(SendGoldSuccessEvent event) { - if (event.getData() == null) { - return; - } - updateGoldRemain(event.getData()); - } - - @Override - protected void onDestroy() { - EventBus.getDefault().unregister(this); - super.onDestroy(); - } - - @Override - public void finish() { - hideIME(); - super.finish(); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldListAdpater.java b/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldListAdpater.java deleted file mode 100644 index 065214a4f..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/wallet/sendgold/SendGoldListAdpater.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.yizhuan.erban.ui.wallet.sendgold; - -import android.widget.ImageView; -import android.widget.TextView; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; - -import java.util.List; - -/** - * create by lvzebiao @2019/12/1 - */ -public class SendGoldListAdpater extends BaseQuickAdapter { - - public SendGoldListAdpater() { - super(R.layout.item_give_gold_list); - } - - @Override - protected void convert(BaseViewHolder baseViewHolder, GiveInfo item) { - if (item == null) return; - - - ImageView iv_gold = baseViewHolder.getView(R.id.iv_gold); - TextView tv_money_gold = baseViewHolder.getView(R.id.tv_money_gold); - - tv_money_gold.setText(item.getGoldProdName()); - baseViewHolder.getView(R.id.ll_gold_charge).setSelected(item.isSelected()); - if (item.isSelected()) { - iv_gold.setImageResource(R.mipmap.ic_wallet_gold); - tv_money_gold.setTextColor(mContext.getResources().getColor(R.color.color_333333)); - } else { - iv_gold.setImageResource(R.mipmap.ic_wallet_gold_unchecked); - tv_money_gold.setTextColor(mContext.getResources().getColor(R.color.color_999999)); - } - } - - public boolean hasSelectedItem() { - List data = getData(); - for (GiveInfo info : data) { - if (info.isSelected()) { - return true; - } - } - return false; - } - - public void clearAllSelected() { - List data = getData(); - for (GiveInfo info : data) { - info.setSelected(false); - } - notifyDataSetChanged(); - } - - public void selectItem(int position) { - List data = getData(); - for (int i = 0; i < data.size(); i++) { - data.get(i).setSelected(i == position); - } - notifyDataSetChanged(); - } - - public int getSelectItemValue() { - List data = getData(); - for (GiveInfo info : data) { - if (info.isSelected()) { - return info.getGoldNum(); - } - } - return 0; - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java b/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java index 5cc1f3047..af254b7be 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java +++ b/app/src/main/java/com/yizhuan/erban/ui/webview/JSInterface.java @@ -23,7 +23,6 @@ import com.yizhuan.erban.application.IReportConstants; import com.yizhuan.erban.application.ReportManager; import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.decoration.view.DecorationStoreActivity; -import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; import com.yizhuan.erban.ui.im.RouterHandler; import com.yizhuan.erban.ui.im.avtivity.NimP2PMessageActivity; @@ -385,11 +384,6 @@ public class JSInterface { return url; } - @JavascriptInterface - public void openFamilyPage(String familyId) { - FamilyHomeActivity.start(context, familyId); - } - /** * 打开装扮商城 * diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java index 4f6e90404..c19c4e125 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/GiftDialog.java @@ -42,7 +42,6 @@ import com.yizhuan.erban.application.ReportManager; import com.yizhuan.erban.avroom.firstcharge.FirstChargeDialog; import com.yizhuan.erban.base.BaseActivity; import com.yizhuan.erban.common.widget.CircleImageView; -import com.yizhuan.erban.radish.task.activity.TaskCenterActivity; import com.yizhuan.erban.ui.gift.dialog.GiftInfoVm; import com.yizhuan.erban.ui.gift.dialog.PageIndicatorView; import com.yizhuan.erban.ui.pay.ChargeActivity; @@ -106,7 +105,6 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Objects; @@ -1098,8 +1096,6 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene ) ); } - } else if (itemType == ITEM_TYPE_RADISH) { - TaskCenterActivity.start(context, TaskCenterActivity.FromPage.GIFT); } dismiss(); diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java b/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java deleted file mode 100644 index b97fdac7f..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PassWordFragment.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.yizhuan.erban.ui.widget.password; - - -import android.app.Activity; -import android.graphics.drawable.ColorDrawable; -import android.os.Bundle; -import android.util.DisplayMetrics; -import android.view.Display; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.Window; -import android.view.WindowManager; - -import androidx.annotation.Nullable; -import androidx.fragment.app.DialogFragment; -import androidx.fragment.app.FragmentManager; - -import com.jungly.gridpasswordview.GridPasswordView; -import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.erban.R; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.ui.setting.VerifyPhoneActivity; -import com.yizhuan.erban.ui.wallet.ExchangeGoldActivity; -import com.yizhuan.erban.ui.withdraw.WithdrawActivity; -import com.yizhuan.xchat_android_library.utils.codec.DESUtils; - -import org.greenrobot.eventbus.EventBus; - -//也可继承design中的BottomSheetDialogFragment -public class PassWordFragment extends DialogFragment { - - private static final String TAG = "PassWordFragment"; - - public final static int TYPE_DEFALUT = 0; - /** - * 钻石转赠 - */ - public final static int TYPE_SEND_GOLD = 1; - - public final static String EXTRA_TYPE = "extra_type"; - - private PasswordView mPassword; - private boolean isFullScreen; - private ExchangeGoldActivity goldActivity; - private WithdrawActivity withdrawActivity; - private long value; - private int hammerNum; - /**用于标识密码类型*/ - private int type = TYPE_DEFALUT; - - private DialogManager mDialogManager; - - public static PassWordFragment newInstace(long value) { - PassWordFragment passWordFragment = new PassWordFragment(); - Bundle bundle = new Bundle(); - bundle.putLong("values", value); - passWordFragment.setArguments(bundle); - return passWordFragment; - } - - public static PassWordFragment newInstace(long value, int hammerNum) { - PassWordFragment passWordFragment = new PassWordFragment(); - Bundle bundle = new Bundle(); - bundle.putLong("values", value); - bundle.putInt("hammerNum", hammerNum); - passWordFragment.setArguments(bundle); - return passWordFragment; - } - - public static PassWordFragment newInstance(int type) { - PassWordFragment passWordFragment = new PassWordFragment(); - Bundle bundle = new Bundle(); - bundle.putInt(EXTRA_TYPE, type); - passWordFragment.setArguments(bundle); - return passWordFragment; - } - - public static PassWordFragment newInstance() { - return new PassWordFragment(); - } - - @Override - public void onAttach(Activity activity) { - super.onAttach(activity); - if (activity instanceof ExchangeGoldActivity) { - goldActivity = (ExchangeGoldActivity) activity; - } else if (activity instanceof WithdrawActivity) { - withdrawActivity = (WithdrawActivity) activity; - } - } - - @Override - public void onCreate(@Nullable Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - } - - public void show(FragmentManager fragmentManager) { - this.show(fragmentManager, TAG); - } - - @Override - public void show(FragmentManager manager, String tag) { - if (manager.findFragmentByTag(tag) == null) { - manager.beginTransaction() - .add(this, tag) - .commitAllowingStateLoss(); - } - } - - //继承BottomSheetDialogFragment时onStart()可注释掉 - @Override - public void onStart() { - super.onStart(); - - Window win = getDialog().getWindow(); - win.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.transparent))); - WindowManager.LayoutParams layoutParams = getDialog().getWindow().getAttributes(); - - DisplayMetrics dm = new DisplayMetrics(); - Display d = win.getWindowManager().getDefaultDisplay(); - d.getRealMetrics(dm); - getActivity().getWindowManager().getDefaultDisplay().getMetrics(dm); - layoutParams.width = (int) (dm.widthPixels); -// layoutParams.height = (isFullScreen ? getContext().getResources().getDisplayMetrics().heightPixels : dm.heightPixels) - -// (Utils.hasSoftKeys(getContext()) ? Utils.getNavigationBarHeight(getContext()) : 0); - win.setAttributes(layoutParams); - - } - - @Nullable - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.dialog_password, container); - init(view); - return view; - } - - public DialogManager getDialogManager() { - if (mDialogManager == null) { - mDialogManager = new DialogManager(getContext()); - mDialogManager.setCanceledOnClickOutside(false); - } - return mDialogManager; - } - - private void init(View view) { - if (getArguments() != null) { - value = getArguments().getLong("values"); - hammerNum = getArguments().getInt("hammerNum"); - type = getArguments().getInt(EXTRA_TYPE, TYPE_DEFALUT); - } - mPassword = (PasswordView) view.findViewById(R.id.view_password); - mPassword.getCloseImageView().setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - dismiss(); - } - }); - - mPassword.getForgetTextView().setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - VerifyPhoneActivity.start(getActivity(), true); - dismiss(); - } - }); - - mPassword.getPswView().setOnPasswordChangedListener(new GridPasswordView.OnPasswordChangedListener() { - @Override - public void onTextChanged(String psw) { - if (mPassword.getPassword().length() == 6) { - dismiss(); - if (goldActivity != null) { - goldActivity.commit(value, hammerNum, mPassword.getPassword()); - } else if (withdrawActivity != null) { - withdrawActivity.commit(mPassword.getPassword()); - } - try { - EventBus.getDefault().post(new PasswordEvent().setType(type) - .setPassword( - DESUtils.DESAndBase64Encrypt(mPassword.getPassword()))); - } catch (Exception e) { - e.printStackTrace(); - LogUtil.e(TAG, "onInputFinish: payment password encrypt error", e); - } - } - } - - @Override - public void onInputFinish(String psw) { - - } - }); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordEvent.java b/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordEvent.java deleted file mode 100644 index 82be8e39e..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/password/PasswordEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yizhuan.erban.ui.widget.password; - -import lombok.Data; - -/** - * Created by MadisonRong on 2019-08-19 - */ -@Data -public class PasswordEvent { - - private String password; - - private int type; - - public PasswordEvent setPassword(String password) { - this.password = password; - return this; - } - - public PasswordEvent setType(int type) { - this.type = type; - return this; - } - -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java deleted file mode 100644 index 1e938a8e5..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/withdraw/WithdrawActivity.java +++ /dev/null @@ -1,441 +0,0 @@ -package com.yizhuan.erban.ui.withdraw; - -import android.annotation.SuppressLint; -import android.content.Intent; -import android.text.TextUtils; -import android.text.style.ForegroundColorSpan; -import android.view.View; - -import androidx.recyclerview.widget.GridLayoutManager; - -import com.chad.library.adapter.base.BaseQuickAdapter; -import com.trello.rxlifecycle3.android.ActivityEvent; -import com.yizhuan.erban.R; -import com.yizhuan.erban.base.BaseViewBindingActivity; -import com.yizhuan.erban.base.TitleBar; -import com.yizhuan.erban.bills.activities.WithdrawBillsActivity; -import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.databinding.ActivityWithdrawBinding; -import com.yizhuan.erban.ui.setting.ModifyPwdActivity; -import com.yizhuan.erban.ui.wallet.adapter.WithdrawJewelAdapter; -import com.yizhuan.erban.ui.webview.CommonWebViewActivity; -import com.yizhuan.erban.ui.widget.password.PassWordFragment; -import com.yizhuan.erban.ui.withdraw.bankcard.BindWithdrawBankCardActivity; -import com.yizhuan.erban.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.RefreshInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_library.utils.FormatUtils; -import com.yizhuan.xchat_android_library.utils.ListUtils; -import com.yizhuan.xchat_android_library.utils.ResUtil; - -import org.greenrobot.eventbus.EventBus; -import org.greenrobot.eventbus.Subscribe; -import org.greenrobot.eventbus.ThreadMode; - -import java.util.List; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -/** - * 钻石提现 - */ -public class WithdrawActivity extends BaseViewBindingActivity { - - private TitleBar mTitleBar; - public WithdrwaListInfo checkedPosition; - private WithdrawJewelAdapter mJewelAdapter; - private WithdrawInfo withdrawInfos = new WithdrawInfo(); - - private int withdrawAccountType = WithdrawInfo.ACCOUNT_TYPE_ALIPAY; - /** - * 如果成功加载提现信息，此字段才为true - */ - private boolean loadedWithdrawInfo = false; - - @Override - public void init() { - EventBus.getDefault().register(this); - initTitleBar(getString(R.string.withdraw)); - initView(); - setListener(); - initData(); - } - - private void initData() { - binding.recyclerView.setLayoutManager(new GridLayoutManager(this, 3)); - binding.recyclerView.setNestedScrollingEnabled(false); - mJewelAdapter = new WithdrawJewelAdapter(); - mJewelAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { - @Override - public void onItemClick(BaseQuickAdapter baseQuickAdapter, View view, int position) { - List list = mJewelAdapter.getData(); - if (ListUtils.isListEmpty(list)) return; - int size = list.size(); - for (int i = 0; i < size; i++) { - list.get(i).isSelected = position == i; - } - mJewelAdapter.notifyDataSetChanged(); - checkedPosition = list.get(position); - - updateWithdrawView(); - updateIncomeMoney(); - if (isWithdraw()) { - binding.btnWithdraw.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!loadedWithdrawInfo || withdrawInfos == null) { - toast(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_01)); - return; - } - if (checkedPosition == null) { - toast(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_02)); - return; - } - - if (!withdrawInfos.isBindAlipay()) { - getDialogManager().showOkCancelWithTitleDialog(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_03), ResUtil.getString(R.string.ui_withdraw_withdrawactivity_04), - () -> BinderAlipayActivity.start(context, withdrawInfos)); - return; - } - - if (!withdrawInfos.isBindBankCard() - && checkedPosition.getCashNum() >= withdrawInfos.getBankCardMinAmount()) { - showBindBankCardDialog(); - return; - } - - UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); - if (userInfo != null) { - if (userInfo.isBindPaymentPwd()) { - //发起兑换 - getDialogManager().showOkCancelDialog( - ResUtil.getString(R.string.ui_withdraw_withdrawactivity_05) + checkedPosition.getCashProdName(), - true, new DialogManager.OkCancelDialogListener() { - @Override - public void onCancel() { - getDialogManager().dismissDialog(); - } - - @Override - public void onOk() { - getDialogManager().dismissDialog(); - if (checkedPosition != null) { - PassWordFragment.newInstace(0).show(getSupportFragmentManager()); - } else { - toast(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_06)); - } - } - }); - } else { - ModifyPwdActivity.start(WithdrawActivity.this, ModifyPwdActivity.FOGERT_PAY_PWD); - } - - } - } - }); - } - } - }); - binding.recyclerView.setAdapter(mJewelAdapter); - loadAlipayInfo(); - loadRecyclerViewData(); - - //提示语 - TaxInfo texInfo = WithdrawModel.get().getTaxInfo(); - if (null != texInfo) { - binding.tvTip.setVisibility(View.VISIBLE); - binding.tvTip.setText(texInfo.getTips()); - } else { - binding.tvTip.setVisibility(View.GONE); - } - } - - @SuppressLint("CheckResult") - public void commit(String pwd) { - //1 提现到支付宝 3-提现到银行卡 如果是大额提现，只能 提现到银行卡 - int paramType; - if (isBigMoneyWithdraw()) { - paramType = WithdrawInfo.ACCOUNT_TYPE_BANK_CARD; - } else { - paramType = withdrawAccountType; - } - WithdrawModel.get().requestExchange( - AuthModel.get().getCurrentUid(), - checkedPosition.cashProdId, DESAndBase64(pwd), paramType - ).subscribe((exchangerInfo, throwable) -> { - if (throwable == null) { - onRequestExchange(exchangerInfo); - } else { - throwable.printStackTrace(); - toast(throwable.getMessage()); - } - }); - } - - private void loadAlipayInfo() { - WithdrawModel.get().getWithdrawUserInfo( - AuthModel.get().getCurrentUid() - ) - .compose(bindUntilEvent(ActivityEvent.DESTROY)) - .subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(WithdrawInfo withdrawInfo) { - onGetWithdrawUserInfo(withdrawInfo); - } - - @Override - public void onError(Throwable e) { - - } - }); - } - - public void onGetWithdrawUserInfo(WithdrawInfo withdrawInfo) { - if (withdrawInfo == null) { - loadedWithdrawInfo = false; - return; - } - loadedWithdrawInfo = true; - withdrawInfos = withdrawInfo; - binding.tvDiamondNums.setText(FormatUtils.formatBigDecimal(withdrawInfo.diamondNum)); - - withdrawAccountType = withdrawInfos.getDefaultWithdrawAccountType(); - - binding.tvWithdrawType.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (withdrawAccountType == WithdrawInfo.ACCOUNT_TYPE_ALIPAY) { - //切到银行卡 - withdrawAccountType = WithdrawInfo.ACCOUNT_TYPE_BANK_CARD; - } else { - //切到支付宝 - withdrawAccountType = WithdrawInfo.ACCOUNT_TYPE_ALIPAY; - } - - updateWithdrawView(); - } - }); - - updateWithdrawView(); - } - - /** - * 更新提现信息 或者 选中提现item时 更新View显示 - */ - private void updateWithdrawView() { - if (withdrawInfos == null) { - return; - } - if (!loadedWithdrawInfo) { - return; - } - - if (withdrawAccountType == WithdrawInfo.ACCOUNT_TYPE_BANK_CARD) { - binding.tvWithdrawType.setText(R.string.withdraw_type_alipay); - } else { - binding.tvWithdrawType.setText(R.string.withdraw_type_bank_card); - } - - //切换按钮是否展示 - binding.tvWithdrawType.setVisibility(View.VISIBLE); - //选中大额、没有绑卡、后台关闭 的情况下，不显示切换按钮 - if (isBigMoneyWithdraw() || !withdrawInfos.isBindBankCard() || !withdrawInfos.isSwitchButtonShow()) { - binding.tvWithdrawType.setVisibility(View.INVISIBLE); - } - - binding.rlyBinderSucceed.setOnClickListener(null); - if (!isBindAliAccount()) { - binding.rlyBinder.setVisibility(View.VISIBLE); - binding.rlyBinderSucceed.setVisibility(View.GONE); - } else { - binding.rlyBinder.setVisibility(View.GONE); - binding.rlyBinderSucceed.setVisibility(View.VISIBLE); - binding.zhifubao.setImageResource(R.drawable.icon_zhifubao); - binding.tvUserZhifubao.setText(getString(R.string.withdraw_format_alipay_account, withdrawInfos.zxcAccount)); - binding.tvUserZhifubaoName.setText(getString(R.string.withdraw_format_alipay_name, withdrawInfos.zxcAccountName)); - - //用户点击修改支付宝信息 - binding.rlyBinderSucceed.setOnClickListener(v -> BinderAlipayActivity.start(context, withdrawInfos)); - - //大额提现显示银行卡，后台配置默认是银行卡时，也显示银行卡 - if ((isBigMoneyWithdraw() || withdrawAccountType == WithdrawInfo.ACCOUNT_TYPE_BANK_CARD) - && withdrawInfos.isBindBankCard()) { - binding.zhifubao.setImageResource(R.drawable.icon_withdraw_bank_card); - binding.tvUserZhifubao.setText(getString(R.string.withdraw_format_bank_card_account, withdrawInfos.getBankCardNum())); - binding.tvUserZhifubaoName.setText(getString(R.string.withdraw_format_bank_card_name, withdrawInfos.getBankCardName())); - //用户点击修改银行卡信息 - binding.rlyBinderSucceed.setOnClickListener(v -> startActivity(new Intent(this, BindWithdrawBankCardActivity.class))); - } - } - } - - /** - * 更新手续费、收入金额 - */ - private void updateIncomeMoney() { - if (checkedPosition == null) { - return; - } - - binding.tvTaxMoney.setText(getString(R.string.withdraw_format_tax_money, - String.valueOf(checkedPosition.getWithdrawalFee()))); - binding.tvIncomeMoney.setText(getString(R.string.withdraw_format_income_money, - String.valueOf(checkedPosition.getActualArrival()))); - - } - - /** - * 判断是否大额提现 - */ - private boolean isBigMoneyWithdraw() { - return loadedWithdrawInfo && withdrawInfos != null && checkedPosition != null && - checkedPosition.getCashNum() >= withdrawInfos.getBankCardMinAmount(); - } - - /** - * 是否绑定支付宝 - */ - private boolean isBindAliAccount() { - return withdrawInfos != null && !TextUtils.isEmpty(withdrawInfos.zxcAccount) && !withdrawInfos.zxcAccount.equals("null"); - } - - private void loadRecyclerViewData() { - WithdrawModel.get().getWithdrawList() - .subscribe(new BeanObserver>() { - @Override - public void onSuccess(List withdrwaListInfos) { - onGetWithdrawList(withdrwaListInfos); - } - - @Override - public void onErrorMsg(String error) { - onGetWithdrawListFail(error); - } - }); - } - - public void onGetWithdrawList(List withdrwaListInfo) { - if (withdrwaListInfo != null && withdrwaListInfo.size() > 0) { - mJewelAdapter.setNewData(withdrwaListInfo); - } - } - - public void onGetWithdrawListFail(String error) { - toast(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_07)); - } - - - private void setListener() { - //用户点击绑定支付宝 - binding.rlyBinder.setOnClickListener(v -> { - //跳转绑定手机号码，绑定成功以后显示bindersucceed - BinderAlipayActivity.start(context, withdrawInfos); - }); - - binding.tvWithdrawRule.setOnClickListener(v -> CommonWebViewActivity.start( - context, UriProvider.IM_SERVER_URL + "/peko/modules/guide/output.html")); - - //切换类型 - binding.tvWithdrawType.setVisibility(View.GONE); - binding.tvWithdrawType.setOnClickListener(v -> { - - }); - - } - - private boolean isWithdraw() { - if (withdrawInfos == null || withdrawInfos.isNotBoundPhone == null) { - return false; - } - if (!withdrawInfos.isNotBoundPhone) { - if (checkedPosition != null) { - //用户的钻石余额 > 选中金额的钻石数时 - if (withdrawInfos.diamondNum >= checkedPosition.diamondNum) { - binding.btnWithdrawUn.setVisibility(View.GONE); - binding.btnWithdraw.setVisibility(View.VISIBLE); - } else { - binding.btnWithdrawUn.setVisibility(View.VISIBLE); - binding.btnWithdraw.setVisibility(View.GONE); - } - return true; - } - } else { - return false; - } - //如果选中position不为空的时候 - return false; - } - - private void onRequestExchange(ExchangerInfo exchangerInfo) { - if (exchangerInfo != null) { - binding.tvDiamondNums.setText(FormatUtils.formatBigDecimal(exchangerInfo.diamondNum)); - toast(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_08)); - } - } - - private void initView() { - binding.tvWithdrawType.setVisibility(View.INVISIBLE); - binding.tvTaxMoney.setText(""); - binding.tvIncomeMoney.setText(""); - } - - public void initTitleBar(String title) { - mTitleBar = findViewById(R.id.title_bar); - if (mTitleBar != null) { - mTitleBar.setTitle(title); - mTitleBar.setImmersive(false); - mTitleBar.setTitleColor(getResources().getColor(R.color.black)); - mTitleBar.setLeftImageResource(R.drawable.arrow_left); - mTitleBar.setLeftClickListener(v -> finish()); - } - mTitleBar.setActionTextColor(getResources().getColor(R.color.text_tertiary)); - mTitleBar.addAction(new TitleBar.TextAction(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_09)) { - @Override - public void performAction(View view) { - startActivity(new Intent(getApplicationContext(), WithdrawBillsActivity.class)); - } - }); - } - - @Subscribe(threadMode = ThreadMode.MAIN) - public void refreshEvent(RefreshInfo refreshInfo) { - loadAlipayInfo(); - } - - private void showBindBankCardDialog() { - if (withdrawInfos == null) { - return; - } - SpannableBuilder builder = new SpannableBuilder(); - builder.append(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_010)) - .append(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_011) + withdrawInfos.getBankCardMinAmount(), - new ForegroundColorSpan(getResources().getColor(R.color.color_FF3B30))) - .append(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_012)) - .append(ResUtil.getString(R.string.ui_withdraw_withdrawactivity_013), - new ForegroundColorSpan(getResources().getColor(R.color.color_FF3B30))); - getDialogManager().showOkCancelWithTitleDialog(builder.build(), ResUtil.getString(R.string.ui_withdraw_withdrawactivity_014), - () -> startActivity(new Intent(context, BindWithdrawBankCardActivity.class))); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - EventBus.getDefault().unregister(this); - } - -} diff --git a/app/src/main/res/drawable-xhdpi/ic_dissolve_family.webp b/app/src/main/res/drawable-xhdpi/ic_dissolve_family.webp deleted file mode 100644 index eb2257b9e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_dissolve_family.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_exit_family.webp b/app/src/main/res/drawable-xhdpi/ic_exit_family.webp deleted file mode 100644 index c817de70e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_exit_family.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_bills_charge.webp b/app/src/main/res/drawable-xhdpi/icon_bills_charge.webp deleted file mode 100644 index 84f86e7e2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_bills_charge.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_bills_gift.webp b/app/src/main/res/drawable-xhdpi/icon_bills_gift.webp deleted file mode 100644 index d258e3de6..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_bills_gift.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_bills_red.webp b/app/src/main/res/drawable-xhdpi/icon_bills_red.webp deleted file mode 100644 index 0a28425c2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_bills_red.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_bills_withdraw.webp b/app/src/main/res/drawable-xhdpi/icon_bills_withdraw.webp deleted file mode 100644 index 9e01fac0e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_bills_withdraw.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_date_yellow.png b/app/src/main/res/drawable-xhdpi/icon_date_yellow.png deleted file mode 100644 index 7f888cf93..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_date_yellow.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_exchange_gold.webp b/app/src/main/res/drawable-xhdpi/icon_exchange_gold.webp deleted file mode 100644 index a6225b54d..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_exchange_gold.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_exchange_jew.webp b/app/src/main/res/drawable-xhdpi/icon_exchange_jew.webp deleted file mode 100644 index 7f39a2605..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_exchange_jew.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_gold_num.webp b/app/src/main/res/drawable-xhdpi/icon_gold_num.webp deleted file mode 100644 index e9dd42be3..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_gold_num.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_task_tips.webp b/app/src/main/res/drawable-xhdpi/icon_task_tips.webp deleted file mode 100644 index c9442e65d..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_task_tips.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_test.webp b/app/src/main/res/drawable-xhdpi/icon_test.webp deleted file mode 100644 index e530ba090..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_test.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_withdraw_bank_card.png b/app/src/main/res/drawable-xhdpi/icon_withdraw_bank_card.png deleted file mode 100644 index 0aec72de2..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_withdraw_bank_card.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_zhifubao.webp b/app/src/main/res/drawable-xhdpi/icon_zhifubao.webp deleted file mode 100644 index 322f63197..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_zhifubao.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_zhifubao_grey.webp b/app/src/main/res/drawable-xhdpi/icon_zhifubao_grey.webp deleted file mode 100644 index d4bf6ca2b..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_zhifubao_grey.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/wallet_jewel.png b/app/src/main/res/drawable-xhdpi/wallet_jewel.png deleted file mode 100644 index 820ca6664..000000000 Binary files a/app/src/main/res/drawable-xhdpi/wallet_jewel.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_bill_gift_income_group.xml b/app/src/main/res/layout/activity_bill_gift_income_group.xml deleted file mode 100644 index 781d9fa8d..000000000 --- a/app/src/main/res/layout/activity_bill_gift_income_group.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_bills.xml b/app/src/main/res/layout/activity_bills.xml deleted file mode 100644 index f6f9c26cf..000000000 --- a/app/src/main/res/layout/activity_bills.xml +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_bills_gift.xml b/app/src/main/res/layout/activity_bills_gift.xml deleted file mode 100644 index e7e7dcd50..000000000 --- a/app/src/main/res/layout/activity_bills_gift.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_exchange_gold.xml b/app/src/main/res/layout/activity_exchange_gold.xml deleted file mode 100644 index 26ad58882..000000000 --- a/app/src/main/res/layout/activity_exchange_gold.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -