Главная Обзор Помощь
Регистрация Вход
xmy_android
/
small_sheep_android
Следить 3
В избранное 0
Ответвить 0
Файлы Обсуждения 0 Запросы на слияние 0 Вики
Просмотр исходного кода

Merge remote-tracking branch 'origin/sheep2.0' into sheep2.0

zengjiebin лет назад: 7
Родитель
55931c8dcb 664bad1909
Сommit
e936b02d92
7 измененных файлов с 84 добавлено и 26 удалено
Единый вид Показать статистику Diff
  1. 0 14
      app/src/main/AndroidManifest.xml
  2. 24 0
      app/src/main/assets/loadImg.html
  3. 15 0
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  4. 23 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java
  5. 1 4
      app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
  6. 1 1
      app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
  7. 20 6
      app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

+ 0 - 14
app/src/main/AndroidManifest.xml
Просмотреть файл 

@@ -89,20 +89,6 @@
 
             android:enabled="true"
 
             android:enabled="true"
 
             android:exported="true">
 
             android:exported="true">
 
         </service>
 
         </service>
 
-        <service
 
-            android:name=".service.MonitorAppService"
 
-            android:enabled="true"
 
-            android:exported="true"
 
-            android:label="@string/app_name"
 
-            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE" >
 
-            <intent-filter>
 
-                <action android:name="android.accessibilityservice.AccessibilityService" />
 
-            </intent-filter>
 
-
 
-            <meta-data
 
-                android:name="android.accessibilityservice"
 
-                android:resource="@xml/accessibility" />
 
-        </service>
 
         <provider
 
         <provider
 
             android:name=".provider.SheepFileProvider"
 
             android:name=".provider.SheepFileProvider"
 
             android:authorities="${applicationId}.fileprovider"
 
             android:authorities="${applicationId}.fileprovider"

+ 24 - 0
app/src/main/assets/loadImg.html
Просмотреть файл 

@@ -0,0 +1,24 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
 
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
+    <title></title>
 
+</head>
 
+<style>
 
+    * {
 
+        margin:0;
 
+        padding:0;
 
+    }
 
+</style>
 
+<body>
 
+    <img id="img" style="width:100vw" alt="">
 
+</body>
 
+<script>
 
+    function imgsrc(path){
 
+		var img = document.getElementById("img");
 
+			img.src = path;
 
+	}
 
+</script>
 
+</html>

+ 15 - 0
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
Просмотреть файл 

@@ -419,6 +419,7 @@ public class CommonUtil {
 
                 break;
 
                 break;
 
             case 12://闲玩任务
 
             case 12://闲玩任务
 
                 Jump2View.getInstance().goXianwanWeb(context,null, null);
 
                 Jump2View.getInstance().goXianwanWeb(context,null, null);
 
+                break;
 
             default:
 
             default:
 
                 G.showToast(R.string.coming_soon);
 
                 G.showToast(R.string.coming_soon);
 
                 break;
 
                 break;
 
@@ -1024,4 +1025,18 @@ public class CommonUtil {
 
                     }
 
                     }
 
                 });
 
                 });
 
     }
 
     }
 
+
 
+    /**
 
+     * 判断地址是否为图片
 
+     */
 
+    public boolean judgeUrlPicture(String url){
 
+        if(TextUtils.isEmpty(url))
 
+            return false;
 
+        String[] strings = new String[]{"png","jpg","jpeg","gif","svg","bmp"};
 
+        for (String s: strings){
 
+            if(url.toLowerCase().endsWith(s))
 
+                return true;
 
+        }
 
+        return false;
 
+    }
 
 }
 
 }

+ 23 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java
Просмотреть файл 

@@ -208,6 +208,15 @@ public class ActWeb extends BaseCompatActivity {
 
                 ActWeb.this.startActivityForResult(Intent.createChooser(i, "Image Chooser"), FILECHOOSER_RESULTCODE);
 
                 ActWeb.this.startActivityForResult(Intent.createChooser(i, "Image Chooser"), FILECHOOSER_RESULTCODE);
 
 
 
             }
 
             }
 
+
 
+            @Override
 
+            public void onProgressChanged(WebView view, int newProgress) {
 
+                if(newProgress == 100){
 
+                    String action = "javascript:imgsrc('"+ url +"')";
 
+                    runWebviewUrl(action);
 
+                }
 
+                super.onProgressChanged(view, newProgress);
 
+            }
 
         });
 
         });
 
         mWebView.setWebViewClient(new WebViewClient() {
 
         mWebView.setWebViewClient(new WebViewClient() {
 
             @Override
 
             @Override
 
@@ -230,7 +239,11 @@ public class ActWeb extends BaseCompatActivity {
 
         mWebView.addJavascriptInterface(new KFZSJs(), "kfzsjs");
 
         mWebView.addJavascriptInterface(new KFZSJs(), "kfzsjs");
 
         String loadUrl = addUrlToken(url);
 
         String loadUrl = addUrlToken(url);
 
         LogUtil.println("ActWeb loadUrl = "+loadUrl);
 
         LogUtil.println("ActWeb loadUrl = "+loadUrl);
 
-        mWebView.loadUrl(loadUrl);
 
+        if(CommonUtil.getInstance().judgeUrlPicture(url)){
 
+            runWebviewUrl("file:///android_asset/loadImg.html");
 
+        }else {
 
+            mWebView.loadUrl(loadUrl);
 
+        }
 
     }
 
     }
 
     //在sdcard卡创建缩略图
 
     //在sdcard卡创建缩略图
 
     //createImageFileInSdcard
 
     //createImageFileInSdcard
 
@@ -434,4 +447,13 @@ public class ActWeb extends BaseCompatActivity {
 
                 "})()");
 
                 "})()");
 
     }
 
     }
 
 
 
+    private void runWebviewUrl(final String url){
 
+        runOnUiThread(new Runnable() {
 
+            @Override
 
+            public void run() {
 
+                mWebView.loadUrl(url);
 
+            }
 
+        });
 
+    }
 
+
 
 }
 
 }

+ 1 - 4
app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java
Просмотреть файл 

@@ -626,8 +626,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
 
 
             MyDbManager.getInstance().removeAppRecord();//删除记录表 5.0及以下使用
 
             MyDbManager.getInstance().removeAppRecord();//删除记录表 5.0及以下使用
 
             AutoTaskListUtil.getInstance().resetReceiveTaskTime();//重置比对时间  5.1及以上使用
 
             AutoTaskListUtil.getInstance().resetReceiveTaskTime();//重置比对时间  5.1及以上使用
 
-            
-            LogUtil.println("MonitorAppService runTime = "+runTime);
 
+
 
             object.put("task_time", runTime/1000);
 
             object.put("task_time", runTime/1000);
 
             object.put("release_task_id", taskReleaseEty.getId());
 
             object.put("release_task_id", taskReleaseEty.getId());
 
             SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
 
             SheepApp.getInstance().getNetComponent().getApiService().commitAutoTask(object)
 
@@ -636,7 +635,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
                     .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
 
                     .subscribe(new SheepSubscriber<BaseMessage>(getApplicationContext()) {
 
                         @Override
 
                         @Override
 
                         public void onNext(BaseMessage baseMessage) {
 
                         public void onNext(BaseMessage baseMessage) {
 
-                            LogUtil.println("MonitorAppService baseMessage onNext "+ JSON.toJSONString(baseMessage));
 
                             CommonUtil.getInstance().setTAskEnty(null);
 
                             CommonUtil.getInstance().setTAskEnty(null);
 
                             String amount = taskReleaseEty.getBonus();
 
                             String amount = taskReleaseEty.getBonus();
 
                             try{
 
                             try{
 
@@ -653,7 +651,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
 
 
                         @Override
 
                         @Override
 
                         public void onError(BaseMessage baseMessage) {
 
                         public void onError(BaseMessage baseMessage) {
 
-                            LogUtil.println("MonitorAppService baseMessage onError "+JSON.toJSONString(baseMessage));
 
                             G.showToast("该任务时长未达到，请继续去体验应用哦！");
 
                             G.showToast("该任务时长未达到，请继续去体验应用哦！");
 
                         }
 
                         }
 
                     });
 
                     });

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/adapter/TryMakeMoneyAdp.java
Просмотреть файл 

@@ -306,7 +306,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                             return;
 
                             return;
 
                         }
 
                         }
 
                         Jump2View.getInstance().goGameTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id(),1);
 
                         Jump2View.getInstance().goGameTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id(),1);
 
-                        UMConfigUtils.IdEvent.TASK.commit(item.getId());
 
+                        UMConfigUtils.IdEvent.TASK.commit(item.getRelease_task_id());
 
 
 
                     }
 
                     }
 
                 });
 
                 });

+ 20 - 6
app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java
Просмотреть файл 

@@ -250,10 +250,20 @@ public class FloatService extends Service {
 
         params = new WindowManager.LayoutParams();
 
         params = new WindowManager.LayoutParams();
 
 
 
         // 设置window type
 
         // 设置window type
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){//6.0
 
-            params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 
-        }else {
 
-            params.type =  WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
 
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O){//6.0
 
+//            params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 
+//        }else {
 
+//            params.type =  WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
 
+//        }
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
 
+            //  大于等于 24 即为 7.0 及以上执行内容
 
+            Log.e("qx", "7.0");
 
+            params.type = WindowManager.LayoutParams.TYPE_PHONE; // 7.1
 
+        } else {
 
+            //  低于 24 即为 7.0 以下执行内容
 
+            params.type = WindowManager.LayoutParams.TYPE_TOAST;   // 4.4
 
+            Log.e("qx", "4.4");
 
+
 
         }
 
         }
 
         /*
 
         /*
 
          * 如果设置为params.type = WindowManager.LayoutParams.TYPE_PHONE; 那么优先级会降低一些,
 
          * 如果设置为params.type = WindowManager.LayoutParams.TYPE_PHONE; 那么优先级会降低一些,
 
@@ -320,7 +330,11 @@ public class FloatService extends Service {
 
         params.height = WindowManager.LayoutParams.WRAP_CONTENT;
 
         params.height = WindowManager.LayoutParams.WRAP_CONTENT;
 
         params.gravity = Gravity.START | Gravity.BOTTOM;
 
         params.gravity = Gravity.START | Gravity.BOTTOM;
 
 
 
-        wm.addView(floatView, params);
 
-        isAdded = true;
 
+        try{
 
+            wm.addView(floatView, params);
 
+            isAdded = true;
 
+        }catch (Exception e){
 
+            e.printStackTrace();
 
+        }
 
     }
 
     }
 
 }
 
 }