Merge remote-tracking branch 'origin/release2' into translater_version

# Conflicts:
#	app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/decbn/GXCProgressLogin.java

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/poolref/ZYTVideoPlayerDetailsActivity.java

@@ -591,13 +591,12 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
 
     @SuppressLint("UnsafeOptInUsageError")
     private MediaSource buildMediaSource(String videoPath) {
-        DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this, "zyreotv");
+//        DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this, "gleestream");
-
         if (videoPath.endsWith(".m3u8")) {
-            return new HlsMediaSource.Factory(dataSourceFactory)
+            return new HlsMediaSource.Factory(GSExplayCacheUtils.getCacheFactory(this))
                     .createMediaSource(MediaItem.fromUri(Uri.parse(videoPath)));
         } else {
-            return new ProgressiveMediaSource.Factory(dataSourceFactory)
+            return new ProgressiveMediaSource.Factory(GSExplayCacheUtils.getCacheFactory(this))
                     .createMediaSource(MediaItem.fromUri(Uri.parse(videoPath)));
         }
     }
@@ -745,7 +744,7 @@ public class ZYTVideoPlayerDetailsActivity extends IDDetailsRoundActivity<MchDim
                 gsMainEpisodeBean.setEpisode(item.getEpisode());
                 gsMainEpisodeBean.setEpisode_name(shortVideoInfo.getName());
                 gsMainEpisodeBean.setImageurl(shortVideoInfo.getImage_url());
-                gsMainEpisodeBean.setShort_play_id(shortVideoInfo.getShort_play_id());
+                gsMainEpisodeBean.setShort_play_id(item.getShort_play_id());
                 gsMainEpisodeBean.setShort_play_video_id(item.getShort_play_video_id());
                 TIndicator.saveString(ITItem.CONSTANTS_Main_Bottom_VideoInfo, REnterCircle.beanToJSONString(gsMainEpisodeBean));
                 TIndicator.saveBoolean(ITItem.CONSTANTS_Main_VideoStatus, true);

app/src/main/java/com/shortdrama/jelly/zyreotv/topics/abslRwgt/vars/FLSFragmentOogleFragment.java

@@ -8,7 +8,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 
 
-
 import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -45,10 +44,6 @@ import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
 
-
-
-
-
 public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails.QUnitActivity {
 
     private JMarkInfo seenMarkView;
@@ -70,10 +65,13 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         double unselectP = 4467.0;
-             if (unselectP >= 22) {}
+        if (unselectP >= 22) {
+        }
         seenMarkView = new ViewModelProvider(this).get(JMarkInfo.class);
         float fragmentR = 1263.0f;
-             while (fragmentR == 101) { break; }
+        while (fragmentR == 101) {
+            break;
+        }
 
 
     }
@@ -84,14 +82,16 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                              @Nullable Bundle savedInstanceState) {
         EventBus.getDefault().register(this);
         boolean viewing8 = false;
-             if (viewing8) {}
+        if (viewing8) {
+        }
         tipsPageView = LoDialogBinding.inflate(inflater);
-            HashMap<String,Float> launcher0 = new HashMap<String,Float>();
+        HashMap<String, Float> launcher0 = new HashMap<String, Float>();
         launcher0.put("tones", 845.0f);
         launcher0.put("tread", 103.0f);
         launcher0.put("sadb", 243.0f);
         launcher0.put("mkvmuxer", 193.0f);
-             if (launcher0.size() > 168) {}
+        if (launcher0.size() > 168) {
+        }
         return tipsPageView.getRoot();
     }
 
@@ -99,20 +99,25 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         boolean dayl = false;
-             while (!dayl) { break; }
+        while (!dayl) {
+            break;
+        }
         System.out.println(dayl);
         tipsPageView.avi.smoothToShow();
         long eventO = 9832L;
         seenMarkView.getExploreVideoList(loadZyreotv, 10);
         long drawy = 8042L;
-             if (drawy == 123) {}
+        if (drawy == 123) {
+        }
         tipsPageView.viewPagerExploreEpisode.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
             @SuppressLint("NotifyDataSetChanged")
             @Override
             public void onPageSelected(int position) {
                 super.onPageSelected(position);
                 int titlesK = 2682;
-             while (titlesK == 176) { break; }
+                while (titlesK == 176) {
+                    break;
+                }
                 searchNot_p8 = position;
                 String videoa = "listners";
                 System.out.println(videoa);
@@ -120,7 +125,9 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                 if (num != position) {
                     time_slGradient.getRecyclerView().post(() -> time_slGradient.notifyDataSetChanged());
                     int esultM = 9057;
-             while (esultM > 9) { break; }
+                    while (esultM > 9) {
+                        break;
+                    }
                     System.out.println(esultM);
                 }
                 time_slGradient.setCurrentEpisodePlayingPosition(position);
@@ -134,8 +141,10 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                 insufficients.add(415.0);
                 insufficients.add(616.0);
                 insufficients.add(636.0);
-             while (insufficients.size() > 179) { break; }
+                while (insufficients.size() > 179) {
-                if(tipsPageView.viewPagerExploreEpisode.getAdapter()==null){
+                    break;
+                }
+                if (tipsPageView.viewPagerExploreEpisode.getAdapter() == null) {
                     return;
                 }
                 if (state == ViewPager2.SCROLL_STATE_IDLE) {
@@ -143,27 +152,32 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                         if (!esultLocal_ax) {
                             loadZyreotv++;
                             int myliste = 1236;
-             while (myliste <= 106) { break; }
+                            while (myliste <= 106) {
+                                break;
+                            }
                             seenMarkView.getExploreVideoList(loadZyreotv, 10);
                             float private_iQ = 6157.0f;
-             while (private_iQ > 20) { break; }
+                            while (private_iQ > 20) {
+                                break;
+                            }
                         } else {
                             esultLocal_ax = false;
                             String browsingf = "builder";
-             while (browsingf.length() > 70) { break; }
+                            while (browsingf.length() > 70) {
+                                break;
+                            }
                             System.out.println(browsingf);
                         }
                     }
 
 
-
-
                 }
             }
         });
         logic();
         String splashG = "pagelist";
-             if (splashG.equals("L")) {}
+        if (splashG.equals("L")) {
+        }
         System.out.println(splashG);
     }
 
@@ -175,22 +189,30 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                     if (data.data.getList().isEmpty()) {
                         tipsPageView.layoutEmpty.setVisibility(View.VISIBLE);
                         long extraction1 = 2451L;
-             if (extraction1 < 43) {}
+                        if (extraction1 < 43) {
+                        }
                     } else {
                         time_slGradient = new ICEventDetails();
                         boolean des6 = false;
-             while (des6) { break; }
+                        while (des6) {
+                            break;
+                        }
                         tipsPageView.viewPagerExploreEpisode.setAdapter(time_slGradient);
                         boolean messagek = false;
-             if (!messagek) {}
+                        if (!messagek) {
+                        }
                         System.out.println(messagek);
                         time_slGradient.setPlayerDetailCollection(this::collection);
                         time_slGradient.submitList(data.data.getList());
                         String joinj = "idctxdc";
-             while (joinj.length() > 13) { break; }
+                        while (joinj.length() > 13) {
+                            break;
+                        }
                         tipsPageView.layoutEmpty.setVisibility(View.GONE);
                         long theaterl = 5693L;
-             while (theaterl >= 0) { break; }
+                        while (theaterl >= 0) {
+                            break;
+                        }
                         System.out.println(theaterl);
 
                     }
@@ -198,7 +220,9 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                     if (!data.data.getList().isEmpty()) {
                         time_slGradient.addAll(data.data.getList());
                         long private_uU = 4645L;
-             while (private_uU < 122) { break; }
+                        while (private_uU < 122) {
+                            break;
+                        }
                     } else {
                         PAYLoginHeaddefault.revealToast(XYBGoryShare.translates() != null ? XYBGoryShare.translates().getNo_more_data() : "no more data.", 0);
                     }
@@ -206,12 +230,16 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
             } else {
                 tipsPageView.layoutEmpty.setVisibility(View.VISIBLE);
                 float settingsD = 4846.0f;
-             while (settingsD > 98) { break; }
+                while (settingsD > 98) {
+                    break;
+                }
                 PAYLoginHeaddefault.revealToast(XYBGoryShare.translates() != null ? XYBGoryShare.translates().getNetwork_error() : getString(R.string.beanFollowlist), 0);
             }
             tipsPageView.avi.smoothToHide();
             boolean imgh = true;
-             while (imgh) { break; }
+            while (imgh) {
+                break;
+            }
         });
 
         seenMarkView.getCollectionLiveData().observe(getViewLifecycleOwner(), data -> {
@@ -220,17 +248,23 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                 String rehargey = "ssimv";
                 AppCompatTextView left = layoutSecureLoadBarAllowMinuteView().findViewById(R.id.tv_collection_num_controller);
                 boolean linez = true;
-             while (linez) { break; }
+                while (linez) {
+                    break;
+                }
                 free.setImageResource(R.mipmap.banner_ffffff);
                 long lastc = 8222L;
-             if (lastc <= 72) {}
+                if (lastc <= 72) {
+                }
                 System.out.println(lastc);
                 runnableJoin.setCollect_total(runnableJoin.getCollect_total() + 1);
                 String backgroundj = "tone";
-             if (backgroundj.length() > 55) {}
+                if (backgroundj.length() > 55) {
+                }
                 time_slGradient.getItems().get(searchNot_p8).setCollect_total(runnableJoin.getCollect_total());
                 boolean recommendQ = true;
-             while (recommendQ) { break; }
+                while (recommendQ) {
+                    break;
+                }
                 time_slGradient.getItems().get(searchNot_p8).setIs_collect(true);
                 ArrayList<Long> esultz = new ArrayList<Long>();
                 esultz.add(783L);
@@ -238,10 +272,12 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
                 esultz.add(511L);
                 esultz.add(510L);
                 esultz.add(687L);
-             if (esultz.contains("v")) {}
+                if (esultz.contains("v")) {
+                }
                 left.setText(TimeUtils.formatNumber(runnableJoin.getCollect_total()));
                 float markP = 845.0f;
-             if (markP >= 3) {}
+                if (markP >= 3) {
+                }
                 PAYLoginHeaddefault.revealToast(XYBGoryShare.translates() != null ? XYBGoryShare.translates().getSuccess() : "Success", 0);
             }
         });
@@ -250,25 +286,30 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
             if (data != null && data.isSuccessful()) {
                 AppCompatImageView free = layoutSecureLoadBarAllowMinuteView().findViewById(R.id.iv_collection_controller);
                 float loadingdefaultC = 9068.0f;
-             if (loadingdefaultC > 49) {}
+                if (loadingdefaultC > 49) {
+                }
                 AppCompatTextView left = layoutSecureLoadBarAllowMinuteView().findViewById(R.id.tv_collection_num_controller);
                 ArrayList<Boolean> beanJ = new ArrayList<Boolean>();
                 beanJ.add(false);
                 beanJ.add(false);
                 free.setImageResource(R.mipmap.launcher_preference);
                 int runnablej = 7465;
-             if (runnablej >= 53) {}
+                if (runnablej >= 53) {
+                }
                 runnableJoin.setCollect_total(runnableJoin.getCollect_total() - 1);
                 int squareB = 8697;
                 System.out.println(squareB);
                 time_slGradient.getItems().get(searchNot_p8).setCollect_total(runnableJoin.getCollect_total());
                 boolean tabbar5 = false;
-             while (tabbar5) { break; }
+                while (tabbar5) {
+                    break;
+                }
                 time_slGradient.getItems().get(searchNot_p8).setIs_collect(false);
                 double serviceM = 9993.0;
                 left.setText(TimeUtils.formatNumber(runnableJoin.getCollect_total()));
                 long nameV = 6818L;
-             if (nameV == 12) {}
+                if (nameV == 12) {
+                }
                 PAYLoginHeaddefault.revealToast(XYBGoryShare.translates() != null ? XYBGoryShare.translates().getSuccess() : "Success", 0);
             }
         });
@@ -282,11 +323,13 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
         WCenterVideo.singleClick(() -> {
             runnableJoin = videoExploreBean;
             int beforeV = 6558;
-             if (beforeV == 68) {}
+            if (beforeV == 68) {
+            }
             if (runnableJoin.isIs_collect()) {
                 seenMarkView.cancelcollection(runnableJoin.getVideo_info().getShort_play_id());
                 double category__b = 416.0;
-             if (category__b < 33) {}
+                if (category__b < 33) {
+                }
                 System.out.println(category__b);
             } else {
                 seenMarkView.collection(runnableJoin.getVideo_info().getShort_play_id(), runnableJoin.getVideo_info().getShort_play_video_id());
@@ -295,7 +338,8 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
             }
             EventBus.getDefault().post(ITItem.Constants_Video_Collection);
             long leftH = 2534L;
-             if (leftH >= 45) {}
+            if (leftH >= 45) {
+            }
         });
     }
 
@@ -304,33 +348,32 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
         if (ITItem.Constants_Google_PLAYER_STATUS_FINISH.equals(event)) {
             if (tipsPageView.viewPagerExploreEpisode.getCurrentItem() == tipsPageView.viewPagerExploreEpisode.getAdapter().getItemCount() - 1) {
                 tipsPageView.viewPagerExploreEpisode.setCurrentItem(0);
-            double commomk = 8025.0;
+
-             while (commomk > 17) { break; }
             } else {
-                time_slGradient.setCurrentEpisodePlayingPosition(time_slGradient.getCurrentEpisodePlayingPosition() + 1);
+               //  time_slGradient.setCurrentEpisodePlayingPosition(time_slGradient.getCurrentEpisodePlayingPosition() + 1);
-            float memberT = 4872.0f;
+                tipsPageView.viewPagerExploreEpisode.setCurrentItem(time_slGradient.getCurrentEpisodePlayingPosition()+1);
-             if (memberT > 186) {}
-                tipsPageView.viewPagerExploreEpisode.setCurrentItem(time_slGradient.getCurrentEpisodePlayingPosition());
-            boolean detailst = false;
-             while (detailst) { break; }
-            System.out.println(detailst);
             }
         }
         if (ITItem.Constants_PlayerView_DetialsEvent.equals(event)) {
             int rext = tipsPageView.viewPagerExploreEpisode.getCurrentItem();
-            HashMap<String,Double> limitO = new HashMap<String,Double>();
+            HashMap<String, Double> limitO = new HashMap<String, Double>();
             limitO.put("logistic", 833.0);
             limitO.put("mdec", 82.0);
             limitO.put("backed", 242.0);
-             if (limitO.get("8") != null) {}
+            if (limitO.get("8") != null) {
+            }
             LRewards.startPlayerDetails(getActivity(), time_slGradient.getItem(rext).getShort_play_id(), 0);
             String odyloadd = "ether";
-             while (odyloadd.length() > 59) { break; }
+            while (odyloadd.length() > 59) {
+                break;
+            }
         }
         if (ITItem.Constants_PlayerView_SearchEvent.equals(event)) {
             LRewards.startSearch(getActivity());
             double eaderj = 3473.0;
-             while (eaderj >= 153) { break; }
+            while (eaderj >= 153) {
+                break;
+            }
         }
 
 
@@ -341,46 +384,54 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
         if (ITItem.Constants_Episodes_Series_DataExample.equals(event.getCode())) {
             DBeanUnselectBean out = time_slGradient.getItems().get(searchNot_p8);
             int tip8 = 385;
-             if (tip8 < 157) {}
+            if (tip8 < 157) {
-            if( event.getData().getShort_play_id() == out.getShort_play_id()){
+            }
+            if (event.getData().getShort_play_id() == out.getShort_play_id()) {
                 AppCompatImageView free3 = layoutSecureLoadBarAllowMinuteView().findViewById(R.id.iv_collection_controller);
                 double selectN = 9511.0;
-             while (selectN <= 159) { break; }
+                while (selectN <= 159) {
+                    break;
+                }
                 System.out.println(selectN);
                 AppCompatTextView leftr = layoutSecureLoadBarAllowMinuteView().findViewById(R.id.tv_collection_num_controller);
                 double apple0 = 9578.0;
-             if (apple0 == 82) {}
+                if (apple0 == 82) {
+                }
                 System.out.println(apple0);
                 free3.setImageResource(event.getData().isIs_collect() ? R.mipmap.banner_ffffff : R.mipmap.launcher_preference);
-                if(event.getData().isIs_collect()){
+                if (event.getData().isIs_collect()) {
-                    out.setCollect_total(out.getCollect_total()+1);
+                    out.setCollect_total(out.getCollect_total() + 1);
                     double codeK = 940.0;
-             while (codeK < 87) { break; }
+                    while (codeK < 87) {
-                }else{
+                        break;
-                    out.setCollect_total(out.getCollect_total()-1);
+                    }
-            HashMap<String,Double> toastx = new HashMap<String,Double>();
+                } else {
+                    out.setCollect_total(out.getCollect_total() - 1);
+                    HashMap<String, Double> toastx = new HashMap<String, Double>();
                     toastx.put("visual", 743.0);
                     toastx.put("rtpproto", 599.0);
                     toastx.put("pagehash", 447.0);
                     toastx.put("overload", 782.0);
                     toastx.put("atexit", 989.0);
                     toastx.put("contextprofilelevel", 146.0);
-             if (toastx.get("B") != null) {}
+                    if (toastx.get("B") != null) {
+                    }
                 }
                 time_slGradient.getItems().get(searchNot_p8).setIs_collect(event.getData().isIs_collect());
                 int selectedA = 9376;
-             while (selectedA < 81) { break; }
+                while (selectedA < 81) {
+                    break;
+                }
                 leftr.setText(TimeUtils.formatNumber(out.getCollect_total()));
                 float call_ = 3071.0f;
-             if (call_ == 87) {}
+                if (call_ == 87) {
+                }
                 System.out.println(call_);
             }
         }
     }
 
 
-
-
     private XCcountView layoutSecureLoadBarAllowMinuteView() {
         RecyclerView circle = (RecyclerView) tipsPageView.viewPagerExploreEpisode.getChildAt(0);
         ArrayList<Float> idlet = new ArrayList<Float>();
@@ -400,18 +451,26 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
         tabbar0.add(658L);
         tabbar0.add(465L);
         tabbar0.add(269L);
-             while (tabbar0.size() > 183) { break; }
+        while (tabbar0.size() > 183) {
+            break;
+        }
         System.out.println(tabbar0);
         if (!hidden) {
-            if (layoutSecureLoadBarAllowMinuteView() != null) layoutSecureLoadBarAllowMinuteView().start();
+            if (layoutSecureLoadBarAllowMinuteView() != null)
+                layoutSecureLoadBarAllowMinuteView().start();
             float dimensO = 5736.0f;
-             while (dimensO > 148) { break; }
+            while (dimensO > 148) {
+                break;
+            }
             GPplicationLoadingdefault.isCurrentPage = true;
         } else {
             GPplicationLoadingdefault.isCurrentPage = false;
-            if (layoutSecureLoadBarAllowMinuteView() != null) layoutSecureLoadBarAllowMinuteView().suspend();
+            if (layoutSecureLoadBarAllowMinuteView() != null)
+                layoutSecureLoadBarAllowMinuteView().suspend();
             double pleasee = 7751.0;
-             while (pleasee == 70) { break; }
+            while (pleasee == 70) {
+                break;
+            }
         }
 
     }
@@ -421,11 +480,14 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
     public void onResume() {
         super.onResume();
         float registeredU = 7933.0f;
-             if (registeredU >= 84) {}
+        if (registeredU >= 84) {
+        }
         GPplicationLoadingdefault.isCurrentPage = true;
-        if (layoutSecureLoadBarAllowMinuteView() != null) layoutSecureLoadBarAllowMinuteView().start();
+        if (layoutSecureLoadBarAllowMinuteView() != null)
+            layoutSecureLoadBarAllowMinuteView().start();
         int istoryg = 409;
-             if (istoryg > 121) {}
+        if (istoryg > 121) {
+        }
         System.out.println(istoryg);
     }
 
@@ -434,30 +496,39 @@ public class FLSFragmentOogleFragment extends Fragment implements ICEventDetails
         super.onPause();
         long yesP = 3934L;
         GPplicationLoadingdefault.isCurrentPage = false;
-        if (layoutSecureLoadBarAllowMinuteView() != null) layoutSecureLoadBarAllowMinuteView().suspend();
+        if (layoutSecureLoadBarAllowMinuteView() != null)
+            layoutSecureLoadBarAllowMinuteView().suspend();
         float watchu = 8360.0f;
-             if (watchu >= 133) {}
+        if (watchu >= 133) {
+        }
         System.out.println(watchu);
 
     }
 
     @Override
     public void onDestroy() {
-        if (layoutSecureLoadBarAllowMinuteView() != null) layoutSecureLoadBarAllowMinuteView().stop();
+        if (layoutSecureLoadBarAllowMinuteView() != null)
-            HashMap<String,Boolean> fromF = new HashMap<String,Boolean>();
+            layoutSecureLoadBarAllowMinuteView().stop();
+        HashMap<String, Boolean> fromF = new HashMap<String, Boolean>();
         fromF.put("bstract", true);
         fromF.put("histories", false);
         fromF.put("association", false);
-             if (fromF.get("d") != null) {}
+        if (fromF.get("d") != null) {
-        if (layoutSecureLoadBarAllowMinuteView() != null) layoutSecureLoadBarAllowMinuteView().release();
+        }
+        if (layoutSecureLoadBarAllowMinuteView() != null)
+            layoutSecureLoadBarAllowMinuteView().release();
         boolean earchp = false;
-             if (!earchp) {}
+        if (!earchp) {
+        }
         super.onDestroy();
         float uniqueL = 4258.0f;
-             while (uniqueL >= 162) { break; }
+        while (uniqueL >= 162) {
+            break;
+        }
         EventBus.getDefault().unregister(this);
         String ffffffC = "branch";
-             if (ffffffC.equals("1")) {}
+        if (ffffffC.equals("1")) {
+        }
     }
 
 }

app/src/main/res/layout/activity_store.xml

@@ -23,6 +23,7 @@
             android:id="@+id/layout_store_root"
             layout="@layout/layout_store"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/clickOdyload"/>
     </androidx.core.widget.NestedScrollView>
 </RelativeLayout>

app/src/main/res/layout/activity_vip_zyt.xml

@@ -17,11 +17,14 @@
         android:id="@+id/layout_vip_actionbar"
         layout="@layout/layout_toptitle_back_zyt"
         android:layout_width="match_parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:layout_marginTop="@dimen/margintoptitle"
         android:layout_height="?actionBarSize" />
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/layout_vip_actionbar">
 
         <androidx.constraintlayout.widget.ConstraintLayout
@@ -244,9 +247,11 @@
                 android:layout_marginStart="@dimen/followHistoryOllow"
                 android:layout_marginTop="@dimen/clickOdyload"
                 android:layout_marginEnd="@dimen/followHistoryOllow"
+                app:layout_constraintBottom_toBottomOf="parent"
+                android:layout_marginBottom="@dimen/clickOdyload"
                 app:layout_constraintTop_toBottomOf="@+id/recyclerview_my_vip" />
 
 
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/kbv_follow_unit.xml

@@ -10,9 +10,10 @@
         android:layout_height="match_parent"
         app:controller_layout_id="@layout/rkh_default"
         app:resize_mode="zoom" />
-<ImageView
+
-android:visibility="visible"
+    <ImageView
-android:layout_height="0dp"
+        android:layout_width="0dp"
-android:background="#726139"
+        android:layout_height="0dp"
-android:layout_width="0dp"/>
+        android:background="#726139"
+        android:visibility="visible" />
 </FrameLayout>

app/src/main/res/layout/mch_dimens_header.xml

@@ -28,22 +28,12 @@
     </LinearLayout>
 
 
-    <com.wang.avi.AVLoadingIndicatorView
-        android:id="@+id/avi"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:indicatorName="BallSpinFadeLoaderIndicator"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/cover"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:visibility="invisible" />
+        android:visibility="visible" />
 
     <include
         android:id="@+id/view_lock"
@@ -55,4 +45,14 @@
         android:id="@+id/view_video_recommend"
         layout="@layout/layout_close_videodetails_recommend"
         android:visibility="invisible" />
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/avi"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:indicatorName="BallSpinFadeLoaderIndicator"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/vez_login_plash.xml

@@ -7,7 +7,7 @@
     android:background="@mipmap/registered_tatus"
     tools:context=".topics.abslRwgt.movepage.VItemGradlewFragment">
 
-    <ScrollView
+    <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scrollbars="none">
@@ -481,9 +481,9 @@
                         android:id="@+id/tv_me_recharge_vip_exp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="@dimen/agreementLock"
                         android:layout_below="@+id/tv_me_recharge_vip"
                         android:layout_alignParentStart="true"
+                        android:layout_marginStart="@dimen/agreementLock"
                         android:layout_marginTop="@dimen/clickOdyload"
                         android:layout_marginEnd="@dimen/agreementLock"
                         android:textColor="#e6ffffff"
@@ -565,6 +565,7 @@
                 android:layout_marginEnd="@dimen/followHistoryOllow"
                 android:background="@drawable/suv_left"
                 android:orientation="vertical"
+                android:layout_marginBottom="@dimen/clickOdyload"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/layout_playlist">
 
@@ -662,6 +663,6 @@
 
             </androidx.appcompat.widget.LinearLayoutCompat>
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>