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

app/src/main/AndroidManifest.xml

@@ -44,9 +44,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission
-        android:name="android.permission.PACKAGE_USAGE_STATS"
-        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <!--必须的权限配置-->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -163,7 +160,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
+                android:resource="@xml/file_paths" />
 
         </provider>
 
@@ -680,16 +677,6 @@
             android:name="com.mdad.sdk.mdsdk.monitor.MonitorService"
             android:enabled="true"
             android:priority="1000" />
-        <service
-            android:name="com.mdad.sdk.mdsdk.monitor.DetectionService"
-            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_config" />
-        </service>
 
 
         <receiver

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

@@ -18,6 +18,8 @@ import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.Container;
 import com.sheep.gamegroup.model.entity.SystemNotification;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.DrawablesHelper;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MainTab;
@@ -78,6 +80,8 @@ public class ActMain extends BaseActivity {
             main_layout.setPadding(0, 0, 0, G.getHasVirtualKey(this) -G.getNoHasVirtualKey(this) );
 
         }
+
+        CommonUtil.getInstance().initMiDong(this, DataUtil.getInstance().getUserId());
     }
 
     @Override

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

@@ -104,31 +104,34 @@ public class ActMiDong extends BaseActivity {
             .reflex(indicator, activity);
         AdManager.getInstance(activity).setDownloadListener(new AppDownloadListener() {
             @Override
-            public void onDownloadStart(int id) {
-                LogUtil.println("AdManager", "onDownloadStart", id);
-                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), id), "onDownloadStart");
+            public void onDownloadStart(String s) {
+                LogUtil.println("AdManager", "onDownloadStart", s);
+                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%s", AdManager.class.getSimpleName(), s), "onDownloadStart");
                 EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
+
             }
 
             @Override
-            public void onDownloadFail(int id) {
+            public void onDownloadFail(String id) {
                 LogUtil.println("AdManager","onDownloadFail", id);
-                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), id), "onDownloadFail");
+                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%s", AdManager.class.getSimpleName(), id), "onDownloadFail");
                 EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
+
             }
 
             @Override
-            public void onDownloadSuccess(int id) {//没有收到回调
+            public void onDownloadSuccess(String id) {//没有收到回调
                 LogUtil.println("AdManager","onDownloadSuccess", id);
-                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), id), "onDownloadSuccess");
+                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%s", AdManager.class.getSimpleName(), id), "onDownloadSuccess");
                 EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
+
             }
         });
         AdManager.getInstance(activity).setRewardListener(new RewardListener() {
             @Override
             public void doTaskSuccess(String s) {
                 LogUtil.println("AdManager","onDownloadFail", s);
-                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), s), "doTaskSuccess");
+                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%s", AdManager.class.getSimpleName(), s), "doTaskSuccess");
                 EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
 
             }
@@ -136,7 +139,7 @@ public class ActMiDong extends BaseActivity {
             @Override
             public void doTaskFail(String s) {
                 LogUtil.println("AdManager","onDownloadFail", s);
-                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), s), "doTaskFail");
+                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%s", AdManager.class.getSimpleName(), s), "doTaskFail");
                 EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
 
             }

app/src/main/res/xml/file_paths.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <paths>
-        <external-path name="download" path="."/>
-    </paths>
-</resources>
+    <cache-path path="." name="apk1"/>
+
+    <external-path path="Android/data/com.sponsor.hbhunter/" name="files_root"/>
+
+    <external-path path="." name="external_storage_root"/>
+    <external-path path="" name="Download"/>
+    <external-path name="download" path="."/>
+</resources>