zeki лет назад: 5
Родитель
Сommit
e40cf81dfa

+ 11 - 7
app/src/main/java/com/sheep/gamegroup/module/guide/NewbieGuideHelper.java

@@ -87,8 +87,11 @@ public class NewbieGuideHelper {
 
                     @Override
                     public void onRemoved(Controller controller) {
-                        if (!goon) return;
-                        Log.e(TAG, "NewbieGuide  onRemoved: ");
+                        if (!goon) {
+                            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_SHOW_HOME));
+                            return;
+                        }
+                        Log.e(TAG, "NewbieGuide  onRemoved: "+type);
                         if (type == GUIDE_HOME) {
                             Jump2View.getInstance().goPersonnalCenterView(mActivity, "newbie");
                         } else if (type == GUIDE_USER) {
@@ -100,6 +103,8 @@ public class NewbieGuideHelper {
                             mActivity.finish();
                         } else if (type == GUIDE_GAME) {
                             EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SHOW_NEW_USER_HONG_BAO));
+                        }else {
+                            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.GUIDE_SHOW_HOME));
                         }
                     }
                 })
@@ -146,16 +151,15 @@ public class NewbieGuideHelper {
                 marginInfo.rightMargin -= ScreenUtil.dip2px(mActivity, 40);
             }
         };
-        RelativeGuide relativeGuide3 = new RelativeGuide(R.layout.newbie_guide_2_3, Gravity.TOP, 0) {
+        RelativeGuide relativeGuide3 = new RelativeGuide(R.layout.newbie_guide_2_3, Gravity.BOTTOM, 0) {
             @Override
             protected void offsetMargin(MarginInfo marginInfo, ViewGroup viewGroup, View view) {
-                marginInfo.bottomMargin -= ScreenUtil.dip2px(mActivity, 8);
-                marginInfo.leftMargin += ScreenUtil.dip2px(mActivity, 50);
+                marginInfo.leftMargin -= ScreenUtil.dip2px(mActivity, 200);
+                marginInfo.topMargin += ScreenUtil.dip2px(mActivity, 4);
             }
         };
         return GuidePage.newInstance()//创建一个实例
-                .addHighLightWithOptions(FgtMainHeader.faceRef.get(), HighLight.Shape.CIRCLE, new HighlightOptions.Builder().setRelativeGuide(relativeGuide3).useMaxSize(true).build())
-                .setLayoutRes(R.layout.newbie_guide_2_3)
+                .addHighLightWithOptions(FgtMainHeader.menuBtn.get(), HighLight.Shape.CIRCLE, new HighlightOptions.Builder().setRelativeGuide(relativeGuide3).useMaxSize(true).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())
                 .setEnterAnimation(enterAnimation)//进入动画

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

@@ -189,6 +189,7 @@ public class ActMain extends BaseActYmPermissionCheck {
         tabBtn2 = new WeakReference<>(findViewById(R.id.tab_3));
         frame_container.setHookView(main_header);
 
+
 //        final LottieAnimationView animView = findViewById(R.id.test_anim_view);
 //        animView.setOnClickListener(v->{
 //            if(animView.isAnimating()){
@@ -313,7 +314,7 @@ public class ActMain extends BaseActYmPermissionCheck {
             }
         });
         transaction.commitAllowingStateLoss();
-        tabs.get(lastPosition).setActivated(true);
+        //tabs.get(lastPosition).setActivated(true);
     }
 
     AnimationDrawable animationDrawable;
@@ -323,7 +324,6 @@ public class ActMain extends BaseActYmPermissionCheck {
         animationDrawable = (AnimationDrawable) imageView.getBackground();
         animationDrawable.stop();
         animationDrawable.start();
-
     }
 
     //播放一次gif

BIN
app/src/main/res/drawable/guide_1_2.png


+ 11 - 7
app/src/main/res/layout/newbie_guide_2_3.xml

@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                xmlns:tools="http://schemas.android.com/tools"
+                tools:background="#000000">
+
     <ImageView
-        android:id="@+id/i1"
-        android:src="@mipmap/guide_1_2"
-        android:adjustViewBounds="true"
-        android:layout_width="52dp"
-        android:layout_height="wrap_content" />
+            android:id="@+id/i1"
+            android:src="@mipmap/guide_1_2"
+            android:adjustViewBounds="true"
+            android:layout_marginEnd="12dp"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"/>
 
 </RelativeLayout>