Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/module/game/fragment/FgtGameCenter.java

@@ -98,28 +98,30 @@ public class FgtGameCenter extends BaseFragment {
 
             }
         });
-        ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
-        CommonUtil.getInstance().callActionWithUserInfo(userEntity -> {
-            String code = userEntity.getParent_code();
-            if(TextUtils.isEmpty(code)){
-                code = userEntity.getInvitation_code();
-            }
-        SheepApp.getInstance().getNetComponent().getApiService().getUserIsShouYou(code)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        boolean result = baseMessage.getData(Boolean.class);
-                        ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, !result);//不是会长或会长邀请的才显示
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
-                    }
-                });
-        });
+        if(ViewUtil.isVisible(fgt_gc_hb_500_yuan_drl)) {
+            ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
+            CommonUtil.getInstance().callActionWithUserInfo(userEntity -> {
+                String code = userEntity.getParent_code();
+                if (TextUtils.isEmpty(code)) {
+                    code = userEntity.getInvitation_code();
+                }
+                SheepApp.getInstance().getNetComponent().getApiService().getUserIsShouYou(code)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                boolean result = baseMessage.getData(Boolean.class);
+                                ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, !result);//不是会长或不是会长邀请的用户，才显示赏金任务入口
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                ViewUtil.setVisibility(fgt_gc_hb_500_yuan_drl, false);
+                            }
+                        });
+            });
+        }
 
     }
 

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

@@ -853,18 +853,27 @@ public class SysAppUtil {
             PendingIntent successCallback = PendingIntent.getBroadcast(context, 0, pinnedShortcutCallbackIntent, 0);
 
             ShortcutManagerCompat.requestPinShortcut(context, pinShortcutInfo, successCallback.getIntentSender());
-            G.showToast("正在尝试添加桌面快捷方式");
-            return true;
+//            boolean hasShortcut = SysAppUtil.hasShortcut(SheepApp.getInstance(), Config.YF_SHOP_NAME);
+//            return hasShortcut;
+            return SysAppUtil.hasShortcut(SheepApp.getInstance(), Config.YF_SHOP_NAME);
         }
         return false;
     }
 
     //添加有范商城快捷入口
+    public static void addShortcut(Activity activity) {
+        boolean hasShortcut = SysAppUtil.hasShortcut(SheepApp.getInstance(), Config.YF_SHOP_NAME);
+        if(hasShortcut){
+            showShortcutTip3();
+        } else {
+            showShortcutTip2();
+            addShortcutTest(activity);
+        }
+    }
+
+    //添加有范商城快捷入口
     public static void addShortcutTest(Activity activity) {
         if(installShortCut(activity)){
-            if(Build.VERSION.SDK_INT >=  Build.VERSION_CODES.N_MR1){
-                showShortcutTip(activity);
-            }
         } else if(Build.VERSION.SDK_INT >=  Build.VERSION_CODES.O){
             SysAppUtil.addShortcutTest8(activity);
         } else if(Build.VERSION.SDK_INT >=  Build.VERSION_CODES.N_MR1){
@@ -900,14 +909,19 @@ public class SysAppUtil {
             PendingIntent shortcutCallbackIntent = PendingIntent.getBroadcast(activity, 0, new Intent(activity, CallBackReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT);
 
             shortcutManager.requestPinShortcut(info, shortcutCallbackIntent.getIntentSender());
-            showShortcutTip(activity);
-        } else {
-            G.showToast("暂不支持");
         }
     }
 
+    //展示提示
+    public static void showShortcutTip2() {
+        G.showToast("已尝试添加有范商城到桌面，若添加失败，请打开小绵羊\"创建桌面快捷方式\"的权限");
+    }
+    public static void showShortcutTip3() {
+        G.showToast("添加有范商城到桌面成功，若添加失败，请打开小绵羊\"创建桌面快捷方式\"的权限");
+    }
+
     //展示提示框
-    private static void showShortcutTip(Activity activity) {
+    public static void showShortcutTip(Activity activity) {
         ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("已尝试添加有范商城到桌面").setMsg("若添加失败，请前往系统设置为小绵羊打开\"创建桌面快捷方式\"的权限")
                 .setBtnLeftText("重新添加").setBtnLeftOnClickListener(view -> CommonUtil.getInstance().addYouFanLauncher())
                 .setBtnRightText("前往设置").setBtnRightOnClickListener(view -> {
@@ -915,19 +929,19 @@ public class SysAppUtil {
                         startAppSettings(activity);
                     } catch (NoSuchFieldException e) {
                         e.printStackTrace();
-                        if(TestUtil.isDev())
+                        if (TestUtil.isDev())
                             G.showToast(e);
                     } catch (IllegalAccessException e) {
                         e.printStackTrace();
-                        if(TestUtil.isDev())
+                        if (TestUtil.isDev())
                             G.showToast(e);
-                    } catch (ActivityNotFoundException e){
-                        if(RomUtils.checkIsMiuiRom()){
+                    } catch (ActivityNotFoundException e) {
+                        if (RomUtils.checkIsMiuiRom()) {
                             skipActivity(activity, "com.miui.securitycenter", "com.miui.permcenter.MainAcitivty", null, null);
                         }
-                    } catch (Exception e){
+                    } catch (Exception e) {
                         e.printStackTrace();
-                        if(TestUtil.isDev())
+                        if (TestUtil.isDev())
                             G.showToast(e);
                     }
                 }).setBtnRightNotDissDialog(true));
@@ -961,7 +975,6 @@ public class SysAppUtil {
                 .build();
         //这样就可以通过长按图标显示出快捷方式了
         systemService.setDynamicShortcuts(ListUtil.asList(shortcutInfo));
-        showShortcutTip(activity);
     }
 
     public static void addShortcutTest6(Activity activity) {
@@ -973,9 +986,6 @@ public class SysAppUtil {
         if (!ShortcutSuperUtils.isShortCutExist(activity, mShortcutName, getShortCutIntent(activity))) {
             ShortcutUtils.addShortcut(activity, getShortCutIntent(activity), mShortcutName, false,
                     BitmapFactory.decodeResource(activity.getResources(), R.drawable.icon_yf));
-            showShortcutTip(activity);
-        } else {
-            G.showToast("已经添加成功");
         }
 
         // 为某个包创建快捷方式

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

@@ -265,7 +265,7 @@ public class TestUtil {
      */
     public static void test(final Activity activity) {
         final String[] items = {"复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
-                "测试跳转","support包尝试创建桌面快捷方式","判断Launcher是否支持创建桌面快捷方式","判断是否添加快捷入口","判断是否添加商城快捷入口",
+                "测试跳转","support包尝试创建桌面快捷方式","判断Launcher是否支持创建桌面快捷方式","判断是否添加快捷入口","判断是否添加商城快捷入口","显示快捷方式设置对话框",
                 "跳转QQ", "跳转QQ群", "尝试获取通讯录", "测试有范","测试有范6.0","测试有范7.0","测试有范8.0", "测试设备信息", "下载视频测试", "爱奇艺VIP会员", "分享我的签名的小绵羊apk", "分享当前小绵羊apk",
                 "测试升级对话框", "少数民族姓名", "开启皮肤", "不开启皮肤", "我的游戏", "优惠券弹窗", "填写收件地址弹窗",
                 "朗读文字", "游戏搜索", "测试插件", "测试bitmap", "剪切视频", "我的关注", "足迹",
@@ -308,11 +308,14 @@ public class TestUtil {
                 boolean hasShortcut = SysAppUtil.hasShortcut(SheepApp.getInstance(), Config.YF_SHOP_NAME);
                 G.showToast((hasShortcut ? "已经": "还未") + Config.YF_SHOP_NAME + "桌面快捷入口");
                 break;
+            case "显示快捷方式设置对话框":
+                SysAppUtil.showShortcutTip(activity);
+                break;
             case "尝试获取通讯录":
                 ContactUtil.getAllContactList(G::showToast);
                 break;
             case "测试有范":
-                SysAppUtil.addShortcutTest(activity);
+                SysAppUtil.addShortcut(activity);
                 break;
             case "测试有范6.0":
                 SysAppUtil.addShortcutTest6(activity);

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

@@ -266,16 +266,21 @@ public class ViewUtil {
 
     //加载js
     public static void loadJs(com.tencent.smtt.sdk.WebView mWebView, String js) {
+        loadJs(mWebView, js, new com.tencent.smtt.sdk.ValueCallback<String>() {
+            @Override
+            public void onReceiveValue(String value) {
+                //此处为 js 返回的结果
+            }
+        });
+    }
+
+    //加载js
+    public static void loadJs(com.tencent.smtt.sdk.WebView mWebView, String js, com.tencent.smtt.sdk.ValueCallback<String> stringValueCallback) {
         if(mWebView == null){
             return;
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            mWebView.evaluateJavascript("javascript:" + js, new com.tencent.smtt.sdk.ValueCallback<String>() {
-                @Override
-                public void onReceiveValue(String value) {
-                    //此处为 js 返回的结果
-                }
-            });
+            mWebView.evaluateJavascript("javascript:" + js, stringValueCallback);
         } else {
             mWebView.loadUrl("javascript:" + js);
         }
@@ -283,13 +288,18 @@ public class ViewUtil {
 
     //加载js
     public static void loadJs(WebView mWebView, String js) {
+        loadJs(mWebView, js, new ValueCallback<String>() {
+            @Override
+            public void onReceiveValue(String value) {
+                //此处为 js 返回的结果
+            }
+        });
+    }
+
+    //加载js
+    public static void loadJs(WebView mWebView, String js, ValueCallback<String> stringValueCallback) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            mWebView.evaluateJavascript("javascript:" + js, new ValueCallback<String>() {
-                @Override
-                public void onReceiveValue(String value) {
-                    //此处为 js 返回的结果
-                }
-            });
+            mWebView.evaluateJavascript("javascript:" + js, stringValueCallback);
         } else {
             mWebView.loadUrl("javascript:" + js);
         }

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

@@ -117,7 +117,7 @@ public class ActWebX5 extends BaseActWeb {
                     .getInstance()
                     .setShowOrHide(this, true)
                     .setTitle(this, webParams.getTitle())
-                    .setRightSecondBtn(this, R.mipmap.tianjtb, view -> SysAppUtil.addShortcutTest(this))
+                    .setRightSecondBtn(this, R.mipmap.tianjtb, view -> SysAppUtil.addShortcut(this))
                     .setRightImgBotton(this, R.mipmap.guanb, view -> super.finish())
                     .setTitleFinish(this);
         } else if (webParams.isShowTitle()) {