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

app/src/main/java/com/kfzs/duanduan/utils/dlg/DeviceUtils.java

@@ -1,10 +1,12 @@
 package com.kfzs.duanduan.utils.dlg;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
+import android.support.v4.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
@@ -88,12 +90,10 @@ public class DeviceUtils {
     }
 
 
-
-
     public String getIMEI() {
         try {
             return phone.getDeviceId();
-        }catch (Exception e){
+        } catch (Exception e) {
             return "";
         }
     }
@@ -145,8 +145,18 @@ public class DeviceUtils {
         new Configer().put(Configer.IMEI, iemi).commit();
     }
 
-    public String getIMSI() {
+    public String getIMSI(Context context) {
         try {
+            if (ActivityCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
+                // TODO: Consider calling
+                //    ActivityCompat#requestPermissions
+                // here to request the missing permissions, and then overriding
+                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                //                                          int[] grantResults)
+                // to handle the case where the user grants the permission. See the documentation
+                // for ActivityCompat#requestPermissions for more details.
+                return "";
+            }
             return phone.getSubscriberId();
         }catch (Exception e){
             return "";

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

@@ -1516,8 +1516,8 @@ public class CommonUtil {
      *  id 用户uid
      */
     public void initMiDong(Activity activity, String id){
-        if(!PreferenceUtils.getPrefBoolean(activity, "init_midong_key", false)){
-            PreferenceUtils.setPrefBoolean(activity, "init_midong_key", true);
+        if(!SheepApp.getInstance().isInitMidong()){
+            SheepApp.getInstance().setInitMidong(true);
             AdManager.getInstance(activity).init(activity, "40",id+"");
         }
     }

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

@@ -36,6 +36,7 @@ import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.DeviceUtils;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.ShareAction;
@@ -285,7 +286,7 @@ public class TestUtil {
      * @param activity
      */
     public static void test(final Activity activity) {
-        final String[] items = {"复制token","复制打点数据","测试可用金额","测试定位信息","测试apk的渠道","幂动科技","游戏搜索","游戏帐号","游戏代充","尝试开启第三方应用使用情况","测试代理页面","第三方应用使用情况",
+        final String[] items = {"复制token","复制imsi","复制打点数据","测试可用金额","测试定位信息","测试apk的渠道","幂动科技","游戏搜索","游戏帐号","游戏代充","尝试开启第三方应用使用情况","测试代理页面","第三方应用使用情况",
                 "开启第三方应用使用情况","h5跳转","新手对话框","md5","空间不足提示框",
                 "显示已经安装应用列表","复制faq地址","复制代理地址","复制世界杯地址","任务游戏列表","世界杯活动","交通银行信用卡测试",
                 "浦发银行信用卡测试", "测试游戏模块","打卡成功提示","定向货币详情","进入绑定身份认证界面时的提示","提交身份认证时的提示", "检查标签",
@@ -365,6 +366,10 @@ public class TestUtil {
                             case "复制token":
                                 StringUtils.CopyText(SpUtils.getOpenId(activity));
                                 break;
+                            case "复制imsi":
+                                StringUtils.CopyText(new DeviceUtils(activity).getIMEI());
+                                G.showToast(AppUtil.getDeviceId(activity));
+                                break;
                             case "复制faq地址":
                                 copyUrl("faqurl");
                                 break;

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

@@ -13,18 +13,25 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
 import com.kfzs.duanduan.fragment.FgtMiDong;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
+import com.mdad.sdk.mdsdk.AdManager;
+import com.mdad.sdk.mdsdk.AppDownloadListener;
+import com.mdad.sdk.mdsdk.RewardListener;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import org.afinal.simplecache.ACache;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
 import java.lang.reflect.Field;
 import java.util.List;
+import java.util.Locale;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -92,6 +99,45 @@ public class ActMiDong extends BaseActivity {
 
         CommonUtil.getInstance()
             .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");
+                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
+            }
+
+            @Override
+            public void onDownloadFail(int id) {
+                LogUtil.println("AdManager","onDownloadFail", id);
+                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), id), "onDownloadFail");
+                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
+            }
+
+            @Override
+            public void onDownloadSuccess(int id) {//没有收到回调
+                LogUtil.println("AdManager","onDownloadSuccess", id);
+                ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", 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");
+                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
+
+            }
+
+            @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");
+                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
+
+            }
+        });
     }
 
 

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

@@ -86,7 +86,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     @BindView(R.id.detail_task_listview)
     MyListview detail_task_listview;
     @BindView(R.id.item_layout)
-    RelativeLayout item_layout;
+    View item_layout;
     private Activity activity;
 
     private TaskEty taskEty;

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -53,6 +53,15 @@ public class SheepApp extends BaseApplication {
     private NetComponent netComponent;
     private boolean isShowQB;
     private String packgeName;
+    private boolean isInitMidong = false;
+
+    public boolean isInitMidong() {
+        return isInitMidong;
+    }
+
+    public void setInitMidong(boolean initMidong) {
+        isInitMidong = initMidong;
+    }
 
     public String getPackgeName() {
         return packgeName;
@@ -101,28 +110,6 @@ public class SheepApp extends BaseApplication {
             registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
             initNet();
 
-            AdManager.getInstance(mContext).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");
-                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
-                }
-
-                @Override
-                public void onDownloadFail(int id) {
-                    LogUtil.println("AdManager","onDownloadFail", id);
-                    ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), id), "onDownloadFail");
-                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
-                }
-
-                @Override
-                public void onDownloadSuccess(int id) {//没有收到回调
-                    LogUtil.println("AdManager","onDownloadSuccess", id);
-                    ACache.get(SheepApp.getInstance()).put(String.format(Locale.CHINA, "%s%d", AdManager.class.getSimpleName(), id), "onDownloadSuccess");
-                    EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.REFRESH_MING_DONG));
-                }
-            });
         }
     }
 
@@ -205,7 +192,6 @@ public class SheepApp extends BaseApplication {
             if(mActivityAount == 0) {
                 LogUtil.println("SheepApp SHEEP_STOP");
                 UMConfigUtils.Event.SHEEP_STOP.onEvent();
-                PreferenceUtils.setPrefBoolean(mContext, "init_midong_key", false);
             }
         }
     };

app/src/main/java/com/sheep/jiuyan/samllsheep/utils/DeviceUtils.java

@@ -1,9 +1,12 @@
 package com.sheep.jiuyan.samllsheep.utils;
 
+import android.Manifest;
 import android.content.Context;
 
+import android.content.pm.PackageManager;
 import android.net.wifi.WifiManager;
 
+import android.support.v4.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 
 
@@ -29,6 +32,16 @@ public class DeviceUtils {
 
     public String getIMEI() {
         try {
+            if (ActivityCompat.checkSelfPermission(mContext, Manifest.permission.READ_PHONE_STATE) != PackageManager.PERMISSION_GRANTED) {
+                // TODO: Consider calling
+                //    ActivityCompat#requestPermissions
+                // here to request the missing permissions, and then overriding
+                //   public void onRequestPermissionsResult(int requestCode, String[] permissions,
+                //                                          int[] grantResults)
+                // to handle the case where the user grants the permission. See the documentation
+                // for ActivityCompat#requestPermissions for more details.
+                return "";
+            }
             return phone.getDeviceId();
         } catch (Exception e) {
             return "";