|
|
@@ -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)//进入动画
|