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

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -190,6 +190,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     refalsh();
                     break;
                 case 1:
+                    tryMakeMoneyAdp.setIs_succession(3);
                     if(releaseEtyLists != null && releaseEtyLists.size()>0){
 
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position>2?1:position);

app/src/main/java/com/kfzs/duanduan/services/DownloadTaskService.java

@@ -1,5 +1,6 @@
 package com.kfzs.duanduan.services;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
 import android.text.TextUtils;
@@ -9,9 +10,15 @@ import com.arialyy.aria.core.download.DownloadTarget;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.NetUtil;
+import com.sheep.gamegroup.view.dialog.DialogAccountAbnormal;
+import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import java.io.File;
 import java.util.List;
@@ -344,6 +351,22 @@ public class DownloadTaskService {
 
 
     public void start(DownLoadInfo downLoadInfo) {
+
+                if(!SpUtils.getDownNotice(SheepApp.mContext)
+                       && NetUtil.isConnected(SheepApp.mContext)
+                       && NetUtil.isMobile(SheepApp.mContext)){
+                    SpUtils.saveDownNotice(SheepApp.mContext, false);
+
+                    Jump2View.getInstance()
+                            .goNoticeAct(SheepApp.mContext, new DialogEntity(null,
+                                    "当前网络处于非WIFI状态，确定下载吗？",
+                                    "不再提示",
+                                    "确定",
+                                    null,
+                                    null,
+                                    downLoadInfo));
+                    return;
+                }
         DownloadTarget task = Aria.download(KFZSApp.getInstance()).load(downLoadInfo.getMDownloadUrl());
         String filePath = DIR+ File.separator+downLoadInfo.getMPackageName()+ ClassFileHelper.FILE_SUFFIX;
         if(TextUtils.isEmpty(downLoadInfo.getMPackageName())){

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

@@ -1,5 +1,6 @@
 package com.sheep.gamegroup.model.entity;
 
+import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.EventTypes;
 
 import java.io.Serializable;
@@ -17,6 +18,7 @@ public class DialogEntity implements Serializable {
     private String cancel;
     private String busType;
     private EventTypes eventTypes;
+    private DownLoadInfo downLoadInfo;
 
     public DialogEntity(String title, String context, String sure, String cancel, EventTypes eventTypes) {
         this.title = title;
@@ -26,6 +28,24 @@ public class DialogEntity implements Serializable {
         this.eventTypes = eventTypes;
     }
 
+    public DialogEntity(String title, String context, String sure, String cancel, String busType, EventTypes eventTypes, DownLoadInfo downLoadInfo) {
+        this.title = title;
+        this.context = context;
+        this.sure = sure;
+        this.cancel = cancel;
+        this.busType = busType;
+        this.eventTypes = eventTypes;
+        this.downLoadInfo = downLoadInfo;
+    }
+
+    public DownLoadInfo getDownLoadInfo() {
+        return downLoadInfo;
+    }
+
+    public void setDownLoadInfo(DownLoadInfo downLoadInfo) {
+        this.downLoadInfo = downLoadInfo;
+    }
+
     public EventTypes getEventTypes() {
         return eventTypes;
     }

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

@@ -71,7 +71,7 @@ public class ExceptionHandle {
             return ex;
         } else {
             ex = new ResponeThrowable(e, ERROR.UNKNOWN);
-            ex.message = "未知错误";
+            ex.message = "服务器错误";//未知错误
             return ex;
         }
     }

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

@@ -545,7 +545,13 @@ public class Jump2View {
     public void goNoticeAct(Context context, DialogEntity o){
         Intent i = new Intent(context, DialogToastAct.class);
         i.putExtra("dialog_entity", o);
-        ((Activity)context).startActivityForResult(i,0);
+        if(context instanceof Activity){
+            ((Activity)context).startActivityForResult(i,0);
+        }else {
+            i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            context.startActivity(i);
+        }
+
     }
 
     /**

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

@@ -239,8 +239,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         task.resetState();
                         task.removeRecord();
                     } else {
-                        task.setFilePath(filePath);
-                        task.start();
+//                        task.setFilePath(filePath);
+//                        task.start();
+                        mDownloadTaskService.start(downLoadInfo);
                     }
                     new Thread(new Runnable() {
                         @Override
@@ -268,8 +269,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         ApkUtils.installApk(activity, filePath);
                     }else{
                         task.resetState();
-                        task.setFilePath(filePath);
-                        task.start();
+//                        task.setFilePath(filePath);
+//                        task.start();
+                        mDownloadTaskService.start(downLoadInfo);
                         type = 2;
                     }
                     break;

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

@@ -10,8 +10,10 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.services.DownloadTaskService;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import org.greenrobot.eventbus.EventBus;
 
@@ -39,13 +41,18 @@ public class DialogToastAct extends Activity {
     ImageView dialogClose;
 
     private DialogEntity dialog_entity;
+    private Activity activity;
+    DownloadTaskService mDownloadTaskService;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.dialog_notice_layout);
         ButterKnife.bind(this);
+        activity = this;
         dialog_entity = (DialogEntity) getIntent().getSerializableExtra("dialog_entity");
+
+        mDownloadTaskService = new DownloadTaskService(activity);
         initView();
     }
 
@@ -64,16 +71,19 @@ public class DialogToastAct extends Activity {
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.dialog_action:
+                downLoadValue(false);
                 finish();
                 break;
             case R.id.dialog_sure:
                 if(dialog_entity.getEventTypes() != null){
                     EventBus.getDefault().post(new BigEvent().setEventTypes(dialog_entity.getEventTypes()));
                 }
+                downLoadValue(true);
                 setResult(RESULT_OK);
                 finish();
                 break;
             case R.id.dialog_close:
+                downLoadValue(false);
                 finish();
                 break;
         }
@@ -90,4 +100,14 @@ public class DialogToastAct extends Activity {
             view.setVisibility(View.GONE);
         }
     }
+    /**
+     * 是否是下载过来的
+     */
+    private void downLoadValue(boolean flag){
+        if(dialog_entity.getDownLoadInfo() == null){
+            return;
+        }
+        SpUtils.saveDownNotice(activity, flag);
+        mDownloadTaskService.start(dialog_entity.getDownLoadInfo());
+    }
 }

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

@@ -431,8 +431,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             task.resetState();
                             task.removeRecord();
                         } else {
-                            task.setFilePath(filePath);
-                            task.start();
+//                            task.setFilePath(filePath);
+//                            task.start();
+                            mDownloadTaskService.start(downLoadInfo);
                         }
                         new Thread(new Runnable() {
                             @Override

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

@@ -326,7 +326,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.detail_task_tv)).setText("取消任务");
 
-                if(is_succession == 1
+                if((is_succession == 1 || is_succession == 3)
                         &&  (etyList.get(i).getChild_task_id() > 1
                                 || (etyList.get(i).getChild_task_id() == 1
                         && (etyList.get(i).getStatus() == 6 || etyList.get(i).getStatus() == 9)))

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogAccountAbnormal.java

@@ -1,14 +1,17 @@
 package com.sheep.gamegroup.view.dialog;
 
 import android.app.Activity;
+import android.content.Context;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.event.EventTypes;
+import com.kfzs.duanduan.services.DownloadTaskService;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.jiuyan.samllsheep.R;
@@ -53,10 +56,13 @@ public class DialogAccountAbnormal {
         }
         return mAlertDialog;
     }
-    public static boolean showDialog(final Activity activity,String title, String content, String cancel, String sure) {
+    public static boolean showDialog(final Activity activity, String title, String content, String cancel, String sure, final DownLoadInfo downLoadInfo) {
         final boolean[] flag = {false};
+
+        final DownloadTaskService mDownloadTaskService = new DownloadTaskService(activity);
+
             View view = View.inflate(activity, R.layout.diag_account_abnormal, null);
-        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+        final AlertDialog mAlertDialog = new AlertDialog.Builder(activity)
                     .setView(view)
                     .create();
         if(TextUtils.isEmpty(title)){
@@ -76,7 +82,8 @@ public class DialogAccountAbnormal {
                     public void onClick(View v) {
                         mAlertDialog.dismiss();
                         flag[0] = true;
-                        SpUtils.saveClick(activity, true);
+                        SpUtils.saveDownNotice(activity, true);
+                        mDownloadTaskService.start(downLoadInfo);
                     }
                 });
         ImageView dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
@@ -85,7 +92,7 @@ public class DialogAccountAbnormal {
                     public void onClick(View v) {
                         mAlertDialog.dismiss();
                         flag[0] = false;
-                        SpUtils.saveClick(activity, false);
+                        SpUtils.saveDownNotice(activity, false);
                     }
                 });
         TextView dialog_action = ViewFindUtils.find(view, R.id.dialog_action);
@@ -95,7 +102,8 @@ public class DialogAccountAbnormal {
                     public void onClick(View v) {
                         mAlertDialog.dismiss();
                         flag[0] = false;
-                        SpUtils.saveClick(activity, false);
+                        SpUtils.saveDownNotice(activity, false);
+                        mDownloadTaskService.start(downLoadInfo);
 
 //                        EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.DIALOG_ACTIVITY_DOWNLOAD_FILE));
                     }

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

@@ -247,7 +247,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 
     @Override
     public void giveUpTaskFailView(Object o) {
-        G.showToast("访问失败");
+        try {
+            BaseMessage baseMessage = (BaseMessage) o;
+            G.showToast(baseMessage.getMsg()+"");
+        }catch (Exception e){
+            e.printStackTrace();
+        }
     }
 
     @Override

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

@@ -108,7 +108,7 @@ public class SheepApp extends BaseApplication {
             mContext = getApplicationContext();
             mSheepApp = this;
             String flavor = SharedPreferences.getInstance().getString("flavor", BuildConfig.FLAVOR);
-            if("sheep".equals(BuildConfig.FLAVOR)){
+            if("sheep".equals(BuildConfig.FLAVOR) && !BuildConfig.DEBUG){
                 flavor = BuildConfig.FLAVOR;
             }
             connectAddress = ConnectAddress.valueOf(flavor);

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

@@ -114,6 +114,24 @@ public class SpUtils {
         return user.getBoolean("click", false);
     }
 
+    /**
+     * 点击事件 记录,是否在提示
+     * @param context
+     * @param vaule
+     */
+    public static void saveDownNotice(Context context, boolean vaule) {
+        SharedPreferences user = context.getSharedPreferences("btn_download_notice", Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = user.edit();
+        editor.putBoolean("notice_down", vaule);
+        editor.apply();
+    }
+
+
+    public static boolean getDownNotice(Context context) {
+        SharedPreferences user = context.getSharedPreferences("btn_download_notice", Context.MODE_PRIVATE);
+        return user.getBoolean("notice_down", false);
+    }
+
 
 
 

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

@@ -17,12 +17,12 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="·第一天签到任务"
-            android:layout_centerVertical="true"
             android:adjustViewBounds="true"
-            style="@style/nomal_txt_style"
+            style="@style/txt_style_15"
             android:lines="1"
             android:ellipsize="end"
             android:maxWidth="@dimen/view_size_200"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintRight_toLeftOf="@+id/item_detail_tv"/>
         <TextView

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

@@ -9,6 +9,8 @@ import org.greenrobot.greendao.annotation.Property;
 import org.greenrobot.greendao.annotation.Unique;
 import org.greenrobot.greendao.annotation.Generated;
 
+import java.io.Serializable;
+
 /**
  * download task info
  *
@@ -16,7 +18,7 @@ import org.greenrobot.greendao.annotation.Generated;
  * @date 2017/6/13   0:13
  **/
 @Entity
-public class DownLoadInfo {
+public class DownLoadInfo implements Serializable{
 
     /**
      * id