zhpanvip před 4 roky
rodič
revize
0f8fcf27c3

+ 2 - 2
app/build.gradle

@@ -9,7 +9,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 28
         versionCode 1
-        versionName "3.2.0"
+        versionName "3.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -80,6 +80,6 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'com.blankj:utilcodex:1.30.5'
     implementation 'com.airbnb.android:lottie:3.4.1'
-//    implementation 'com.github.zhpanvip:BannerViewPager:3.2.0'
+//    implementation 'com.github.zhpanvip:BannerViewPager:3.4.0'
     implementation project(path: ':bannerview')
 }

+ 2 - 11
app/src/main/java/com/example/zhpan/banner/activity/MainActivity.kt

@@ -45,11 +45,9 @@ class MainActivity : AppCompatActivity() {
     private fun initData() {
         with(vp_fragment) {
             adapter = AdapterFragmentPager(this@MainActivity)
-            isUserInputEnabled = false
             registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
                 override fun onPageSelected(position: Int) {
                     super.onPageSelected(position)
-                    vp_fragment.isUserInputEnabled = true
                     rg_tab?.check(getCheckedId(position))
                 }
             })
@@ -58,10 +56,7 @@ class MainActivity : AppCompatActivity() {
 
     private fun getCheckedId(position: Int): Int {
         return when (position) {
-            0 -> {
-                vp_fragment.isUserInputEnabled = false
-                R.id.rb_home
-            }
+            0 -> R.id.rb_home
             1 -> R.id.rb_add
             2 -> R.id.rb_find
             3 -> R.id.rb_others
@@ -71,12 +66,8 @@ class MainActivity : AppCompatActivity() {
 
     private fun setListener() {
         rg_tab?.setOnCheckedChangeListener { _, checkedId ->
-            vp_fragment.isUserInputEnabled = true
             when (checkedId) {
-                R.id.rb_home -> {
-                    vp_fragment.isUserInputEnabled = false
-                    vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_HOME, true)
-                }
+                R.id.rb_home -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_HOME, true)
                 R.id.rb_add -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_FIND, true)
                 R.id.rb_find -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_INDICATOR, true)
                 R.id.rb_others -> vp_fragment.setCurrentItem(AdapterFragmentPager.PAGE_OTHERS, true)

+ 1 - 1
app/src/main/java/com/example/zhpan/banner/fragment/OthersFragment.java

@@ -109,7 +109,7 @@ public class OthersFragment extends BaseFragment implements View.OnClickListener
                 .setIndicatorSlideMode(IndicatorSlideMode.NORMAL)
                 .setIndicatorVisibility(View.VISIBLE)
                 .setIndicatorGravity(IndicatorGravity.CENTER)
-                .refreshData(getMDrawableList());
+                .refreshData(getPicList(4));
     }
 
     private void setIndicatorBelowOfBanner() {

binární
app/src/main/res/drawable-xxxhdpi/advertise0.jpg


binární
app/src/main/res/drawable-xxxhdpi/advertise0.png


binární
app/src/main/res/drawable-xxxhdpi/advertise1.jpg


binární
app/src/main/res/drawable-xxxhdpi/advertise1.png


binární
app/src/main/res/drawable-xxxhdpi/advertise2.jpg


binární
app/src/main/res/drawable-xxxhdpi/advertise2.png


binární
app/src/main/res/drawable-xxxhdpi/advertise3.jpg


binární
app/src/main/res/drawable-xxxhdpi/advertise3.png


binární
app/src/main/res/drawable-xxxhdpi/advertise4.jpg


binární
app/src/main/res/drawable-xxxhdpi/advertise4.png


+ 2 - 2
app/src/main/res/layout/fragment_find.xml

@@ -7,8 +7,8 @@
     <com.zhpan.bannerview.BannerViewPager
         android:id="@+id/banner_view"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_180"
-        android:layout_marginTop="@dimen/dp_20"
+        android:layout_height="@dimen/dp_185"
+        android:layout_marginTop="@dimen/dp_16"
         app:bvp_indicator_slide_mode="worm"
         app:bvp_page_style="multi_page" />
 

+ 1 - 1
app/src/main/res/layout/item_header_view.xml

@@ -7,5 +7,5 @@
     <com.zhpan.bannerview.BannerViewPager
         android:id="@+id/banner_view2"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_120" />
+        android:layout_height="@dimen/dp_150" />
 </RelativeLayout>

+ 1 - 1
app/src/main/res/layout/item_home_banner.xml

@@ -2,4 +2,4 @@
 <com.zhpan.bannerview.BannerViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/banner_view3"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_120" />
+    android:layout_height="@dimen/dp_180" />