diff --git a/app/build.gradle b/app/build.gradle
index 9e6509c6..4de281f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,4 +53,6 @@ dependencies {
implementation 'com.scwang.smartrefresh:SmartRefreshHeader:1.1.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-2'
implementation project(path: ':ideahttp')
+ api 'com.jakewharton:butterknife:10.2.0'
+ annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 93aa3d37..b23354d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,17 +12,9 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
-
-
-
-
-
-
+ android:name=".activity.WelcomeActivity"
+ android:theme="@style/FullScreenTheme" >
@@ -30,6 +22,13 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.java b/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.java
index 152fb310..386d09eb 100644
--- a/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.java
+++ b/app/src/main/java/com/example/zhpan/circleviewpager/activity/MainActivity.java
@@ -1,43 +1,91 @@
package com.example.zhpan.circleviewpager.activity;
+import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.viewpager.widget.ViewPager;
-import android.view.View;
+import android.widget.RadioGroup;
import com.example.zhpan.circleviewpager.R;
+import com.example.zhpan.circleviewpager.adapter.AdapterFragmentPager;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
public class MainActivity extends AppCompatActivity {
+ @BindView(R.id.rg_tab)
+ RadioGroup rgTab;
+ @BindView(R.id.vp_fragment)
+ ViewPager mViewPager;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
+ ButterKnife.bind(this);
+ initData();
+ setListener();
}
- public void onClick(View view) {
- Intent intent;
- switch (view.getId()) {
- case R.id.tv_page_style:
- intent = new Intent(this, PageStyleActivity.class);
- break;
- case R.id.btn_view_pager3:
- intent = new Intent(this, PhotoViewActivity.class);
- break;
- case R.id.btn_view_pager5:
- intent = new Intent(this, PageTransformerActivity.class);
+ private void initData() {
+ AdapterFragmentPager mAdapter = new AdapterFragmentPager(getSupportFragmentManager());
+ mViewPager.setAdapter(mAdapter);
+ mViewPager.setOffscreenPageLimit(2);
+ mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+ }
+
+ @Override
+ public void onPageSelected(int position) {
+ rgTab.check(getCheckedId(position));
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+
+ }
+ });
+ }
+
+ private int getCheckedId(int position) {
+ int checkedId = R.id.rb_home;
+ switch (position) {
+ case 0:
+ checkedId = R.id.rb_home;
break;
- case R.id.btn_indicator_style:
- intent = new Intent(this, IndicatorStyleActivity.class);
+ case 1:
+ checkedId = R.id.rb_find;
break;
- case R.id.btn_view_pager4:
- default:
- intent = new Intent(this, NetworkBannerActivity.class);
+ case 2:
+ checkedId = R.id.rb_add;
break;
}
- startActivity(intent);
+ return checkedId;
+ }
+
+ private void setListener() {
+ rgTab.setOnCheckedChangeListener((group, checkedId) -> {
+ if (checkedId == R.id.rb_home) {
+ mViewPager.setCurrentItem(AdapterFragmentPager.PAGE_HOME, false);
+
+ } else if (checkedId == R.id.rb_find) {
+ mViewPager.setCurrentItem(AdapterFragmentPager.PAGE_FIND, false);
+
+ } else if (checkedId == R.id.rb_add) {
+ mViewPager.setCurrentItem(AdapterFragmentPager.PAGE_OTHERS, false);
+ }
+ });
+ }
+
+ public static void start(Context context) {
+ context.startActivity(new Intent(context, MainActivity.class));
}
+
}
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/activity/PageTransformerActivity.java b/app/src/main/java/com/example/zhpan/circleviewpager/activity/PageTransformerActivity.java
deleted file mode 100644
index 32574ee3..00000000
--- a/app/src/main/java/com/example/zhpan/circleviewpager/activity/PageTransformerActivity.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.example.zhpan.circleviewpager.activity;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-import com.example.zhpan.circleviewpager.R;
-import com.example.zhpan.circleviewpager.viewholder.TransformerViewHolder;
-import com.zhpan.bannerview.BannerViewPager;
-import com.zhpan.bannerview.constants.TransformerStyle;
-import com.zhpan.bannerview.transform.StackTransformer;
-
-import java.util.ArrayList;
-
-public class PageTransformerActivity extends AppCompatActivity {
-
- private static final String TAG = "PageTransformerActivity";
- private BannerViewPager mViewpager;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_page_transformer);
- setTitle(R.string.title_transformer);
- initViewPager();
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.transformer_menu, menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.menu0:
- mViewpager.setPageTransformerStyle(TransformerStyle.STACK);
- break;
- case R.id.menu1:
- mViewpager.setPageTransformerStyle(TransformerStyle.ROTATE);
- break;
- case R.id.menu2:
- mViewpager.setPageTransformerStyle(TransformerStyle.DEPTH);
- break;
- case R.id.menu3:
- mViewpager.setPageTransformerStyle(TransformerStyle.ACCORDION);
- break;
- }
- return super.onOptionsItemSelected(item);
- }
-
- private void initViewPager() {
- mViewpager = findViewById(R.id.viewpager);
- mViewpager.setIndicatorVisibility(View.GONE)
- .setCanLoop(false)
- .setAutoPlay(false)
- .setScrollDuration(1000)
- .setHolderCreator(TransformerViewHolder::new)
- .setOnPageClickListener(position -> Toast.makeText(PageTransformerActivity.this,
- "this is item:" + mViewpager.getCurrentItem(), Toast.LENGTH_SHORT).show())
- .create(getData());
- mViewpager.setPageTransformer(new StackTransformer());
- }
-
- private ArrayList getData() {
- ArrayList list = new ArrayList<>();
- for (int i = 0; i <= 2; i++) {
- int drawable = getResources().getIdentifier("guide" + i, "drawable", getPackageName());
- list.add(drawable);
- }
- return list;
- }
-}
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/activity/CustomerBannerPageActivity.java b/app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java
similarity index 57%
rename from app/src/main/java/com/example/zhpan/circleviewpager/activity/CustomerBannerPageActivity.java
rename to app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java
index 3a85c3f1..553690b4 100644
--- a/app/src/main/java/com/example/zhpan/circleviewpager/activity/CustomerBannerPageActivity.java
+++ b/app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java
@@ -3,27 +3,34 @@
import androidx.appcompat.app.AppCompatActivity;
+import android.content.Intent;
import android.os.Bundle;
import android.view.View;
-import android.widget.Toast;
import com.example.zhpan.circleviewpager.R;
import com.example.zhpan.circleviewpager.bean.CustomBean;
import com.example.zhpan.circleviewpager.viewholder.CustomPageViewHolder;
import com.zhpan.bannerview.BannerViewPager;
+import com.zhpan.bannerview.constants.IndicatorSlideMode;
+import com.zhpan.bannerview.constants.TransformerStyle;
+import com.zhpan.bannerview.indicator.CircleIndicatorView;
+import com.zhpan.bannerview.indicator.IIndicator;
import java.util.ArrayList;
import java.util.List;
+import java.util.Random;
+
+public class WelcomeActivity extends AppCompatActivity {
-public class CustomerBannerPageActivity extends AppCompatActivity {
private BannerViewPager mViewPager;
private int[] imgRes = {R.drawable.guide0, R.drawable.guide1, R.drawable.guide2};
private String[] des = {"在这里\n你可以听到周围人的心声", "在这里\nTA会在下一秒遇见你", "在这里\n不再错过可以改变你一生的人"};
+ private int[] transforms = {TransformerStyle.NONE, TransformerStyle.ACCORDION, TransformerStyle.STACK, TransformerStyle.DEPTH, TransformerStyle.ROTATE};
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_customer_banner);
+ setContentView(R.layout.activity_welcome);
getData();
setupViewPager();
}
@@ -38,17 +45,29 @@ private void setupViewPager() {
mViewPager = findViewById(R.id.viewpager);
mViewPager.setAutoPlay(false)
.setCanLoop(false)
+ .setPageTransformerStyle(transforms[new Random().nextInt(4)])
.setIndicatorVisibility(View.GONE)
- .setOnPageClickListener(position -> Toast.makeText(CustomerBannerPageActivity.this,
- "点击页面" + mViewPager.getCurrentItem(), Toast.LENGTH_SHORT).show())
+ .setIndicatorView(getIndicatorView())
.setHolderCreator(() -> {
CustomPageViewHolder customPageViewHolder = new CustomPageViewHolder();
- customPageViewHolder.setOnSubViewClickListener((view, position) -> Toast.makeText(CustomerBannerPageActivity.this,
- "立即体验" + position, Toast.LENGTH_SHORT).show());
+ customPageViewHolder.setOnSubViewClickListener((view, position) -> {
+ MainActivity.start(WelcomeActivity.this);
+ finish();
+ });
return customPageViewHolder;
}).create(getData());
}
+ private IIndicator getIndicatorView() {
+ CircleIndicatorView indicatorView = findViewById(R.id.indicator);
+ indicatorView.setNormalColor(getResources().getColor(R.color.white));
+ indicatorView.setCheckedColor(getResources().getColor(R.color.white_alpha_75));
+ indicatorView.setIndicatorWidth((int) getResources().getDimension(R.dimen.dp_6),
+ (int) getResources().getDimension(R.dimen.dp_9));
+ indicatorView.setIndicatorGap((int) getResources().getDimension(R.dimen.dp_10));
+ return indicatorView;
+ }
+
private List getData() {
List list = new ArrayList<>();
for (int i = 0; i < imgRes.length; i++) {
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.java b/app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.java
new file mode 100644
index 00000000..30644ad5
--- /dev/null
+++ b/app/src/main/java/com/example/zhpan/circleviewpager/adapter/AdapterFragmentPager.java
@@ -0,0 +1,64 @@
+package com.example.zhpan.circleviewpager.adapter;
+
+import android.util.SparseArray;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
+
+import com.example.zhpan.circleviewpager.fragment.BaseFragment;
+import com.example.zhpan.circleviewpager.fragment.FindFragment;
+import com.example.zhpan.circleviewpager.fragment.HomeFragment;
+import com.example.zhpan.circleviewpager.fragment.OthersFragment;
+
+import java.util.List;
+
+public class AdapterFragmentPager extends FragmentPagerAdapter {
+
+ public static final int PAGE_HOME = 0;
+
+ public static final int PAGE_FIND = 1;
+
+ public static final int PAGE_OTHERS = 2;
+
+ private SparseArray fragmentList;
+
+ public AdapterFragmentPager(FragmentManager fm) {
+ super(fm);
+ fragmentList = getFragments();
+ }
+
+ private SparseArray getFragments() {
+ SparseArray fragmentList = new SparseArray<>();
+ fragmentList.put(PAGE_HOME, HomeFragment.getInstance());
+ fragmentList.put(PAGE_FIND, FindFragment.getInstance());
+ fragmentList.put(PAGE_OTHERS, OthersFragment.getInstance());
+ return fragmentList;
+ }
+
+ @NonNull
+ @Override
+ public Object instantiateItem(@NonNull ViewGroup container, int position) {
+ Fragment fragment = (Fragment) super.instantiateItem(container, position);
+ fragmentList.put(position, (BaseFragment) fragment);
+ return fragment;
+ }
+
+ @Override
+ public Fragment getItem(int position) {
+ return fragmentList.get(position);
+ }
+
+ @Override
+ public int getCount() {
+ if (fragmentList != null) {
+ return fragmentList.size();
+ } else {
+ return 0;
+ }
+ }
+
+}
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/fragment/BaseFragment.java b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/BaseFragment.java
new file mode 100644
index 00000000..79a276a4
--- /dev/null
+++ b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/BaseFragment.java
@@ -0,0 +1,83 @@
+package com.example.zhpan.circleviewpager.fragment;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.trello.rxlifecycle2.components.support.RxFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+/**
+ * MVC模式的Base fragment
+ */
+public abstract class BaseFragment extends RxFragment {
+ protected List mDrawableList = new ArrayList<>();
+ protected Context mContext;
+ private Unbinder mBind;
+
+ @Override
+ public void onAttach(@NonNull Context context) {
+ super.onAttach(context);
+ this.mContext = context.getApplicationContext();
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ View view = inflater.inflate(getLayout(), container, false);
+ mBind = ButterKnife.bind(this,view);
+ initData();
+ initTitle();
+ initView(savedInstanceState, view);
+ return view;
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+ if (mBind != null) {
+ mBind.unbind();
+ }
+ }
+
+ private void initData() {
+ for (int i = 0; i <= 3; i++) {
+ int drawable = getResources().getIdentifier("t" + i, "drawable", mContext.getPackageName());
+ mDrawableList.add(drawable);
+ }
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ }
+
+
+ /**
+ * 获取当前Activity的UI布局
+ *
+ * @return 布局id
+ */
+ protected abstract int getLayout();
+
+ /**
+ * 初始化标题
+ */
+ protected abstract void initTitle();
+
+ /**
+ * 初始化数据
+ */
+ protected abstract void initView(Bundle savedInstanceState, View view);
+
+}
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/activity/PageStyleActivity.java b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/FindFragment.java
similarity index 62%
rename from app/src/main/java/com/example/zhpan/circleviewpager/activity/PageStyleActivity.java
rename to app/src/main/java/com/example/zhpan/circleviewpager/fragment/FindFragment.java
index 8567f8b6..8e71b2fc 100644
--- a/app/src/main/java/com/example/zhpan/circleviewpager/activity/PageStyleActivity.java
+++ b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/FindFragment.java
@@ -1,29 +1,56 @@
-package com.example.zhpan.circleviewpager.activity;
+package com.example.zhpan.circleviewpager.fragment;
import android.graphics.Color;
import android.os.Bundle;
+import android.view.LayoutInflater;
import android.view.View;
+import android.view.ViewGroup;
import android.widget.RadioButton;
import android.widget.RadioGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import com.example.zhpan.circleviewpager.R;
+import com.example.zhpan.circleviewpager.view.FigureIndicatorView;
import com.example.zhpan.circleviewpager.viewholder.ImageResourceViewHolder;
import com.zhpan.bannerview.BannerViewPager;
import com.zhpan.bannerview.annotation.APageStyle;
+import com.zhpan.bannerview.constants.IndicatorGravity;
+import com.zhpan.bannerview.constants.IndicatorStyle;
import com.zhpan.bannerview.constants.PageStyle;
import com.zhpan.bannerview.indicator.BaseIndicatorView;
import com.zhpan.bannerview.indicator.CircleIndicatorView;
import com.zhpan.bannerview.utils.DpUtils;
import com.zhpan.idea.utils.ToastUtils;
-public class PageStyleActivity extends BaseDataActivity {
- private BannerViewPager mViewPager;
+import butterknife.BindView;
+
+/**
+ * Created by zhpan on 2018/7/24.
+ */
+public class FindFragment extends BaseFragment {
+ @BindView(R.id.banner_view)
+ BannerViewPager mViewPager;
+ @BindView(R.id.rg_page_style)
+ RadioGroup mRadioGroupPageStyle;
+ @BindView(R.id.indicator_view)
+ CircleIndicatorView indicatorView;
+ @BindView(R.id.rb_multi_page)
+ RadioButton radioButton;
+
+ @Override
+ protected int getLayout() {
+ return R.layout.fragment_find;
+ }
+
+ @Override
+ protected void initTitle() {
+
+ }
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_page_style);
- mViewPager = findViewById(R.id.banner_view);
+ protected void initView(Bundle savedInstanceState, View view) {
mViewPager
.setPageMargin(DpUtils.dp2px(10))
.setRevealWidth(DpUtils.dp2px(10))
@@ -34,6 +61,16 @@ protected void onCreate(Bundle savedInstanceState) {
initRadioGroup();
}
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ return super.onCreateView(inflater, container, savedInstanceState);
+ }
+
+ public static FindFragment getInstance() {
+ return new FindFragment();
+ }
+
private void setupBanner(@APageStyle int pageStyle) {
mViewPager
.setPageStyle(pageStyle)
@@ -41,8 +78,7 @@ private void setupBanner(@APageStyle int pageStyle) {
}
private void initRadioGroup() {
- RadioGroup radioGroupStyle = findViewById(R.id.rg_indicator_style);
- radioGroupStyle.setOnCheckedChangeListener((group, checkedId) -> {
+ mRadioGroupPageStyle.setOnCheckedChangeListener((group, checkedId) -> {
switch (checkedId) {
case R.id.rb_multi_page:
setupBanner(PageStyle.MULTI_PAGE);
@@ -55,7 +91,6 @@ private void initRadioGroup() {
break;
}
});
- RadioButton radioButton = findViewById(R.id.rb_multi_page);
radioButton.performClick();
}
@@ -68,20 +103,19 @@ private void setupOverlapBanner() {
}
private BaseIndicatorView setupIndicatorView() {
- CircleIndicatorView indicatorView = findViewById(R.id.indicator_view);
indicatorView.setCheckedColor(Color.parseColor("#935656"));
indicatorView.setNormalColor(Color.parseColor("#FF4C39"));
return indicatorView;
}
@Override
- protected void onStop() {
+ public void onStop() {
super.onStop();
mViewPager.stopLoop();
}
@Override
- protected void onResume() {
+ public void onResume() {
super.onResume();
mViewPager.startLoop();
}
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/activity/NetworkBannerActivity.java b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/HomeFragment.java
similarity index 77%
rename from app/src/main/java/com/example/zhpan/circleviewpager/activity/NetworkBannerActivity.java
rename to app/src/main/java/com/example/zhpan/circleviewpager/fragment/HomeFragment.java
index 20b41c8f..5531cc91 100644
--- a/app/src/main/java/com/example/zhpan/circleviewpager/activity/NetworkBannerActivity.java
+++ b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/HomeFragment.java
@@ -1,15 +1,15 @@
-package com.example.zhpan.circleviewpager.activity;
+package com.example.zhpan.circleviewpager.fragment;
import android.graphics.Color;
import android.os.Bundle;
-
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
import android.view.LayoutInflater;
import android.view.View;
+import android.widget.TextView;
import android.widget.Toast;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
import com.example.zhpan.circleviewpager.R;
import com.example.zhpan.circleviewpager.adapter.ArticleAdapter;
import com.example.zhpan.circleviewpager.bean.ArticleWrapper;
@@ -20,7 +20,6 @@
import com.example.zhpan.circleviewpager.viewholder.NetViewHolder;
import com.scwang.smartrefresh.header.MaterialHeader;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.trello.rxlifecycle2.components.support.RxAppCompatActivity;
import com.zhpan.bannerview.BannerViewPager;
import com.zhpan.bannerview.constants.IndicatorGravity;
import com.zhpan.bannerview.utils.DpUtils;
@@ -33,7 +32,10 @@
import io.reactivex.Observable;
import io.reactivex.schedulers.Schedulers;
-public class NetworkBannerActivity extends RxAppCompatActivity {
+/**
+ * Created by zhpan on 2018/7/24.
+ */
+public class HomeFragment extends BaseFragment {
private BannerViewPager mBannerViewPager;
private CustomRecyclerView recyclerView;
@@ -41,29 +43,40 @@ public class NetworkBannerActivity extends RxAppCompatActivity {
private SmartRefreshLayout mSmartRefreshLayout;
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_network_banner);
- setTitle(R.string.load_data);
- initRefreshLayout();
- initRecyclerView();
+ protected int getLayout() {
+ return R.layout.fragment_home;
+ }
+
+ @Override
+ protected void initTitle() {
+
+ }
+
+ @Override
+ protected void initView(Bundle savedInstanceState, View view) {
+ initRecyclerView(view);
+ initRefreshLayout(view);
initBanner();
fetchData(true);
}
- private void initRecyclerView() {
- recyclerView = findViewById(R.id.recycler_view);
- recyclerView.setLayoutManager(new LinearLayoutManager(this));
+ public static HomeFragment getInstance() {
+ return new HomeFragment();
+ }
+
+ private void initRecyclerView(View view) {
+ recyclerView = view.findViewById(R.id.recycler_view);
+ recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
recyclerView.addHeadView(getHeaderView());
- recyclerView.addItemDecoration(new DividerItemDecoration(NetworkBannerActivity.this,
+ recyclerView.addItemDecoration(new DividerItemDecoration(mContext,
DividerItemDecoration.VERTICAL));
- articleAdapter = new ArticleAdapter(this, new ArrayList<>());
+ articleAdapter = new ArticleAdapter(mContext, new ArrayList<>());
recyclerView.setAdapter(articleAdapter);
}
- private void initRefreshLayout() {
- mSmartRefreshLayout = findViewById(R.id.refresh_layout);
- mSmartRefreshLayout.setRefreshHeader(new MaterialHeader(this));
+ private void initRefreshLayout(View view) {
+ mSmartRefreshLayout = view.findViewById(R.id.refresh_layout);
+ mSmartRefreshLayout.setRefreshHeader(new MaterialHeader(mContext));
mSmartRefreshLayout.setOnRefreshListener(refreshLayout -> fetchData(false));
}
@@ -108,29 +121,27 @@ private void initBanner() {
.setScrollDuration(1000).setHolderCreator(NetViewHolder::new)
.setOnPageClickListener(position -> {
BannerData bannerData = mBannerViewPager.getList().get(position);
- Toast.makeText(NetworkBannerActivity.this,
+ Toast.makeText(mContext,
"点击了position:" + position + " " + bannerData.getDesc(), Toast.LENGTH_SHORT).show();
});
}
private View getHeaderView() {
- View view = LayoutInflater.from(this).inflate(R.layout.item_header_view, recyclerView, false);
+ View view = LayoutInflater.from(mContext).inflate(R.layout.item_header_view, recyclerView, false);
mBannerViewPager = view.findViewById(R.id.banner_view);
return view;
}
@Override
- protected void onStop() {
+ public void onStop() {
+ mBannerViewPager.stopLoop();
super.onStop();
- if (mBannerViewPager != null)
- mBannerViewPager.stopLoop();
}
@Override
- protected void onResume() {
+ public void onResume() {
+ mBannerViewPager.startLoop();
super.onResume();
- if (mBannerViewPager != null)
- mBannerViewPager.startLoop();
}
}
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/activity/IndicatorStyleActivity.java b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/OthersFragment.java
similarity index 77%
rename from app/src/main/java/com/example/zhpan/circleviewpager/activity/IndicatorStyleActivity.java
rename to app/src/main/java/com/example/zhpan/circleviewpager/fragment/OthersFragment.java
index 85e1f496..d703c65d 100644
--- a/app/src/main/java/com/example/zhpan/circleviewpager/activity/IndicatorStyleActivity.java
+++ b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/OthersFragment.java
@@ -1,6 +1,6 @@
-package com.example.zhpan.circleviewpager.activity;
-
+package com.example.zhpan.circleviewpager.fragment;
+import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
@@ -8,6 +8,7 @@
import android.widget.RadioGroup;
import com.example.zhpan.circleviewpager.R;
+import com.example.zhpan.circleviewpager.activity.PhotoViewActivity;
import com.example.zhpan.circleviewpager.view.FigureIndicatorView;
import com.example.zhpan.circleviewpager.viewholder.ImageResourceViewHolder;
import com.zhpan.bannerview.BannerViewPager;
@@ -16,23 +17,42 @@
import com.zhpan.bannerview.utils.DpUtils;
import com.zhpan.idea.utils.ToastUtils;
-public class IndicatorStyleActivity extends BaseDataActivity {
+import butterknife.BindView;
+import butterknife.OnClick;
+
+/**
+ * Created by zhpan on 2018/7/24.
+ */
+public class OthersFragment extends BaseFragment {
+ @BindView(R.id.banner_view)
+ BannerViewPager mViewPager;
+ @BindView(R.id.rg_indicator_style)
+ RadioGroup radioGroupStyle;
+ @BindView(R.id.rb_circle)
+ RadioButton radioButton;
+
+ @Override
+ protected int getLayout() {
+ return R.layout.fragment_others;
+ }
+
+ @Override
+ protected void initTitle() {
- private BannerViewPager mViewPager;
+ }
@Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_indicator_slide_mode);
- setTitle(getString(R.string.indicator_style));
- mViewPager = findViewById(R.id.banner_view_dash);
+ protected void initView(Bundle savedInstanceState, View view) {
mViewPager.setIndicatorGap(DpUtils.dp2px(6))
.setHolderCreator(() -> new ImageResourceViewHolder(0));
initRadioGroup();
}
+ public static OthersFragment getInstance() {
+ return new OthersFragment();
+ }
+
private void initRadioGroup() {
- RadioGroup radioGroupStyle = findViewById(R.id.rg_indicator_style);
radioGroupStyle.setVisibility(View.VISIBLE);
radioGroupStyle.setVisibility(View.VISIBLE);
radioGroupStyle.setOnCheckedChangeListener((group, checkedId) -> {
@@ -50,7 +70,6 @@ private void initRadioGroup() {
break;
}
});
- RadioButton radioButton = findViewById(R.id.rb_circle);
radioButton.performClick();
}
@@ -77,7 +96,6 @@ private void setupDashIndicator() {
}
private void setupCustomIndicator() {
- mViewPager = findViewById(R.id.banner_view_dash);
mViewPager.setAutoPlay(false).setCanLoop(true)
.setPageMargin(DpUtils.dp2px(20))
.setIndicatorMargin(0, 0, DpUtils.dp2px(10), DpUtils.dp2px(10))
@@ -90,16 +108,21 @@ private void setupCustomIndicator() {
* 这里可以是自定义的Indicator，需要继承BaseIndicatorView或者实现IIndicator接口;
*/
private FigureIndicatorView setupIndicatorView() {
- FigureIndicatorView indicatorView = new FigureIndicatorView(this);
+ FigureIndicatorView indicatorView = new FigureIndicatorView(mContext);
indicatorView.setRadius(DpUtils.dp2px(18));
indicatorView.setTextSize(DpUtils.dp2px(13));
indicatorView.setBackgroundColor(Color.parseColor("#aa118EEA"));
return indicatorView;
}
+ @OnClick(R.id.tv_photo_view)
+ public void onClick(View view) {
+ startActivity(new Intent(getActivity(), PhotoViewActivity.class));
+ }
+
@Override
- protected void onDestroy() {
- super.onDestroy();
+ public void onDestroy() {
mViewPager.stopLoop();
+ super.onDestroy();
}
}
diff --git a/app/src/main/res/drawable-xhdpi/creative_hover.png b/app/src/main/res/drawable-xhdpi/creative_hover.png
new file mode 100644
index 00000000..3a0f25fe
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/creative_hover.png differ
diff --git a/app/src/main/res/drawable-xhdpi/creative_none.png b/app/src/main/res/drawable-xhdpi/creative_none.png
new file mode 100644
index 00000000..7dcc6568
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/creative_none.png differ
diff --git a/app/src/main/res/drawable-xhdpi/discover_hover.png b/app/src/main/res/drawable-xhdpi/discover_hover.png
new file mode 100644
index 00000000..bcbba5ac
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/discover_hover.png differ
diff --git a/app/src/main/res/drawable-xhdpi/discover_none.png b/app/src/main/res/drawable-xhdpi/discover_none.png
new file mode 100644
index 00000000..7e086b52
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/discover_none.png differ
diff --git a/app/src/main/res/drawable-xhdpi/home_hover.png b/app/src/main/res/drawable-xhdpi/home_hover.png
new file mode 100644
index 00000000..86219107
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/home_hover.png differ
diff --git a/app/src/main/res/drawable-xhdpi/home_none.png b/app/src/main/res/drawable-xhdpi/home_none.png
new file mode 100644
index 00000000..e145c154
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/home_none.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/guide0.jpg b/app/src/main/res/drawable-xxhdpi/guide0.jpg
index 88020ef7..e85a58a4 100644
Binary files a/app/src/main/res/drawable-xxhdpi/guide0.jpg and b/app/src/main/res/drawable-xxhdpi/guide0.jpg differ
diff --git a/app/src/main/res/drawable-xxhdpi/guide1.jpg b/app/src/main/res/drawable-xxhdpi/guide1.jpg
index fe8a3b0d..8802c79d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/guide1.jpg and b/app/src/main/res/drawable-xxhdpi/guide1.jpg differ
diff --git a/app/src/main/res/drawable-xxhdpi/guide2.jpg b/app/src/main/res/drawable-xxhdpi/guide2.jpg
index 25f9ffc2..53e6302d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/guide2.jpg and b/app/src/main/res/drawable-xxhdpi/guide2.jpg differ
diff --git a/app/src/main/res/drawable/tab1_selector.xml b/app/src/main/res/drawable/tab1_selector.xml
new file mode 100644
index 00000000..5a8640f1
--- /dev/null
+++ b/app/src/main/res/drawable/tab1_selector.xml
@@ -0,0 +1,6 @@
+
+
+