small tune up

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

@@ -29,7 +29,8 @@ public enum EventTypes {
     REFRESH_DATA_SIGN,//签到对话框
 
     GUIDE_NEXT,//引导页面下一步操作
-    GUIDE_NEXT_NEXT,//引导页面下一步操作
+    GUIDE_NEXT_GAME,//引导页面下一步操作
+    GUIDE_NEXT_MALL,//引导页面下一步操作
     DELETE_GAME_ACCOUNT_REFRESH,//游戏删除账号，刷新界面
     GENERATION_ACCOUNT_REFRESH,//游戏代充，刷新界面
     DOWNLOAD_START,//下载开始

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -1921,7 +1921,7 @@ public interface ApiService {
     Observable<BaseMessage> checkAuth(@Query("Authorization") String token);
 
     @GET("app/user/check_authorization")
-    Observable<BaseMessage> checkAuth(@Query("Authorization") String token, @Query("auto_login") int autoLogin, @Query("face_url") String face_url);
+    Observable<BaseMessage> checkAuth(@Query("Authorization") String token, @Query("game_id") String game_id, @Query("auto_login") int autoLogin, @Query("face_url") String face_url);
 
     @GET("app/search")
     Observable<BaseMessage> search(@Query("keyword") String keyword, @Query("game_count") int gameCount, @Query("task_count") int taskCount, @Query("gift_count") int giftCount, @Query("article_count") int articleCount);

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

@@ -6,10 +6,7 @@ import android.os.Message;
 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;
 import android.widget.ImageView;
 
 import com.sheep.gamegroup.event.BigEvent;
@@ -21,7 +18,6 @@ import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
 import com.sheep.gamegroup.module.webview.fragment.FgtWebX5;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.KeyEventUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
@@ -170,7 +166,7 @@ public class FgtGameCenter extends BaseFragment {
     @Subscribe
     public void onEventMainThread(BigEvent event) {
         switch (event.getEventTypes()) {
-            case GUIDE_NEXT_NEXT:
+            case GUIDE_NEXT_GAME:
                 mHandler.sendEmptyMessage(WHAT_TRY_SWITCH_MAIN_TAB);
                 mHandler.sendEmptyMessageDelayed(WHAT_TRY_SHOW_NEWBIE_GUIDE, 300);
                 break;

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

@@ -3,27 +3,17 @@ package com.sheep.gamegroup.module.guide;
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.DashPathEffect;
-import android.graphics.Paint;
-import android.graphics.RectF;
-import android.support.constraint.solver.widgets.Rectangle;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import com.app.hubert.guide.NewbieGuide;
 import com.app.hubert.guide.core.Builder;
 import com.app.hubert.guide.core.Controller;
 import com.app.hubert.guide.listener.OnGuideChangedListener;
-import com.app.hubert.guide.listener.OnHighlightDrewListener;
-import com.app.hubert.guide.listener.OnLayoutInflatedListener;
 import com.app.hubert.guide.listener.OnPageChangedListener;
 import com.app.hubert.guide.model.GuidePage;
 import com.app.hubert.guide.model.HighLight;
@@ -31,7 +21,6 @@ import com.app.hubert.guide.model.HighlightOptions;
 import com.app.hubert.guide.model.RelativeGuide;
 import com.kfzs.duanduan.cardview.ScreenUtil;
 import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.greendao.DDProviderHelper;
 import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
 import com.sheep.gamegroup.module.home.fragment.FgtHome;
 import com.sheep.gamegroup.module.home.fragment.FgtMainHeader;
@@ -48,7 +37,8 @@ import org.xutils.common.util.LogUtil;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.sheep.gamegroup.event.EventTypes.GUIDE_NEXT_NEXT;
+import static com.sheep.gamegroup.event.EventTypes.GUIDE_NEXT_GAME;
+import static com.sheep.gamegroup.event.EventTypes.GUIDE_NEXT_MALL;
 
 public class NewbieGuideHelper {
 
@@ -58,6 +48,8 @@ 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;
 
     private Activity mActivity;
     private Animation enterAnimation;
@@ -83,11 +75,15 @@ public class NewbieGuideHelper {
         showed(getLabelPrex(type));
         List<GuidePage> pages = null;
         if (type == GUIDE_HOME) {
-            pages = Arrays.asList(getPage1(), getPage2(), getPage3(), getPage4());
+            pages = Arrays.asList(getPage1(), getPage2(), getPage3());
         } else if (type == GUIDE_USER) {
-            pages = Arrays.asList(getPage5(), getPage6());
+            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 {
@@ -110,8 +106,12 @@ public class NewbieGuideHelper {
                         } else if (type == GUIDE_USER) {
                             FgtPersonalCenter.scrollToBottom(mActivity);
                         } else if (type == GUIDE_FAQ) {
-                            EventBus.getDefault().post(new BigEvent(GUIDE_NEXT_NEXT));
+                            FgtPersonalCenter.scrollToTop(mActivity);
+                        } else if (type == GUIDE_MONEY) {
+                            EventBus.getDefault().post(new BigEvent(GUIDE_NEXT_MALL));
                             mActivity.finish();
+                        } else if (type == GUIDE_MALL) {
+                            EventBus.getDefault().post(new BigEvent(GUIDE_NEXT_GAME));
                         } else if (type == GUIDE_GAME) {
 
                         }

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

@@ -1433,7 +1433,7 @@ public class CommonUtil {
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()
-                .checkAuth(token, 1, face)
+                .checkAuth(SheepApp.getInstance().getGameId(), token, 1, face)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {

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

@@ -178,6 +178,15 @@ public class FgtPersonalCenter extends BaseFragment {
         }.sendEmptyMessageDelayed(0, 300);
     }
 
+    public static void scrollToTop(Activity activity){
+        scrollRef.get().fullScroll(View.FOCUS_UP);
+        new Handler(){
+            public void handleMessage(Message msg){
+                new NewbieGuideHelper(activity).show(NewbieGuideHelper.GUIDE_MONEY);
+            }
+        }.sendEmptyMessageDelayed(0, 300);
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.fgt_personalcenter_layout;

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

@@ -217,6 +217,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
     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;
@@ -248,6 +249,10 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                 case WHAT_TRY_SHOW_NEWBIE_GUIDE:
                     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;
             }
 
         }
@@ -1283,6 +1288,9 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             case GUIDE_NEXT:
                 mHandler.sendEmptyMessage(WHAT_TRY_SHOW_NEWBIE_GUIDE);
                 break;
+            case GUIDE_NEXT_MALL:
+                mHandler.sendEmptyMessage(WHAT_TRY_SHOW_NEWBIE_GUIDE_MALL);
+                break;
         }
     }
 

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

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
     <ImageView
-        android:src="@mipmap/guide_5_2"
+        android:src="@mipmap/guide_6_2"
         android:adjustViewBounds="true"
         android:layout_below="@+id/i1"
         android:layout_marginTop="80dp"