midong update

.idea/gradle.xml

@@ -8,23 +8,6 @@
         </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/WaterWaveProgress" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/joevideolib" />
-            <option value="$PROJECT_DIR$/media/app" />
-            <option value="$PROJECT_DIR$/media/cge_library" />
-            <option value="$PROJECT_DIR$/media/share_library" />
-            <option value="$PROJECT_DIR$/shortcut_lib" />
-            <option value="$PROJECT_DIR$/skin-support" />
-            <option value="$PROJECT_DIR$/skin_christmas" />
-            <option value="$PROJECT_DIR$/skin_newYear" />
-            <option value="$PROJECT_DIR$/ucrop" />
-            <option value="$PROJECT_DIR$/view" />
-          </set>
-        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>

.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

app/build.gradle

@@ -160,7 +160,7 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
 
-    //    implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.code.gson:gson:2.8.2'
 
     //    implementation 'com.shark:screencapture:1.0.0'
     implementation('com.jcodecraeer:xrecyclerview:1.5.9') {
@@ -331,9 +331,7 @@ dependencies {
     implementation files('libs/BaiduLBS_Android.jar')
 
     //幂动科技
-
-    //    implementation files('libs/mdsdk_1123_1.2.1.12.jar')
-    implementation files('libs/mdsdk_1115_1.2.1.9.jar')
+    implementation(name: 'mdsdk_1031_1_3_7_4', ext: 'aar')
 
     //轮播图
     implementation 'com.youth.banner:banner:1.4.10'

app/src/main/AndroidManifest.xml

@@ -837,10 +837,6 @@
             android:name="com.sheep.gamegroup.view.activity.ActInvitation"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" /> <!-- start幂动科技 -->
-        <service
-            android:name="com.mdad.sdk.mdsdk.monitor.MonitorService"
-            android:enabled="true"
-            android:priority="1000" />
 
         <receiver
             android:name="com.mdad.sdk.mdsdk.AppInstallReceiver"
@@ -854,15 +850,6 @@
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
-        <receiver
-            android:name="com.mdad.sdk.mdsdk.DownloadCompleteReceiver"
-            android:enabled="true"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
-                <action android:name="android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED" />
-            </intent-filter>
-        </receiver> <!-- end幂动科技 -->
         <!-- start 小绵羊sdk相关 -->
         <activity
             android:name="com.sheep.gamegroup.view.activity.ActPay"

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

@@ -72,8 +72,10 @@ public class ActMiDong extends BaseActivity {
     public void initListener() {
 
     }
+
     private int curPosition = 0;
     private List<BaseFragment> fgtMiDongList = ListUtil.emptyList();
+
     @Override
     public void initData() {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
@@ -116,7 +118,7 @@ public class ActMiDong extends BaseActivity {
 
             @Override
             public void onDownloadFail(String id) {
-                LogUtil.println("AdManager","onDownloadFail", id);
+                LogUtil.println("AdManager", "onDownloadFail", id);
                 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));
 
@@ -124,16 +126,21 @@ public class ActMiDong extends BaseActivity {
 
             @Override
             public void onDownloadSuccess(String id) {//没有收到回调
-                LogUtil.println("AdManager","onDownloadSuccess", id);
+                LogUtil.println("AdManager", "onDownloadSuccess", id);
                 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));
 
             }
+
+            @Override
+            public void onProgressUpdate(String s, int i) {
+                LogUtil.println("AdManager", "onProgressUpdate", s + " " + i);
+            }
         });
         AdManager.getInstance(SheepApp.getInstance()).setRewardListener(new RewardListener() {
             @Override
             public void doTaskSuccess(String s) {
-                LogUtil.println("AdManager","onDownloadFail", s);
+                LogUtil.println("AdManager", "onDownloadFail", s);
                 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));
 
@@ -141,7 +148,7 @@ public class ActMiDong extends BaseActivity {
 
             @Override
             public void doTaskFail(String s) {
-                LogUtil.println("AdManager","onDownloadFail", s);
+                LogUtil.println("AdManager", "onDownloadFail", s);
                 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));
 
@@ -153,8 +160,8 @@ public class ActMiDong extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if(!EventBus.getDefault().isRegistered(this))
-             EventBus.getDefault().register(this);
+        if (!EventBus.getDefault().isRegistered(this))
+            EventBus.getDefault().register(this);
     }
 
     @Override
@@ -163,16 +170,16 @@ public class ActMiDong extends BaseActivity {
         AdManager.getInstance(SheepApp.getInstance()).setRewardListener(null);
         fgtMiDongList.clear();
         super.onDestroy();
-        if(EventBus.getDefault().isRegistered(this))
+        if (EventBus.getDefault().isRegistered(this))
             EventBus.getDefault().unregister(this);
     }
 
     @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
             case REFRESH_MING_DONG:
                 BaseFragment item = ListUtil.getItem(fgtMiDongList, curPosition);
-                if(item instanceof FgtMiDongAdTskList || item instanceof FgtMiDongSignTskList){
+                if (item instanceof FgtMiDongAdTskList || item instanceof FgtMiDongSignTskList) {
                     ((BaseListFragment) item).refreshData();
                 }
                 break;

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMiDongAdTskList.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.fragment;
 
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 
 import com.alibaba.fastjson.JSON;
 import com.mdad.sdk.mdsdk.AdManager;