Parcourir la source

修复龙猫电竞不跳转的bug

zengjiebin il y a 7 ans
Parent
commit
ab2b297515
1 fichiers modifiés avec 11 ajouts et 9 suppressions
  1. 11 9
      app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

+ 11 - 9
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1565,10 +1565,12 @@ public class Jump2View {
                     public void onNext(BaseMessage baseMessage) {
                     public void onNext(BaseMessage baseMessage) {
                         Mission mission = baseMessage.getData(Mission.class);
                         Mission mission = baseMessage.getData(Mission.class);
                         if(mission != null) {
                         if(mission != null) {
-                            if(mission.getQuantity() == 10) {//邀请10个后有奖品
+                            if(mission.getQuantity() == 10 && DataUtil.getAsBoolean("notShowYfShopAskDialog10", true)) {//邀请10个后有奖品
+                                 DataUtil.putAsBoolean("notShowYfShopAskDialog10", false);
                                 tryCheckUserAddress(activity, mission);
                                 tryCheckUserAddress(activity, mission);
                                 return;
                                 return;
-                            } else if(mission.getQuantity() == 50) {//邀请50个时有奖品
+                            } else if(mission.getQuantity() == 50 && DataUtil.getAsBoolean("notShowYfShopAskDialog50", true)) {//邀请50个时有奖品
+                                 DataUtil.putAsBoolean("notShowYfShopAskDialog50", false);
                                 tryCheckUserAddress(activity, mission);
                                 tryCheckUserAddress(activity, mission);
                                 return;
                                 return;
                             }
                             }
@@ -2400,9 +2402,9 @@ public class Jump2View {
      * @param data 视频数据,包括地址与时长,宽高等
      * @param data 视频数据,包括地址与时长,宽高等
      */
      */
     public void goActCutVideo(Activity activity, Video data) {
     public void goActCutVideo(Activity activity, Video data) {
-//        SheepPluginUtil.checkAndRunPlugin(activity, Plugin.media)
-//                .flatMap((Function<Plugin, ObservableSource<BaseMessage>>) plugin -> SheepApp.getInstance().getNetComponent().getApiService().getVideoTopic())
-        SheepApp.getInstance().getNetComponent().getApiService().getVideoTopic()
+        SheepPluginUtil.checkAndRunPlugin(activity, Plugin.media_zip_so)
+                .flatMap((Function<Plugin, ObservableSource<BaseMessage>>) plugin -> SheepApp.getInstance().getNetComponent().getApiService().getVideoTopic())
+//        SheepApp.getInstance().getNetComponent().getApiService().getVideoTopic()
                 .subscribeOn(Schedulers.io())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new AbsObserver<BaseMessage>() {
                 .subscribe(new AbsObserver<BaseMessage>() {
@@ -2543,7 +2545,7 @@ public class Jump2View {
      */
      */
     public void gotoVip(Activity activity) {
     public void gotoVip(Activity activity) {
         CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_BUY_VIP_URL, url -> {
         CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_BUY_VIP_URL, url -> {
-            if (url == null) {
+            if (TextUtils.isEmpty(url)){
                 G.showToast(R.string.coming_soon);
                 G.showToast(R.string.coming_soon);
                 return;
                 return;
             }
             }
@@ -2571,7 +2573,7 @@ public class Jump2View {
     public boolean gotoLongMao(Activity activity) {
     public boolean gotoLongMao(Activity activity) {
         if (!PackageUtil.isAppInstalled(SheepApp.getInstance(), Config.LONG_MAO_APP_PACKAGE_NAME)) {
         if (!PackageUtil.isAppInstalled(SheepApp.getInstance(), Config.LONG_MAO_APP_PACKAGE_NAME)) {
             CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_LMJC_URL, url -> {
             CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_LMJC_URL, url -> {
-                if (url == null) {
+                if (TextUtils.isEmpty(url)) {
                     ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("安装提示").setMsg("点击确定将下载" + Config.LONG_MAO_APP_REAL_NAME)
                     ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("安装提示").setMsg("点击确定将下载" + Config.LONG_MAO_APP_REAL_NAME)
                             .setBtnLeftText("取消").setBtnRightText("确定").setCancelable(false)
                             .setBtnLeftText("取消").setBtnRightText("确定").setCancelable(false)
                             .setBtnRightOnClickListener(view -> OkHttpUtils.get().url(Config.LONG_MAO_APP_DOWNLOAD_URL).build().execute(new FileCallBack(DIR, "long_mao_guess.apk") {
                             .setBtnRightOnClickListener(view -> OkHttpUtils.get().url(Config.LONG_MAO_APP_DOWNLOAD_URL).build().execute(new FileCallBack(DIR, "long_mao_guess.apk") {
@@ -2612,7 +2614,7 @@ public class Jump2View {
      */
      */
     public void gotoYfShop(Activity activity) {
     public void gotoYfShop(Activity activity) {
         CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_YF_SHOP_URL, url -> {
         CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_YF_SHOP_URL, url -> {
-            if (url == null)
+            if (TextUtils.isEmpty(url))
                 url = SheepApp.getInstance().getConnectAddress().getYfShotHomeSheep();
                 url = SheepApp.getInstance().getConnectAddress().getYfShotHomeSheep();
             goWeb(activity, new WebParams(url, Config.YF_SHOP_NAME).setShowTitle(false).tokenFirstUpperCase());
             goWeb(activity, new WebParams(url, Config.YF_SHOP_NAME).setShowTitle(false).tokenFirstUpperCase());
         });
         });
@@ -2656,7 +2658,7 @@ public class Jump2View {
      */
      */
     public void goActUserAddrInfo(Activity activity) {
     public void goActUserAddrInfo(Activity activity) {
         CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_USER_ADDRESS_URL, url -> {
         CommonUtil.getInstance().initUrlConfigByNet(Config.KEY_USER_ADDRESS_URL, url -> {
-            if (url == null) {
+            if (TextUtils.isEmpty(url)){
                 G.showToast(R.string.coming_soon);
                 G.showToast(R.string.coming_soon);
                 return;
                 return;
             }
             }