newbie guide update

app/src/main/java/com/sheep/gamegroup/event/EventTypes.java

@@ -30,9 +30,11 @@ public enum EventTypes {
     TASK_AGAIN_UPLOAD_FILE_DATA,//任务审核上传图片 通知
     REFRESH_DATA_SIGN,//签到对话框
 
-    GUIDE_NEXT,//引导页面下一步操作
-    GUIDE_NEXT_GAME,//引导页面下一步操作
-    GUIDE_NEXT_MALL,//引导页面下一步操作
+    GUIDE_NEXT,
+    GUIDE_SWITCH_HOME,//引导页面下一步操作
+    GUIDE_SHOW_HOME,//引导页面下一步操作
+    GUIDE_SWITCH_GAME,//引导页面下一步操作
+    GUIDE_SHOW_GAME,//引导页面下一步操作
     DELETE_GAME_ACCOUNT_REFRESH,//游戏删除账号，刷新界面
     GENERATION_ACCOUNT_REFRESH,//游戏代充，刷新界面
     DOWNLOAD_START,//下载开始

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

@@ -9,6 +9,7 @@ import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.ImageView;
 
+import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.event.WebViewEvent;
@@ -182,22 +183,12 @@ public class FgtGameCenter extends BaseFragment {
 
     @Subscribe
     public void onEventMainThread(BigEvent event) {
+        LogUtil.logI("BigEvent:" + JSONObject.toJSONString(event));
         switch (event.getEventTypes()) {
-            case GUIDE_NEXT_GAME:
-                mHandler.sendEmptyMessage(WHAT_TRY_SWITCH_MAIN_TAB);
-                mHandler.sendEmptyMessageDelayed(WHAT_TRY_SHOW_NEWBIE_GUIDE, 300);
+            case GUIDE_SHOW_GAME:
+                new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_GAME);
                 break;
         }
     }
 
-    private Handler mHandler = new Handler() {
-        public void handleMessage(Message msg) {
-            if (msg.what == WHAT_TRY_SWITCH_MAIN_TAB) {
-                ((ActMain) getActivity()).switchFragment(2);
-            } else if (msg.what == WHAT_TRY_SHOW_NEWBIE_GUIDE) {
-                new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_GAME);
-            }
-        }
-    };
-
 }

app/src/main/java/com/sheep/gamegroup/module/guide/NewbieGuideHelper.java

@@ -40,8 +40,7 @@ import org.xutils.common.util.LogUtil;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.sheep.gamegroup.event.EventTypes.GUIDE_NEXT_GAME;
-import static com.sheep.gamegroup.event.EventTypes.GUIDE_NEXT_MALL;
+import static com.sheep.gamegroup.event.EventTypes.GUIDE_SWITCH_GAME;
 
 public class NewbieGuideHelper {
 
@@ -51,8 +50,7 @@ public class NewbieGuideHelper {
     public final static int GUIDE_GAME = 1;
     public final static int GUIDE_USER = 2;
     public final static int GUIDE_FAQ = 3;
-    public final static int GUIDE_MALL = 4;
-    public final static int GUIDE_MONEY = 5;
+    public final static int GUIDE_MONEY = 4;
 
     private Activity mActivity;
     private Animation enterAnimation;
@@ -74,15 +72,13 @@ public class NewbieGuideHelper {
     public void show(int type) {
         List<GuidePage> pages = null;
         if (type == GUIDE_HOME) {
-            pages = Arrays.asList(getPage1(), getPage2(), getPage3());
+            pages = Arrays.asList(getPage2(), getPage3());
         } else if (type == GUIDE_USER) {
             pages = Arrays.asList(getPage6());
         } else if (type == GUIDE_MONEY) {
             pages = Arrays.asList(getPage5());
         } else if (type == GUIDE_FAQ) {
             pages = Arrays.asList(getPage7());
-        } else if (type == GUIDE_MALL) {
-            pages = Arrays.asList(getPage4());
         } else if (type == GUIDE_GAME) {
             pages = Arrays.asList(getPage8(), getPage9(), getPage10());
         } else {
@@ -108,10 +104,8 @@ public class NewbieGuideHelper {
                         } else if (type == GUIDE_FAQ) {
                             FgtPersonalCenter.scrollToTop(mActivity);
                         } else if (type == GUIDE_MONEY) {
-                            EventBus.getDefault().post(new BigEvent(GUIDE_NEXT_MALL));
+                            EventBus.getDefault().post(new BigEvent(GUIDE_SWITCH_GAME));
                             mActivity.finish();
-                        } else if (type == GUIDE_MALL) {
-                            EventBus.getDefault().post(new BigEvent(GUIDE_NEXT_GAME));
                         } else if (type == GUIDE_GAME) {
                             EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SHOW_NEW_USER_HONG_BAO));
                         }
@@ -170,7 +164,7 @@ public class NewbieGuideHelper {
         return GuidePage.newInstance()//创建一个实例
                 .addHighLightWithOptions(ActMain.tabBtn1.get(), HighLight.Shape.CIRCLE, new HighlightOptions.Builder().setRelativeGuide(relativeGuide3).useMaxSize(false).build())
                 .addHighLightWithOptions(FgtMainHeader.msgRef.get(), HighLight.Shape.CIRCLE, new HighlightOptions.Builder().setRelativeGuide(relativeGuide2).useMaxSize(true).build())
-                .addHighLightWithOptions(FgtHome.newsRef.get(), HighLight.Shape.OVAL, new HighlightOptions.Builder().setRelativeGuide(relativeGuide1).useMaxSize(false).setOffsetLeft(0.2f).setOffsetWidth(0.6f).build())
+//                .addHighLightWithOptions(FgtHome.newsRef.get(), HighLight.Shape.OVAL, new HighlightOptions.Builder().setRelativeGuide(relativeGuide1).useMaxSize(false).setOffsetLeft(0.2f).setOffsetWidth(0.6f).build())
                 .setEnterAnimation(enterAnimation)//进入动画
                 .setExitAnimation(exitAnimation);//退出动画;
     }

app/src/main/java/com/sheep/gamegroup/module/home/fragment/HomeWrapperFragment.java

@@ -6,8 +6,12 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
 
+import com.alibaba.fastjson.JSONObject;
 import com.kfzs.duanduan.cardview.ScreenUtil;
+import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.WebParams;
+import com.sheep.gamegroup.module.guide.NewbieGuideHelper;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.FgtFind;
@@ -16,6 +20,9 @@ import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
 public class HomeWrapperFragment extends BaseFragment {
 
     private View frame_container;
@@ -29,6 +36,7 @@ public class HomeWrapperFragment extends BaseFragment {
 
     @Override
     public void onViewCreated() {
+        EventBus.getDefault().register(this);
         frame_container = getView().findViewById(R.id.frame_container);
         frame_container.setPadding(0, ScreenUtil.dip2px(getContext(), 8), 0, 0);
         contentFragment = (BaseFragment) getChildFragmentManager().findFragmentByTag("fragment_content");
@@ -46,4 +54,25 @@ public class HomeWrapperFragment extends BaseFragment {
     public void initDataOnVisibleToUser() {
         if (contentFragment != null) contentFragment.initDataOnVisibleToUser();
     }
+
+    @Override
+    public void onDestroy() {
+        EventBus.getDefault().unregister(this);
+        super.onDestroy();
+    }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case GUIDE_SHOW_HOME:
+                getActivity().runOnUiThread(() -> {
+                    CommonUtil.getInstance().checkNewbieGuideViewed(i -> {
+                        if (i == 0) {
+                            new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_HOME);
+                        }
+                    });
+                });
+                break;
+        }
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -3133,6 +3133,8 @@ public class CommonUtil {
                             .setBtnLeftText("确定").setBtnLeftOnClickListener(view -> Jump2View.getInstance().goWeb(SheepApp.getInstance().getCurrentActivity(), url, SheepApp.getInstance().getString(R.string.app_name)))
                             .setBtnRightText("取消").setBtnRightOnClickListener(view -> closeListener.onClick(view));
                     ViewUtil.showMsgDialog(SheepApp.getInstance().getCurrentActivity(), dialogConfig);
+                } else if (StringUtils.isHttpUrl(url)) {
+                    showGoWebDialog(dialogConfig, closeListener, textString, url);
                 } else if (TestUtil.isTest()) {//下面的功能暂不提供给用户
                     dialogConfig.setMsg("已经复制如下内容：\n" + textString + "\n，是否尝试跳转？")
                             .setBtnLeftText("确定").setBtnLeftOnClickListener(view -> Jump2View.getInstance().tryGotoDeepLink(textString))
@@ -3141,8 +3143,6 @@ public class CommonUtil {
                         Jump2View.getInstance().tryGotoDeepLink(textString);
                     });
                     ViewUtil.showMsgDialog(SheepApp.getInstance().getCurrentActivity(), dialogConfig);
-                } else if (StringUtils.isHttpUrl(url)) {
-                    showGoWebDialog(dialogConfig, closeListener, textString, url);
                 }
             } else if (TestUtil.isDev()) {
                 TestUtil.testFunction(SheepApp.getInstance().getCurrentActivity(), textString);

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1783,7 +1783,7 @@ public class Jump2View {
                                 if (ad != null) {
                                     ViewUtil.showHalfScreenAd(activity, ad, container);
                                 } else {
-                                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_NEXT));
+                                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_SWITCH_HOME));
                                     tryShowYfShopAskDialog(activity);
                                 }
                             }

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -1874,7 +1874,7 @@ public class ViewUtil {
                     ACache aCache = ACache.get(SheepApp.getInstance());
                     aCache.put(advertising.getAd_img(), String.format(Locale.CHINA, "%d;%d", dialog_center_ll.getWidth(), dialog_center_ll.getHeight()));
                     Jump2View.getInstance().tryShowYfShopAskDialog(activity);
-                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_NEXT));
+                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_SWITCH_HOME));
                     EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.CHECK_VIP));
                 }
             });

app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -27,6 +27,7 @@ import com.kfzs.duanduan.utils.StatusBarUtils;
 import com.kfzs.duanduan.view.DialogStorageLow;
 import com.sheep.gamegroup.absBase.AbsObserver;
 import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.greendao.download.DownLoadInfo;
 import com.sheep.gamegroup.helper.DownloadHelper;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -490,6 +491,14 @@ public class ActMain extends BaseActYmPermissionCheck {
                 intent.putExtra("INTENT_ACTION", "EXIT");
                 startActivity(intent);
                 return;
+            case GUIDE_SWITCH_HOME:
+                switchFragment(0);
+                frame_container.postDelayed(() -> EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_SHOW_HOME)), 300);
+                break;
+            case GUIDE_SWITCH_GAME:
+                switchFragment(2);
+                frame_container.postDelayed(() -> EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_SHOW_GAME)), 300);
+                break;
         }
         if (progressView != null && event.getData() instanceof DownLoadInfo) {
             DownLoadInfo task = (DownLoadInfo) event.getData();

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

@@ -213,9 +213,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
     public static final int WHAT_LOAD_RUN_TASK = 1;//加载正在进行的任务列表
     public static final int WHAT_TRY_SHOW_HB = 7;//尝试显示红包
-    public static final int WHAT_TRY_SHOW_NEWBIE_GUIDE = 8;//尝试显示新手引导
-    public static final int WHAT_TRY_SHOW_NEWBIE_GUIDE_MALL = 9;//尝试显示新手引导
-
 
     public boolean needRefreshMsgCount = false;
 
@@ -244,17 +241,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                     ((ActMain) getActivity()).switchFragment(0);
                     showRedPackage(activity);
                     break;
-                case WHAT_TRY_SHOW_NEWBIE_GUIDE:
-                    CommonUtil.getInstance().checkNewbieGuideViewed(i -> {
-                        if (i == 0) {
-                            new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_HOME);
-                        }
-                    });
-                    break;
-                case WHAT_TRY_SHOW_NEWBIE_GUIDE_MALL:
-                    ((ActMain) getActivity()).switchFragment(0);
-                    new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_MALL);
-                    break;
             }
 
         }
@@ -1217,12 +1203,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             case FGT_SHEEP_SHOW_NEW_USER_HONG_BAO:
                 mHandler.sendEmptyMessage(WHAT_TRY_SHOW_HB);
                 break;
-            case GUIDE_NEXT:
-                mHandler.sendEmptyMessage(WHAT_TRY_SHOW_NEWBIE_GUIDE);
-                break;
-            case GUIDE_NEXT_MALL:
-                mHandler.sendEmptyMessage(WHAT_TRY_SHOW_NEWBIE_GUIDE_MALL);
-                break;
         }
     }