Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java

@@ -189,5 +189,13 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
     }
 
-
+    @Override
+    public void onResume() {
+        super.onResume();
+        try{
+            initData();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -11,6 +11,7 @@ import com.kf.utils.ToastBuilder;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.adp.ViewPagerFragmentAdapter;
+import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.kfzs.libs.utils.DrawablesHelper;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -104,12 +105,17 @@ public class TabsHelper {
                         checkViewState(position);
                         view_pager_container.setCurrentItem(position, false);
                         int sheepPosition = MainTab.FgtSmallSheep.ordinal();
+                        int personnalPosition = MainTab.FgtPersonnalCenter.ordinal();
                         FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
+                        FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
                         if(position == sheepPosition){
                             fgtSmallSheep.onResume();
                         } else {
                             fgtSmallSheep.onPause();
                         }
+                        if(position == personnalPosition){
+                            personnalCenter.onResume();
+                        }
                         checkWhichPage(position);
                     }
 

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

@@ -15,6 +15,7 @@
         android:layout_weight="1"
         android:layout_margin="@dimen/content_padding_10"
         android:padding="@dimen/content_padding_10"
+        android:scrollbars="none"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white"/>
     <TextView