Просмотр исходного кода

审核放到个人中心功能完成

zengjiebin лет назад: 7
Родитель
Сommit
89d2c85015

+ 26 - 27
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java

@@ -48,12 +48,17 @@ public class FgtAudit extends BaseFragment {
 
     private Activity activity;
     public List<TaskAcceptedEty> etyList = new ArrayList<>();
-    private TaskListItemAdp adp = new TaskListItemAdp(activity , etyList);
+    private TaskListItemAdp adp;
 
 
     private int page = 1;//页数
     private int per_page = DataUtil.PER_PAGE;
-    public int type;
+    public int type = POSITION_ACTIVITY + 1;
+    public boolean firstPage = false;
+
+    public void setFirstPage(boolean firstPage) {
+        this.firstPage = firstPage;
+    }
 
     public static FgtAudit newInstance(int type){
         FgtAudit fgt = new FgtAudit();
@@ -62,6 +67,16 @@ public class FgtAudit extends BaseFragment {
         fgt.setArguments(bundle);
         return fgt;
     }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            type = bundle.getInt("type", POSITION_ACTIVITY + 1);
+        }
+        super.onCreate(savedInstanceState);
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.withdrawal_list;
@@ -71,27 +86,21 @@ public class FgtAudit extends BaseFragment {
     public void onViewCreated() {
         activity = getActivity();
         initView();
-//        if(POSITION_ACTIVITY + 1 == type)
-//            refreshData();
-        LogUtil.println("FgtAudit", "onViewCreated", type);
+        if(firstPage)
+            refreshData();
     }
 
     @Override
     protected void initDataOnVisibleToUser() {
-//        if(POSITION_ACTIVITY + 1 != type)
-//            refreshData();
-        LogUtil.println("FgtAudit", "initDataOnVisibleToUser", type);
-    }
-
-    @Override
-    protected void initViewOnVisibleToUser() {
-        LogUtil.println("FgtAudit", "initViewOnVisibleToUser", type);
+        if(!firstPage && firstVisibleToUser)
+            refreshData();
     }
 
     private void initView() {
         title.setVisibility(View.GONE);
         empty_view.setPadding(0, 50, 0, 0);
         swipe_container.setFooterView(activity, withdrawalListview, R.layout.listview_footer);
+        adp = new TaskListItemAdp(activity , etyList);
         withdrawalListview.setAdapter(adp);
         adp.notifyDataSetChanged();
 
@@ -128,10 +137,10 @@ public class FgtAudit extends BaseFragment {
     }
     private void refreshData() {
         LogUtil.println("FgtAudit", "refreshData", type);
-//        etyList.clear();
-//        adp.notifyDataSetChanged();
-//        page = 1;
-//        initData();
+        etyList.clear();
+        adp.notifyDataSetChanged();
+        page = 1;
+        initData();
     }
     public void initData() {
         if(empty_view != null)
@@ -165,14 +174,4 @@ public class FgtAudit extends BaseFragment {
         swipe_container.setRefreshing(false);
         adp.notifyDataSetChanged();
     }
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Bundle bundle = getArguments();
-        if(bundle != null){
-            type = bundle.getInt("type", 0);
-        }
-    }
 }

+ 7 - 3
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -69,7 +69,6 @@ public class FgtMainAudit extends BaseFragment {
     private Integer curPosition = 0;
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
         Bundle bundle = getArguments();
         if (bundle != null) {
             Integer position = DataUtil.getObject(bundle, Integer.class);
@@ -77,7 +76,7 @@ public class FgtMainAudit extends BaseFragment {
                 curPosition = position;
             }
         }
-        return rootView;
+        return super.onCreateView(inflater, container, savedInstanceState);
     }
 
     @Override
@@ -154,7 +153,7 @@ public class FgtMainAudit extends BaseFragment {
 
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, activity);
-//        pager.setCurrentItem(curPosition);
+        pager.setCurrentItem(curPosition);
     }
     public static final int POSITION_ACTIVITY = 0;
     public static final int POSITION_SUCCESS = 1;
@@ -164,6 +163,11 @@ public class FgtMainAudit extends BaseFragment {
         mAdapter.add(FgtAudit.newInstance(POSITION_ACTIVITY + 1), tabNames[POSITION_ACTIVITY]);
         mAdapter.add(FgtAudit.newInstance(POSITION_SUCCESS + 1), tabNames[POSITION_SUCCESS]);
         mAdapter.add(FgtAudit.newInstance(POSITION_FAILED + 1), tabNames[POSITION_FAILED]);
+        FgtAudit fgtAudit = (FgtAudit) mAdapter.getItem(curPosition);
+        if(fgtAudit != null){
+            fgtAudit.setFirstPage(true);
+        }
+
         pager.setAdapter(mAdapter);
         new_tab();
     }

+ 1 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseFragment.java

@@ -114,10 +114,10 @@ public abstract class BaseFragment extends Fragment {
         super.setUserVisibleHint(isVisibleToUser);
         if(isVisibleToUser) {
             if(firstVisibleToUser) {
-                firstVisibleToUser = false;
                 initViewOnVisibleToUser();
             }
             initDataOnVisibleToUser();
+            firstVisibleToUser = false;
         }
     }
     protected void initViewOnVisibleToUser() {