3.6.2

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -4,6 +4,7 @@ import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.Button;
@@ -119,31 +120,6 @@ public class FgtGameCenter extends BaseFragment {
 
             }
         });
-//        if(ViewUtil.isVisible(fgt_gc_hb_500_yuan_drl)) {
-//            ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
-//            CommonUtil.getInstance().callActionWithUserInfo(userEntity -> {
-//                String code = userEntity.getParent_code();
-//                if (TextUtils.isEmpty(code)) {
-//                    code = userEntity.getInvitation_code();
-//                }
-//                SheepApp.getInstance().getNetComponent().getApiService().getUserIsShouYou(code)
-//                        .subscribeOn(Schedulers.io())
-//                        .observeOn(AndroidSchedulers.mainThread())
-//                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-//                            @Override
-//                            public void onNext(BaseMessage baseMessage) {
-//                                boolean result = baseMessage.getData(Boolean.class);
-//                                ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, !result);//不是会长或不是会长邀请的用户，才显示赏金任务入口
-//                            }
-//
-//                            @Override
-//                            public void onError(BaseMessage baseMessage) {
-//                                ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
-//                            }
-//                        });
-//            });
-//        }
-
     }
 
     private void initData() {
@@ -151,7 +127,9 @@ public class FgtGameCenter extends BaseFragment {
 
     @Override
     public void initDataOnVisibleToUser() {
-
+        if (gameMallFgt != null && pager.getCurrentItem() == 3) {
+            ((BaseFragment) gameMallFgt).initDataOnVisibleToUser();
+        }
     }
 
     @Override
@@ -177,10 +155,10 @@ public class FgtGameCenter extends BaseFragment {
     @Subscribe
     public void WhenWebViewEventComing(WebViewEvent ev) {
         if (gameMallFgt != null && ev.action == WebViewEvent.ACTION_REFRESH_GAME_MALL) {
-            if(gameMallFgt instanceof FgtWeb) {
-                ((FgtWeb)gameMallFgt).callTransparent(ev.callback, ev.data);
-            }else{
-                ((FgtWebX5)gameMallFgt).callTransparent(ev.callback, ev.data);
+            if (gameMallFgt instanceof FgtWeb) {
+                ((FgtWeb) gameMallFgt).callTransparent(ev.callback, ev.data);
+            } else {
+                ((FgtWebX5) gameMallFgt).callTransparent(ev.callback, ev.data);
             }
         }
     }

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -628,4 +628,11 @@ public class FgtWebX5 extends BaseFgtWebX5 {
         CookieSyncManager.createInstance(getContext()).sync();
     }
 
+    public void initDataOnVisibleToUser() {
+        if (onResumeCount > 0 && mWebView != null && webParams != null && webParams.isRefreshClick()) {
+            loadJs("refreshClick()");
+        }
+        onResumeCount++;
+    }
+
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoney.java

@@ -143,7 +143,7 @@ public class FgtAskGetMoney extends BaseFragment {
     }
 
     @Override
-    protected void initViewOnVisibleToUser() {
+    public void initViewOnVisibleToUser() {
         if(!isFirstFgt) {
             showViewPager();
         }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyNewYear.java

@@ -135,7 +135,7 @@ public class FgtAskGetMoneyNewYear extends BaseFragment {
     }
 
     @Override
-    protected void initViewOnVisibleToUser() {
+    public void initViewOnVisibleToUser() {
         if(!isFirstFgt) {
             showViewPager();
         }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java

@@ -91,7 +91,7 @@ public class FgtAudit extends BaseFragment {
     }
 
     @Override
-    protected void initDataOnVisibleToUser() {
+    public void initDataOnVisibleToUser() {
         if(!firstPage && firstVisibleToUser)
             refreshData();
     }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -152,7 +152,7 @@ public class FgtPersonalCenter extends BaseFragment {
     }
 
     @Override
-    protected void initViewOnVisibleToUser() {
+    public void initViewOnVisibleToUser() {
         ibtn_baseactivity_right.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtWelfareCenter.java

@@ -143,7 +143,7 @@ public class FgtWelfareCenter extends BaseFragment{
     }
 
     @Override
-    protected void initDataOnVisibleToUser() {
+    public void initDataOnVisibleToUser() {
         if(activity == null){
             onViewCreated();
         }

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseFragment.java

@@ -135,11 +135,11 @@ public abstract class BaseFragment extends RxFragment {
         }
     }
 
-    protected void initViewOnVisibleToUser() {
+    public void initViewOnVisibleToUser() {
 
     }
 
-    protected void initDataOnVisibleToUser() {
+    public void initDataOnVisibleToUser() {
 
     }
 

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

@@ -16,7 +16,7 @@
         android:id="@+id/splash_image_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="fitXY"
+        android:scaleType="centerCrop"
         android:src="@drawable/kaipin" />
     <TextView
         android:id="@+id/splash_skip"

gradle.properties

@@ -17,8 +17,8 @@
 # org.gradle.parallel=true
 #android.injected.build.model.only.versioned = 3
 
-VERSION_NAME=3.6.1
-VERSION_CODE=3006001
+VERSION_NAME=3.6.2
+VERSION_CODE=3006002
 ANDROID_COMPILE_SDK_VERSION=28
 ANDROID_MIN_SDK_VERSION=17
 ANDORID_TARGET_SDK_VERSION=28