From d59d55575d913646b7a90fca651904ab889c6723 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 18 二月 2022 16:30:53 +0800
Subject: [PATCH] ### 一、任务模块相关

---
 app/src/main/java/cn/flightfeather/thirdappmodule/activity/LoginActivity.java |   64 +++++--------------------------
 1 files changed, 11 insertions(+), 53 deletions(-)

diff --git a/app/src/main/java/cn/flightfeather/thirdappmodule/activity/LoginActivity.java b/app/src/main/java/cn/flightfeather/thirdappmodule/activity/LoginActivity.java
index 34da85e..0f5de61 100644
--- a/app/src/main/java/cn/flightfeather/thirdappmodule/activity/LoginActivity.java
+++ b/app/src/main/java/cn/flightfeather/thirdappmodule/activity/LoginActivity.java
@@ -13,9 +13,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import cn.flightfeather.thirdappmodule.CommonApplication;
 import cn.flightfeather.thirdappmodule.R;
 import cn.flightfeather.thirdappmodule.adapter.ContentFragmentAdapter;
-import cn.flightfeather.thirdappmodule.CommonApplication;
 import cn.flightfeather.thirdappmodule.module.login.CardFragment;
 import cn.flightfeather.thirdappmodule.util.updateApp.UpdateAppUtil;
 import cn.flightfeather.thirdappmodule.view.OrientedViewPager;
@@ -24,7 +24,6 @@
 
 public class LoginActivity extends AppCompatActivity implements ViewPager.OnPageChangeListener {
 
-    //region 瀹氫箟鍙橀噺鍙婂璞�
     //妯悜ViewPager
     private OrientedViewPager movp_main;
     //绾挎�у竷灞�
@@ -39,9 +38,7 @@
     public List<Fragment> fragmentList = new ArrayList<>();
     //褰撳墠浣嶇疆
     private int positionCurrent = 0;
-    //endregion
 
-    //region Activity鍒涘缓
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -50,8 +47,6 @@
 //        MyApplication.getInstance().addActivity(this);
         //鍒濆鍖栨帶浠�
         initControl();
-        //鍒濆鍖栫鐗囬泦鍚堟暟鎹�
-        initFragmentListData();
         //鍒涘缓鍐呭纰庣墖閫傞厤鍣�
         createContentFragmentAdapter();
         //璁剧疆妯悜ViewPager
@@ -64,31 +59,12 @@
         checkUpdate();
     }
 
-    /**
-     * Dispatch onResume() to fragments.  Note that for better inter-operation
-     * with older versions of the platform, at the point of this call the
-     * fragments attached to the activity are <em>not</em> resumed.  This means
-     * that in some cases the previous state may still be saved, not allowing
-     * fragment transactions that modify the state.  To correctly interact
-     * with fragments in their proper state, you should instead override
-     * {@link #onResumeFragments()}.
-     */
-    @Override
-    protected void onResume() {
-        super.onResume();
 
-    }
-
-    //endregion
-
-    //region 璁剧疆鐩戝惉
     private void setListener() {
         //璁剧疆ViewPager婊戝姩鐩戝惉
         movp_main.setOnPageChangeListener(this);
     }
-    //endregion
 
-    //region 璁剧疆妯悜ViewPager
     private void setOrientationViewPager() {
         movp_main.setOrientation(OrientedViewPager.Orientation.VERTICAL);
         movp_main.setOffscreenPageLimit(2);
@@ -101,30 +77,27 @@
         fragmentCurrent = (CardFragment) adapter.instantiateItem(movp_main, positionCurrent);
 
     }
-    //endregion
 
-    //region 鍒涘缓鍐呭纰庣墖閫傞厤鍣�
     private void createContentFragmentAdapter() {
-        adapter = new ContentFragmentAdapter(getSupportFragmentManager(), fragmentList);
+        adapter = new ContentFragmentAdapter(getSupportFragmentManager(), getCardFragments());
     }
-    //endregion
 
-    //region 鍒濆鍖朏ragment闆嗗悎鏁版嵁
-    public void initFragmentListData() {
-        fragmentList.add(new CardFragment());
-        fragmentList.add(new CardFragment());
-        fragmentList.add(new CardFragment());
+    protected ContentFragmentAdapter.onGetItemInterface getCardFragments() {
+        return position -> {
+            int a = position%3;
+            if (a < 0) a = 0;
+            return CardFragment.newInstance(a + 1, position);
+        };
+//        fragmentList.add(CardFragment.newInstance(1, 0));
+//        fragmentList.add(CardFragment.newInstance(2, 1));
+//        fragmentList.add(CardFragment.newInstance(3, 2));
     }
-    //endregion
 
-    //region 鍒濆鍖栨帶浠�
     private void initControl() {
         movp_main = (OrientedViewPager) findViewById(R.id.ovp_main);
         mln = (LinearLayout) findViewById(R.id.mln);
     }
-    //endregion
 
-    //region 鍒濆鍖栧崐閫忔槑鐘舵�佹爮
     public void initTransparentStatsBar() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             this.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
@@ -132,9 +105,7 @@
             mln.setPadding(0, getStatusBarHeight(), 0, 0);
         }
     }
-    //endregion
 
-    //region 鑾峰緱鐘舵�佹爮楂樺害
     public int getStatusBarHeight() {
         int result = 0;
         int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
@@ -143,22 +114,16 @@
         }
         return result;
     }
-    //endregion
 
-    //region 鏄剧ず鐧诲綍鎸夐挳
     public void showButton() {
         //   fragmentCurrent = adapter.getCardFragment();
         fragmentCurrent.showLoginButton();
     }
-    //endregion
 
-    //region 闅愯棌鐧诲綍鎸夐挳
     public void hideButton() {
         fragmentCurrent.hideLoginButtion();
     }
-    //endregion
 
-    //region ViewPager婊戝姩
     @Override
     public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
         if (position == 0 && positionOffsetPixels == 0) {
@@ -167,9 +132,7 @@
             show = false;
         }
     }
-    //endregion
 
-    //region ViewPager閫変腑
     @Override
     public void onPageSelected(int position) {
         fragmentCurrent = (CardFragment) adapter.instantiateItem(movp_main, position);
@@ -186,9 +149,7 @@
             fragmentCurrent.changeLoginColor("#f26d44");
         }
     }
-    //endregion
 
-    //region ViewPager婊戝姩鐘舵�佹敼鍙�
     @Override
     public void onPageScrollStateChanged(int state) {
         if (state == 1) {
@@ -200,17 +161,14 @@
             showButton();
         }
     }
-    //endregion
 
     public void setCurFragment(int pos) {
         movp_main.setCurrentItem(pos);
     }
 
-    //<editor-fold desc="妫�鏌ユ洿鏂�">
     private void checkUpdate() {
         UpdateAppUtil updateAppUtil = new UpdateAppUtil((CommonApplication) getApplication(), this);
         updateAppUtil.checkUpdateApp(false);
     }
-    //</editor-fold>
 
 }

--
Gitblit v1.9.3