small bug tune up

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

@@ -1962,4 +1962,7 @@ public interface ApiService {
     @PUT("app/sdk/qr_code")
     Observable<BaseMessage> submitQRCodeResult(@Header("Authorization") String token, @Body JSONObject json);
 
+    @GET("app/user/novice_guide")
+    Observable<BaseMessage> checkNewbieGuideViewed();
+
 }

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

@@ -66,13 +66,7 @@ public class NewbieGuideHelper {
         exitAnimation.setFillAfter(true);
     }
 
-    private String getLabelPrex(int type){
-        return DataUtil.getInstance().getUserId()+ "_page_" + type;
-    }
-
     public void show(int type) {
-        if (isShowed(getLabelPrex(type))) return;
-        showed(getLabelPrex(type));
         List<GuidePage> pages = null;
         if (type == GUIDE_HOME) {
             pages = Arrays.asList(getPage1(), getPage2(), getPage3());
@@ -90,7 +84,7 @@ public class NewbieGuideHelper {
             return;
         }
         Builder builder = NewbieGuide.with(mActivity)
-                .setLabel(getLabelPrex(type))//设置引导层标示区分不同引导层，必传！否则报错
+                .setLabel("page_"+type)//设置引导层标示区分不同引导层，必传！否则报错
                 .setOnGuideChangedListener(new OnGuideChangedListener() {
                     @Override
                     public void onShowed(Controller controller) {
@@ -102,7 +96,7 @@ public class NewbieGuideHelper {
                     public void onRemoved(Controller controller) {
                         Log.e(TAG, "NewbieGuide  onRemoved: ");
                         if (type == GUIDE_HOME) {
-                            Jump2View.getInstance().goPersonnalCenterView(mActivity, null);
+                            Jump2View.getInstance().goPersonnalCenterView(mActivity, "newbie");
                         } else if (type == GUIDE_USER) {
                             FgtPersonalCenter.scrollToBottom(mActivity);
                         } else if (type == GUIDE_FAQ) {
@@ -293,23 +287,4 @@ public class NewbieGuideHelper {
                 .setExitAnimation(exitAnimation);//退出动画
     }
 
-    private boolean isShowed(String page) {
-        SharedPreferences sp = mActivity.getSharedPreferences("newbie_guide", Context.MODE_PRIVATE);
-        return sp.getBoolean(page, false);
-    }
-
-    private void showed(String page) {
-        SharedPreferences sp = mActivity.getSharedPreferences("newbie_guide", Context.MODE_PRIVATE);
-        SharedPreferences.Editor editor = sp.edit();
-        editor.putBoolean(page, true);
-        editor.commit();
-    }
-
-    public void disableAll(){
-        showed(getLabelPrex(0));
-        showed(getLabelPrex(1));
-        showed(getLabelPrex(2));
-        showed(getLabelPrex(3));
-    }
-
 }

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

@@ -1429,6 +1429,28 @@ public class CommonUtil {
                 });
     }
 
+    public void checkNewbieGuideViewed(final Action1<Integer> action1) {
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .checkNewbieGuideViewed()
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        if (action1 != null)
+                            action1.call(1);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        if (action1 != null)
+                            action1.call(baseMessage.getData(Integer.class));
+                    }
+                });
+    }
+
     public void checkAuth(Activity activity, String token, String face, final Action1<Boolean> action1) {
         SheepApp.getInstance()
                 .getNetComponent()
@@ -1443,9 +1465,9 @@ public class CommonUtil {
                             Jump2View.getInstance().goFaceWithQR(activity, Constant.INTENT_DETECT_LIVENESS, token, "check");
                         } else if (baseMessage.getCode() == 404000023) {
                             Jump2View.getInstance().goFaceWithQR(activity, Constant.INTENT_DETECT_FACE, token, "check");
-                        } else if(baseMessage.getCode() == 404000024){
+                        } else if (baseMessage.getCode() == 404000024) {
                             G.showToast("提示：请在小绵羊APP内完成当前账号绑定手机号");
-                        } else if(baseMessage.getCode() == 404000025){
+                        } else if (baseMessage.getCode() == 404000025) {
                             G.showToast("提示：请在小绵羊APP内完成当前账号实名认证");
                         }
                         if (action1 != null)

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

@@ -460,6 +460,9 @@ public class Jump2View {
      */
     public void goPersonnalCenterView(Context context, Object o) {
         Intent intent = new Intent(context, PersonalCenterAct.class);
+        if (o != null) {
+            intent.putExtra("extra", o.toString());
+        }
         context.startActivity(intent);
     }
 
@@ -1676,8 +1679,6 @@ public class Jump2View {
         CommonUtil.getInstance().callActionWithUserInfo(userEntity ->
                 Observable.create((ObservableOnSubscribe<Object>) emitter -> {
                     if (userEntity.alreadyFinishAllNewTask()) {//已经完成所有新手任务
-                        //关闭新手引导
-                        new NewbieGuideHelper(activity).disableAll();
                         //没有兑换过优惠券时，显示商城优惠券
                         SheepApp.getInstance().getNetComponent().getApiService().getYfShopReceiveCouponsCheck(ReceiveCouponsResp.TYPE_NEW_TASK)
                                 .subscribeOn(Schedulers.io())

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

@@ -2373,6 +2373,12 @@ public class ViewUtil {
         }
     }
 
+    public static void setVisibilityBlock(View view, boolean isVisible) {
+        if (view != null) {
+            view.setVisibility(isVisible ? View.VISIBLE : View.INVISIBLE);
+        }
+    }
+
     public static void setVisibility(View view, int visible) {
         if (view != null) {
             view.setVisibility(visible);

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

@@ -17,14 +17,14 @@ import com.sheep.jiuyan.samllsheep.R;
 public class PersonalCenterAct extends BaseActivity {
 
     @Override
-    protected void onCreate(Bundle bundle){
+    protected void onCreate(Bundle bundle) {
         overridePendingTransition(R.anim.slide_in_right, R.anim.no_slide);
         StatusBarUtils.setTranslucent(this);
         super.onCreate(bundle);
     }
 
     @Override
-    public void finish(){
+    public void finish() {
         super.finish();
         overridePendingTransition(R.anim.no_slide, R.anim.slide_out_right);
     }
@@ -42,6 +42,9 @@ public class PersonalCenterAct extends BaseActivity {
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
         if (fragment == null) {
             fragment = new FgtPersonalCenter();
+            if (getIntent().hasExtra("extra") && "newbie".equals(getIntent().getStringExtra("extra"))) {
+                ((FgtPersonalCenter) fragment).setNewbie(true);
+            }
             fragment.setArguments(bundle);
             transaction.add(R.id.frame_container, fragment, "tag");
             transaction.show(fragment);

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

@@ -169,19 +169,25 @@ public class FgtPersonalCenter extends BaseFragment {
     private String agentUrl;
     private Activity activity;
 
-    public static void scrollToBottom(Activity activity){
+    private boolean isNewbie = false;
+
+    public void setNewbie(boolean is) {
+        isNewbie = is;
+    }
+
+    public static void scrollToBottom(Activity activity) {
         scrollRef.get().fullScroll(View.FOCUS_DOWN);
-        new Handler(){
-            public void handleMessage(Message msg){
+        new Handler() {
+            public void handleMessage(Message msg) {
                 new NewbieGuideHelper(activity).show(NewbieGuideHelper.GUIDE_FAQ);
             }
         }.sendEmptyMessageDelayed(0, 300);
     }
 
-    public static void scrollToTop(Activity activity){
+    public static void scrollToTop(Activity activity) {
         scrollRef.get().fullScroll(View.FOCUS_UP);
-        new Handler(){
-            public void handleMessage(Message msg){
+        new Handler() {
+            public void handleMessage(Message msg) {
                 new NewbieGuideHelper(activity).show(NewbieGuideHelper.GUIDE_MONEY);
             }
         }.sendEmptyMessageDelayed(0, 300);
@@ -203,7 +209,9 @@ public class FgtPersonalCenter extends BaseFragment {
         accountDetailRef = new WeakReference<>(account_detail_layout);
         fagRef = new WeakReference<>(faq_layout);
         scrollRef = new WeakReference<>(scroll_view);
-        new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_USER);
+        if (isNewbie) {
+            new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_USER);
+        }
     }
 
     @Override
@@ -227,11 +235,11 @@ public class FgtPersonalCenter extends BaseFragment {
             img_baseactivity_title.setVisibility(View.INVISIBLE);
         }
         ViewUtil.setText(audit_activity, getString(R.string.audit_activity, ViewUtil.INDENT));
-        ViewUtil.setVisibility(audit_activity_oval, false);
+        ViewUtil.setVisibilityBlock(audit_activity_oval, false);
         ViewUtil.setText(audit_success, getString(R.string.audit_success, ViewUtil.INDENT));
-        ViewUtil.setVisibility(audit_success_oval, false);
+        ViewUtil.setVisibilityBlock(audit_success_oval, false);
         ViewUtil.setText(audit_failed, getString(R.string.audit_failed, ViewUtil.INDENT));
-        ViewUtil.setVisibility(audit_failed_oval, false);
+        ViewUtil.setVisibilityBlock(audit_failed_oval, false);
         initUserModuleItemView();
         //是否显示我的关注
         ViewUtil.setVisibility(fgt_person_center_my_focus_line, !TestUtil.isLTVersion3_4_5());
@@ -345,7 +353,7 @@ public class FgtPersonalCenter extends BaseFragment {
             ViewUtil.notifyDataSetChanged(moduleList);
             ViewUtil.setVisibility(moduleLayout, true);
         } else {
-            ViewUtil.setVisibility(moduleLayout, !userCenterModuleList.isEmpty());
+            ViewUtil.setVisibilityBlock(moduleLayout, !userCenterModuleList.isEmpty());
         }
     }
 

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

@@ -247,10 +247,14 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                     isShowRedPackages(activity);
                     break;
                 case WHAT_TRY_SHOW_NEWBIE_GUIDE:
-                    new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_HOME);
+                    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);
+                    ((ActMain) getActivity()).switchFragment(0);
                     new NewbieGuideHelper(getActivity()).show(NewbieGuideHelper.GUIDE_MALL);
                     break;
             }

app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -140,7 +140,7 @@ public class Config {
     public static final String QQ_APP_ID = "101461115";
 
     //人脸识别
-    public final static String FACE_LICENSE_ID = "small-sheep-android-face-android";
+    public final static String FACE_LICENSE_ID = "small-sheep-face-android";
     public final static String FACE_LICENSE_FILE_NAME = "idl-license.face-android";
 
     //缓存数据的key