diff --git a/app/src/main/java/com/chwl/app/other/activity/SplashActivity.java b/app/src/main/java/com/chwl/app/other/activity/SplashActivity.java index e8cd8396c..eb482705e 100644 --- a/app/src/main/java/com/chwl/app/other/activity/SplashActivity.java +++ b/app/src/main/java/com/chwl/app/other/activity/SplashActivity.java @@ -140,7 +140,7 @@ public class SplashActivity extends AppCompatActivity implements View.OnClickLis if (mLocalSplashVo != null && !TextUtils.isEmpty(mLocalSplashVo.getPict())) { animation(); - //todo do 看下有没有图片适配问题 + //todo do 看下有没有图片适配问题 mLocalSplashVo.getType()==3 是图片 mBinding.ivActivity.load(mLocalSplashVo.getPict(),mLocalSplashVo.getFillVo().getImgMap(), mLocalSplashVo.getFillVo().getTextMap()); if (mLocalSplashVo.getType() != 0 && !TextUtils.isEmpty(mLocalSplashVo.getLink())) { diff --git a/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java b/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java index 10872bb73..5df122181 100644 --- a/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java +++ b/app/src/main/java/com/chwl/app/utils/CommonJumpHelper.java @@ -6,6 +6,9 @@ import static com.chwl.core.home.bean.BannerInfo.SKIP_TYPE_ROUTER; import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_APP; import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_CHAT_ROOM; import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_H5; +import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_H5_CP; +import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_H5_CUSTOM; +import static com.chwl.core.home.bean.BannerInfo.SKIP_TYP_H5_WEE_STAR; import android.content.Context; import android.content.Intent; @@ -61,6 +64,9 @@ public class CommonJumpHelper { break; case SKIP_TYP_H5: + case SKIP_TYP_H5_CP: + case SKIP_TYP_H5_WEE_STAR: + case SKIP_TYP_H5_CUSTOM: if (TextUtils.isEmpty(skipContent)) { return; } diff --git a/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java b/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java index 77e263d23..15d6410a9 100644 --- a/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java +++ b/core/src/main/java/com/chwl/core/home/bean/BannerInfo.java @@ -30,20 +30,33 @@ public class BannerInfo implements Parcelable, Serializable, IRouterData { */ public final static transient int SKIP_TYP_H5 = 3; + /** + * 跳转H5显示-cp + */ + public final static transient int SKIP_TYP_H5_CP = 4; + /** + * 跳转H5显示-周星 + */ + public final static transient int SKIP_TYP_H5_WEE_STAR = 5; + /** + * 跳转H5显示-定制 + */ + public final static transient int SKIP_TYP_H5_CUSTOM = 6; + /** * routerhandler跳转规则 */ - public final static transient int SKIP_TYPE_ROUTER = 5; + public final static transient int SKIP_TYPE_ROUTER = 55; /** * 房间用户资料卡 */ - public final static transient int SKIP_TYPE_ROOM_USER_CARD = 6; + public final static transient int SKIP_TYPE_ROOM_USER_CARD = 66; /** * 百顺 baishun 游戏 */ - public final static transient int SKIP_TYPE_ROOM_BAI_SHUN = 7; + public final static transient int SKIP_TYPE_ROOM_BAI_SHUN = 77; /** * 无调整