修复我的资产中手动刷新时不正常的bug

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -9,9 +9,7 @@ import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.Window;
 import android.widget.ImageView;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
@@ -23,9 +21,7 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.absBase.BaseRefreshLoadMoreFragment;
 import com.sheep.gamegroup.absBase.ILoadMore;
 import com.sheep.gamegroup.absBase.IRefresh;
-import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.Lp;
 import com.sheep.gamegroup.model.entity.UserAssets;
 import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
@@ -36,10 +32,8 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
@@ -191,7 +185,6 @@ public class ActMyMoney extends BaseActivity {
 
     }
 
-    private int refreshDataCount = 0;
 
     //刷新数据
     public void refreshData() {
@@ -200,17 +193,12 @@ public class ActMyMoney extends BaseActivity {
 
     //刷新数据
     public void refreshData(int position) {
-        boolean isRefresh = false;
-        if (refreshDataCount != 0) {
-            Fragment item = mAdapter.getItem(position);
-            if (item instanceof IRefresh) {//可刷新，就调用当前fragment刷新数据
-                ((IRefresh) item).refreshData();
-                isRefresh = true;
-            }
-        }
-        refreshDataCount++;
-        if (!isRefresh)
+        getMyAssets(false);
+        Fragment item = mAdapter.getItem(position);
+        if (item instanceof IRefresh) {//可刷新，就调用当前fragment刷新数据
+            ((IRefresh) item).refreshData();
             notifyDataSetChanged();
+        }
     }
 
     //加载更多数据
@@ -243,11 +231,6 @@ public class ActMyMoney extends BaseActivity {
         return mAdapter;
     }
 
-    @Override
-    public void initListener() {
-
-    }
-
     @OnClick({R.id.my_money_withdraw_tv,
             R.id.my_money_recharge_tv,
             R.id.my_money_dingxiang_amount_iv,
@@ -275,8 +258,14 @@ public class ActMyMoney extends BaseActivity {
 
     @Override
     public void initData() {
-        showProgress();
-        resetData();
+        getMyAssets(true);
+    }
+
+    private void getMyAssets(boolean showProgress) {
+        if (showProgress) {
+            showProgress();
+            resetData();
+        }
         SheepApp.getInstance().getNetComponent().getApiService().getMyAssets()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -290,14 +279,18 @@ public class ActMyMoney extends BaseActivity {
                         UserAssets userAssets = baseMessage.getData(UserAssets.class);
 
                         loadData(userAssets);
-                        hideProgress();
+                        if (showProgress) {
+                            hideProgress();
+                        }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast(baseMessage);
-                        resetData();
-                        hideProgress();
+                        if (showProgress) {
+                            resetData();
+                            hideProgress();
+                        }
                     }
                 });
     }

app/src/main/java/com/sheep/gamegroup/view/activity/NewYearActMyMoney.java

@@ -9,7 +9,6 @@ import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
@@ -28,7 +27,6 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeBalanceLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtRechargeLog;
 import com.sheep.gamegroup.module.personal.fragment.FgtWithdraw;
-import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
@@ -49,6 +47,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.MY_MONEY_TAB;
+
 /**
  * Created by realicing on 2019/1/28.
  * realicing@sina.com
@@ -136,9 +135,10 @@ public class NewYearActMyMoney extends BaseActivity {
         //Tablayout自定义view绑定ViewPager
         viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager) {
-            private void smoothScrollView(){
+            private void smoothScrollView() {
                 scrollView.smoothScrollTo(0, indicator.getTop());
             }
+
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
                 super.onTabReselected(tab);
@@ -170,7 +170,6 @@ public class NewYearActMyMoney extends BaseActivity {
 
     }
 
-    private int refreshDataCount = 0;
 
     //刷新数据
     public void refreshData() {
@@ -179,17 +178,12 @@ public class NewYearActMyMoney extends BaseActivity {
 
     //刷新数据
     public void refreshData(int position) {
-        boolean isRefresh = false;
-        if (refreshDataCount != 0) {
-            Fragment item = mAdapter.getItem(position);
-            if (item instanceof IRefresh) {//可刷新，就调用当前fragment刷新数据
-                ((IRefresh) item).refreshData();
-                isRefresh = true;
-            }
-        }
-        refreshDataCount++;
-        if (!isRefresh)
+        getMyAssets(false);
+        Fragment item = mAdapter.getItem(position);
+        if (item instanceof IRefresh) {//可刷新，就调用当前fragment刷新数据
+            ((IRefresh) item).refreshData();
             notifyDataSetChanged();
+        }
     }
 
     //加载更多数据
@@ -254,8 +248,14 @@ public class NewYearActMyMoney extends BaseActivity {
 
     @Override
     public void initData() {
-        showProgress();
-        resetData();
+        getMyAssets(true);
+    }
+
+    private void getMyAssets(boolean showProgress) {
+        if (showProgress) {
+            showProgress();
+            resetData();
+        }
         SheepApp.getInstance().getNetComponent().getApiService().getMyAssets()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
@@ -269,14 +269,18 @@ public class NewYearActMyMoney extends BaseActivity {
                         UserAssets userAssets = baseMessage.getData(UserAssets.class);
 
                         loadData(userAssets);
-                        hideProgress();
+                        if (showProgress) {
+                            hideProgress();
+                        }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast(baseMessage);
-                        resetData();
-                        hideProgress();
+                        if (showProgress) {
+                            resetData();
+                            hideProgress();
+                        }
                     }
                 });
     }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyMoney1.java

@@ -1,26 +0,0 @@
-package com.sheep.gamegroup.view.fragment;
-
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.RechargeBalanceLog;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import java.util.List;
-
-import io.reactivex.Observable;
-
-/**
- * 我的资产 --> 充值记录
- * Created by realicing on 2018/5/8.
- * realicing@sina.com
- */
-public class FgtMyMoney1 extends AbsFgtMyMoney {
-    @Override
-    protected List<RechargeBalanceLog> getDatas(BaseMessage baseMessage) {
-        return baseMessage.getDatas(RechargeBalanceLog.class);
-    }
-
-    @Override
-    protected Observable<BaseMessage> initObservable(int page, int per_page) {
-        return SheepApp.getInstance().getNetComponent().getApiService().getRechargeBalanceLog(page, per_page);
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyMoney2.java

@@ -1,27 +0,0 @@
-package com.sheep.gamegroup.view.fragment;
-
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.WithdrawalEty;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import java.util.List;
-
-import io.reactivex.Observable;
-
-/**
- * 我的资产 --> 提现记录
- * Created by realicing on 2018/5/9.
- * realicing@sina.com
- */
-public class FgtMyMoney2 extends AbsFgtMyMoney {
-
-    @Override
-    protected List<WithdrawalEty> getDatas(BaseMessage baseMessage) {
-        return baseMessage.getDatas(WithdrawalEty.class);
-    }
-
-    @Override
-    protected Observable<BaseMessage> initObservable(int page, int per_page) {
-        return SheepApp.getInstance().getNetComponent().getApiService().goWithdrawal(page, per_page,"",System.currentTimeMillis()+"");
-    }
-}

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMyMoney3.java

@@ -1,26 +0,0 @@
-package com.sheep.gamegroup.view.fragment;
-
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.RechargeLog;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-
-import java.util.List;
-
-import io.reactivex.Observable;
-
-/**
- * 我的资产 --> 充值Q币记录（消费记录）
- * Created by realicing on 2018/5/9.
- * realicing@sina.com
- */
-public class FgtMyMoney3 extends AbsFgtMyMoney {
-    @Override
-    protected List<RechargeLog> getDatas(BaseMessage baseMessage) {
-        return baseMessage.getDatas(RechargeLog.class);
-    }
-
-    @Override
-    protected Observable<BaseMessage> initObservable(int page, int per_page) {
-        return SheepApp.getInstance().getNetComponent().getApiService().getRechargeLog(page, per_page);
-    }
-}