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

app/src/main/AndroidManifest.xml

@@ -15,7 +15,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.GET_TASKS"/>
-    <uses-permission android:name="android.permission.READ_LOGS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>

app/src/main/java/com/kfzs/duanduan/KFZSApp.java

@@ -282,10 +282,4 @@ public class KFZSApp extends MultiDexApplication{
         stopDownloadService();
     }
 
-
-    @Override
-    protected void attachBaseContext(Context base) {
-        super.attachBaseContext(base);
-        MultiDex.install(this);
-    }
 }

app/src/main/java/com/sheep/gamegroup/model/util/AddPuplicParameIntercept.java

@@ -57,7 +57,7 @@ public class AddPuplicParameIntercept implements Interceptor {
         if (method.equals("POST") || method.equals("PUT") ) {
             RequestBody requestBody = oldRequest.body();
             if (requestBody instanceof FormBody) {
-            } else {
+            } else if (requestBody != null){
                 //buffer流
                 Buffer buffer = new Buffer();
                 try {

app/src/main/java/com/sheep/gamegroup/statistics/AppStatistics.java

@@ -48,12 +48,12 @@ public class AppStatistics {
      */
     synchronized public void sendDataToServer(int type,int subType,String subString){
         String openid = PreferenceUtils.getPrefString(SheepApp.mContext, UMConfigUtils.LOGIN_OPENID,"");
-
+        int uid = android.text.TextUtils.isEmpty(openid)?0:Integer.valueOf(openid);
         String deviceId = DeviceUtil.getDeviceId(SheepApp.mContext);
         ApiService apiService =SheepApp.getInstance().getNetComponent().getApiService();
         JSONObject jsonObject = new JSONObject();
         //openid要转换成int类型
-        jsonObject.put("uid",android.text.TextUtils.isEmpty(openid)?0:Integer.valueOf(openid));
+        jsonObject.put("uid",uid);
         jsonObject.put("type",type);
         jsonObject.put("subtype",subType);
         jsonObject.put("substring",subString);

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

@@ -161,7 +161,7 @@ public class TaskDetailAct extends BaseActivity implements TaskDetailContract.Vi
 
         taskSchedule();
 
-        if (taskEty.getRunTask() == 0 || taskEty.getInspect_type() == 2){
+        if (taskEty.getRunTask() == 0 || taskEty.getInspect_type() == 1){
             detailTaskTv.setVisibility(View.INVISIBLE);
             bottom_btn_layout.setVisibility(View.GONE);
         }else {