Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

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

@@ -1991,16 +1991,26 @@ public class CommonUtil {
                 .execute(new FileCallBack(DIR, name) {
                     @Override
                     public void onError(Call call, Exception e, int id) {
-                        G.showToast("下载文件失败");
+                        G.showToast("下载文件失败："+e.getMessage());
                     }
 
                     @Override
                     public void onResponse(File response, int id) {
-                        if (name.endsWith(".png") || name.endsWith(".jpg")) {//图片
-                            Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-                            Uri uri = Uri.fromFile(response);
-                            intent.setData(uri);
-                            activity.sendBroadcast(intent); // 发送广播通知相册
+                        Activity curActivity = ActivityManager.getInstance().currentActivity();
+                        if(curActivity == null)
+                            curActivity = activity;
+                        String suffix = name.substring(name.lastIndexOf(".") + 1);
+                        switch (suffix){
+                            case ".png":
+                            case ".jpg"://图片
+                                Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+                                Uri uri = Uri.fromFile(response);
+                                intent.setData(uri);
+                                curActivity.sendBroadcast(intent); // 发送广播通知相册
+                                break;
+                            case "apk":
+                                ApkUtils.installApk(curActivity, response.getAbsolutePath());
+                                break;
                         }
                         G.showToast("下载文件成功");
                     }

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

@@ -98,6 +98,7 @@ public class TestUtil {
                     }
                     final List<Object> list = ListUtil.emptyList();
                     list.add("清理图片");
+                    list.add("下载小绵羊");
                     ListUtil.addAll(list, loginUserList);
                     AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("选择要登录的账号")
                             .setAdapter(new ArrayAdapter<>(activity, android.R.layout.simple_list_item_1, list),  new DialogInterface.OnClickListener() {
@@ -111,13 +112,20 @@ public class TestUtil {
                                         Intent intent = new Intent(SheepApp.getInstance(), ActMain.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                                         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                                         SheepApp.getInstance().startActivity(intent);
-                                    } else {
-                                        new Thread(new Runnable() {
-                                            @Override
-                                            public void run() {
-                                                Glide.get(SheepApp.getInstance()).clearDiskCache();//清理图片
-                                            }
-                                        }).start();
+                                    } else if(object instanceof String){
+                                        switch (object.toString()){
+                                            case "清理图片":
+                                                new Thread(new Runnable() {
+                                                    @Override
+                                                    public void run() {
+                                                        Glide.get(SheepApp.getInstance()).clearDiskCache();//清理图片
+                                                    }
+                                                }).start();
+                                                break;
+                                            case "下载小绵羊":
+                                                downloadApkFromJenkins();
+                                                break;
+                                        }
                                     }
                                 }
                             }).create();
@@ -168,6 +176,9 @@ public class TestUtil {
     public static boolean isTest(){
         return BuildConfig.DEBUG || !"sheep".equals(BuildConfig.FLAVOR);
     }
+    public static void downloadApkFromJenkins(){
+        Jump2View.getInstance().goWeb(ActivityManager.getInstance().currentActivity(), "http://10.8.210.20:8080/jenkins/job/android_small_sheep/", "从jenkins下载小绵羊安装包");
+    }
 
     /**
      * 交通
@@ -181,7 +192,7 @@ public class TestUtil {
      * @param activity
      */
     public static void test(final Activity activity) {
-        final String[] items = {"复制token","复制打点数据","审核中心","检查正版","crc32","loading","progress","查看截图",
+        final String[] items = {"复制token","复制打点数据","从jenkins下载小绵羊安装包","审核中心","检查正版","crc32","loading","progress","查看截图",
                 "复制imsi","小米游戏","测试可用金额","测试定位信息","测试apk的渠道","幂动科技","游戏搜索",
                 "游戏帐号","游戏代充","尝试开启第三方应用使用情况","测试代理页面","第三方应用使用情况",
                 "开启第三方应用使用情况","h5跳转","新手对话框","md5","空间不足提示框",
@@ -194,6 +205,9 @@ public class TestUtil {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
+                            case "从jenkins下载小绵羊安装包":
+                                downloadApkFromJenkins();
+                                break;
                             case "审核中心":
                                 Jump2View.getInstance().goAuditTastList(activity, null);
                                 break;

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

@@ -53,7 +53,7 @@ public class WebviewJs {
     @JavascriptInterface
     public void downloadFile(final String url, final String name) {
         //去下载
-        CommonUtil.getInstance().showDownLoad(activity, url, url);
+        CommonUtil.getInstance().showDownLoad(activity, url, name);
     }
 
     @JavascriptInterface

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

@@ -97,9 +97,9 @@ public class ActWeb extends BaseActivity {
     public void initListener() {
         mWebView.setDownloadListener(new DownloadListener() {
             @Override
-            public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
+            public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimeType, long contentLength) {
                 //去下载
-                CommonUtil.getInstance().showDownLoad(ActWeb.this, url, url);
+                CommonUtil.getInstance().showDownLoad(ActWeb.this, url, url.substring(url.lastIndexOf("/") + 1));
             }
         });
     }