小绵羊2.6.2

app/src/main/java/com/sheep/gamegroup/model/entity/RechargeLogEntity.java

@@ -159,7 +159,7 @@ public class RechargeLogEntity implements ILog {
 
     @Override
     public boolean isEventSuccess() {
-        return type== 2;
+        return type== 1;
     }
 
     @Override

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

@@ -522,7 +522,7 @@ public class SysAppUtil {
      * bugly 检查更新
      */
     public static  boolean checkBuglyUpdate(){
-        Beta.checkUpgrade();
+//        Beta.checkUpgrade();
         UpgradeInfo upgradeInfo = Beta.getUpgradeInfo();
         if(upgradeInfo != null)
             return true;

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

@@ -213,14 +213,20 @@ public class WebviewJs {
         } else {
             switch (downLoadInfo.getMStatus()){
                 case 2:
+                case 4:
                     G.showToast("正在下载中...");
                     break;
+                case 3:
+//                    G.showToast("下载完成");
+                    break;
                 default:
                     G.showToast("开始下载中!");
+                    downLoadInfo.setMStatus(2);
                     break;
             }
 
             mDownloadTaskService.start(downLoadInfo);
+            mDownloadTaskService.addDownloadTask(downLoadInfo);
             final DownLoadInfo finalDownLoadInfo = downLoadInfo;
             new Thread(new Runnable() {
                 @Override

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskdetailSonListviewAdp.java

@@ -217,18 +217,19 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                     screens_iv.setAdjustViewBounds(true);
                     screens_iv.setScaleType(ImageView.ScaleType.FIT_XY);
 
-                    viewHolder.itemView.setLayoutParams(new LinearLayout.LayoutParams(with, with));
+                    screens_iv.setLayoutParams(new LinearLayout.LayoutParams(with, with-50));
 
                     if(TextUtils.isEmpty(taskDescEntity.getDesc())){
                         screens_tv.setVisibility(View.GONE);
                     }else {
                         screens_tv.setVisibility(View.VISIBLE);
                         screens_tv.setText("" + taskDescEntity.getDesc());
+                        screens_tv.setMaxWidth(with);
                     }
 
                     Glide.with(context)
                             .load(taskDescEntity.getImg())
-                            .apply(new RequestOptions().override(with, with))
+                            .apply(new RequestOptions().override(with, with-50))
                             .into(screens_iv);
                     screens_iv.setOnClickListener(new View.OnClickListener() {
                         @Override

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

@@ -91,7 +91,7 @@ public class SheepApp extends BaseApplication {
             registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
             initGoble();
             initNet();
-            Beta.autoCheckUpgrade = false;
+//            Beta.autoCheckUpgrade = false;
             Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);
         }
     }

app/src/main/java/com/sheep/jiuyan/samllsheep/service/FloatService.java

@@ -250,7 +250,11 @@ public class FloatService extends Service {
         params = new WindowManager.LayoutParams();
 
         // 设置window type
-        params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){//6.0
+            params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+        }else {
+            params.type =  WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
+        }
         /*
          * 如果设置为params.type = WindowManager.LayoutParams.TYPE_PHONE; 那么优先级会降低一些,
          * 即拉下通知栏不可见

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

@@ -187,7 +187,7 @@ public class SpUtils {
     }
     public static String getIgnoreMd5() {
         SharedPreferences user = SheepApp.getInstance().getSharedPreferences("save_data", Context.MODE_PRIVATE);
-        return user.getString("ignore_md5", null);
+        return user.getString("ignore_md5", "");
     }
 
     /**

app/src/main/res/layout/taskdetail_desc_item_screens.xml

@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:text=""
+        android:text="111"
         android:lines="1"
         android:ellipsize="end"
         android:layout_marginTop="@dimen/content_padding_small"

datashare/src/main/java/com/kfzs/duanduan/datashare/provider/download/DownLoadInfo.java

@@ -162,7 +162,7 @@ public class DownLoadInfo implements Serializable{
     }
 
     public Integer getMStatus() {
-        return this.mStatus;
+        return this.mStatus == null ? 0 : this.mStatus;
     }
 
     public void setMStatus(Integer mStatus) {