修复部分手机安装apk报错的问题；修复部分手机无法点击新手任务的问题；添加微信辅助任务在首页

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

@@ -32,6 +32,7 @@ import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.ReactUtil;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
@@ -360,7 +361,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     @OnClick({ R.id.user_layout, R.id.withdrawal, R.id.try_play_layout,
-            R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task, R.id.card_layout, R.id.icon_layout, R.id.info_layout})
+            R.id.invitation_layout, R.id.lying_layout, R.id.newbie_task, R.id.card_layout, R.id.icon_layout, R.id.info_layout, R.id.homepage_wxfz})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.user_layout:
@@ -388,6 +389,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 }
                 break;
             case R.id.newbie_task://新手任务
+                if(getActivity() instanceof BaseActivity){
+                    ((BaseActivity) getActivity()).showProgress();
+                }
                 UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST);
                 SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
                         .subscribeOn(Schedulers.io())
@@ -395,16 +399,25 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
                             @Override
                             public void onNext(BaseMessage baseMessage) {
+                                if(getActivity() instanceof BaseActivity){
+                                    ((BaseActivity) getActivity()).hideProgress();
+                                }
                                 List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
                                 DialogNewbieTaskList.showDialog(getActivity(), newbieTaskList);
                             }
 
                             @Override
                             public void onError(BaseMessage baseMessage) {
+                                if(getActivity() instanceof BaseActivity){
+                                    ((BaseActivity) getActivity()).hideProgress();
+                                }
                                 G.showToast(!TextUtils.isEmpty(baseMessage.getMsg()) ? baseMessage.getMsg() : "网络错误，请重启重试");
                             }
                         });
                 break;
+            case R.id.homepage_wxfz://微信辅助任务
+                goWxfz();
+                break;
             case R.id.icon_layout://头像
             case R.id.info_layout://其它信息
                 Jump2View.getInstance().goPersonnalCenterView(activity, null);
@@ -412,6 +425,39 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
     }
 
+    /**
+     * 微信辅助任务
+     */
+    private void goWxfz() {
+        if(getActivity() instanceof BaseActivity){
+            ((BaseActivity) getActivity()).showProgress();
+        }
+        SheepApp.getInstance().getNetComponent().getApiService().wxfzGetUrl()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(getContext()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                if(getActivity() instanceof BaseActivity){
+                                    ((BaseActivity) getActivity()).hideProgress();
+                                }
+                                if(BuildConfig.DEBUG)
+                                    System.out.println("baseMessage onNext "+JSON.toJSONString(baseMessage));
+                                Jump2View.getInstance().goWeb(activity, baseMessage.getData().toString(), "微信二维码辅助好友注册任务");
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                if(getActivity() instanceof BaseActivity){
+                                    ((BaseActivity) getActivity()).hideProgress();
+                                }
+                                if(BuildConfig.DEBUG)
+                                    System.out.println("baseMessage onError "+JSON.toJSONString(baseMessage));
+                                G.showToast(TextUtils.isEmpty(baseMessage.getMsg()) ? "服务器错误，请稍候再试" : baseMessage.getMsg());
+                            }
+                        });
+    }
+
     private NewbieTaskRecord newbie_task_record;
 
     @Override

app/src/main/java/com/kfzs/duanduan/utils/ApkUtils.java

@@ -16,6 +16,7 @@ import android.widget.Toast;
 import com.kfzs.duanduan.KFZSApp;
 import com.sheep.jiuyan.samllsheep.R;
 import com.kfzs.duanduan.bean.CompareResult;
+import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 
 import java.io.File;
 import java.security.MessageDigest;
@@ -81,18 +82,7 @@ public class ApkUtils {
      * @param apkPath apkPath
      */
     public static final void installApk(Context context, String apkPath) {
-        if (TextUtils.isEmpty(apkPath)) {
-            return;
-        }
-        Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        File targetFile = new File(apkPath);
-        if (!targetFile.exists()){
-            Toast.makeText(context, R.string.toast_file_not_found, Toast.LENGTH_SHORT).show();
-            return ;
-        }
-        intent.setDataAndType(Uri.fromFile(targetFile), "application/vnd.android.package-archive");
-        context.startActivity(intent);
+        PackageUtil.installApk(context, apkPath);
     }
 
 

app/src/main/java/com/sheep/jiuyan/samllsheep/base/AbsChooseImageActivity.java

@@ -1,4 +1,4 @@
-package com.sheep.jiuyan.samllsheep.base;
+package com.sheep.gamegroup.absBase;
 
 import android.content.Intent;
 import android.net.Uri;

app/src/main/java/com/sheep/gamegroup/absBase/AppActivity.java

@@ -1,45 +0,0 @@
-package com.sheep.gamegroup.absBase;
-
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-
-/**
- * Created by Administrator on 2018/1/7.
- */
-
-public class AppActivity extends AppCompatActivity{
-    private String mName;
-
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mName = this.getClass().getSimpleName();
-//        SheepApp.mActivitys.put(mName, this);
-    }
-    @Override
-    protected void onResume() {
-        super.onResume();
-
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-//        SheepApp.mActivitys.remove(mName);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    protected void onStop() {
-        super.onStop();
-
-    }
-
-
-}

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.absBase;
 import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.widget.Toast;
 
@@ -14,7 +15,7 @@ import butterknife.ButterKnife;
  * Created by kemllor on 2017/12/15.
  */
 
-public abstract class BaseActivity extends AppActivity  {
+public abstract class BaseActivity extends AppCompatActivity {
 
     protected ProgressDialog  mPd;
 
@@ -32,7 +33,7 @@ public abstract class BaseActivity extends AppActivity  {
     }
 
 
-    protected void  showProgress(){
+    public void  showProgress(){
         if(mPd!=null){
             hideProgress();
         }
@@ -44,9 +45,21 @@ public abstract class BaseActivity extends AppActivity  {
 //        mPd.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
         mPd.show();
     }
+    protected void  showProgress(boolean cancel){
+        if(mPd!=null){
+            hideProgress();
+        }
+        mPd = new ProgressDialog(this);
+//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
+//        mPd.setContentView(view);//自己定义布局
+        mPd.setMessage("数据加载中...");
+        mPd.setCancelable(cancel);//能否够被取消
+//        mPd.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
+        mPd.show();
+    }
 
 
-    protected void  hideProgress(){
+    public void  hideProgress(){
         this.runOnUiThread(new Runnable() {
             @Override
             public void run() {

app/src/main/java/com/sheep/gamegroup/di/components/FgtTryMakeMoneyComponent2.java

@@ -1,17 +0,0 @@
-package com.sheep.gamegroup.di.components;
-
-import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
-import com.sheep.gamegroup.di.scopes.UserScope;
-import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney2;
-
-import dagger.Component;
-
-/**
- * Created by ljy on 2018/4/27.
- */
-
-@UserScope
-@Component(modules = TryMakeMoneyModule.class, dependencies = NetComponent.class)
-public interface FgtTryMakeMoneyComponent2 {
-    void inject(FgtTryMakeMoney2 fgtTryMakeMoney);
-}

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -280,6 +280,11 @@ public interface ApiService {
      */
     @GET("app/bulletin")
     Observable<BaseMessage> bulletin(@Query("page") int page, @Query("per_page") int per_page);
+    /**
+     *
+     */
+    @GET("qr/task/get_url")
+    Observable<BaseMessage> wxfzGetUrl();
 
     /**
      * 获取任务详情

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

@@ -37,8 +37,23 @@ public enum ConnectAddress {
         public String getName() {
             return "正式服";
         }
+    },sheeplishuyang {
+
+        @Override
+        public String getAppUrl() {
+            return "http://10.8.210.170:8080/";
+        }
+        @Override
+        public String getName() {
+            return "李抒阳";
+        }
     };
     public abstract String getAppUrl();
 
     public abstract String getName();
+
+    @Override
+    public String toString() {
+        return getName();
+    }
 }

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

@@ -281,19 +281,6 @@ public class Jump2View {
     }
 
     /**
-     * 跳出弹框页面
-     * @param context
-     * @param curTask
-     * @param runTask
-     */
-    public synchronized void goTaskDetailView(Context context, TaskEty curTask, TaskAcceptedEty runTask){
-        Intent intent = new Intent(context, TaskDetailAct.class);
-        intent.putExtra("task_entity", curTask);
-        intent.putExtra("task_accepted_entity", runTask);
-        context.startActivity(intent);
-        UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
-    }
-    /**
      * 跳转到信用卡任务详情界面
      * @param context
      * @param curTask

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

@@ -1,19 +1,127 @@
 package com.sheep.gamegroup.util;
 
 import android.app.Activity;
+import android.app.DownloadManager;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 import android.view.View;
+import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
+import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import java.io.File;
+
+import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
 
 /**
  * Created by realicing on 2018/5/3.
  * realicing@sina.com
  */
 public class TestUtil {
+
+    public static void setDebugDownLoad(final Context context, View view, final TaskEty taskEty) {
+        view.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View view) {
+                final String[] items = {"复制", "系统下载", "浏览器下载"};
+                AlertDialog dialog = new AlertDialog.Builder(context).setTitle("请选择操作")
+                        .setItems(items, new DialogInterface.OnClickListener() {
+
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                switch (items[which]){
+                                    case "复制":
+                                        debugCopy(context, taskEty);
+                                        break;
+                                    case "系统下载":
+                                        debugSysDownload(context, taskEty);
+                                        break;
+                                    case "浏览器下载":
+                                        debugWebDownload(context, taskEty);
+                                        break;
+                                }
+                            }
+                        }).create();
+                dialog.show();
+                return true;
+            }
+        });
+    }
+
+    private static void debugCopy(final Context context, final TaskEty taskEty) {
+        ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        if(clipboardManager != null && !TextUtils.isEmpty(taskEty.getDownload_link())) {
+            //创建ClipData对象
+            ClipData clipData = ClipData.newPlainText("sheep text copy", taskEty.getDownload_link());
+            //添加ClipData对象到剪切板中
+            clipboardManager.setPrimaryClip(clipData);
+            G.showToast("已经复制游戏下载链接");
+        }
+    }
+
+    private static void debugSysDownload(final Context context, final TaskEty taskEty) {
+        // 创建下载请求
+        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(taskEty.getDownload_link()));
+
+        /*
+         * 设置在通知栏是否显示下载通知(下载进度), 有 3 个值可选:
+         *    VISIBILITY_VISIBLE:                   下载过程中可见, 下载完后自动消失 (默认)
+         *    VISIBILITY_VISIBLE_NOTIFY_COMPLETED:  下载过程中和下载完成后均可见
+         *    VISIBILITY_HIDDEN:                    始终不显示通知
+         */
+        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+
+        // 设置通知的标题和描述
+        request.setTitle(taskEty.getTask_name());
+        request.setDescription("下载小绵羊任务中的apk："+taskEty.getPackage_names());
+
+        /*
+         * 设置允许使用的网络类型, 可选值:
+         *     NETWORK_MOBILE:      移动网络
+         *     NETWORK_WIFI:        WIFI网络
+         *     NETWORK_BLUETOOTH:   蓝牙网络
+         * 默认为所有网络都允许
+         */
+//                     request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI);
+
+        // 添加请求头
+        // request.addRequestHeader("User-Agent", "Chrome Mozilla/5.0");
+
+        // 设置下载文件的保存位置
+        File saveFile = new File(DIR, taskEty.getTask_name()+".apk");
+        request.setDestinationUri(Uri.fromFile(saveFile));
+
+        /*
+         * 2. 获取下载管理器服务的实例, 添加下载任务
+         */
+        DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+        if(manager != null) {
+            // 将下载请求加入下载队列, 返回一个下载ID
+            long downloadId = manager.enqueue(request);
+            G.showToast("系统开始下载apk");
+        }
+    }
+    private static void debugWebDownload(final Context context, final TaskEty taskEty) {
+        if(context instanceof Activity) {
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse(taskEty.getDownload_link()));
+            context.startActivity(intent);
+            G.showToast("浏览器开始下载apk");
+        }
+    }
+
     public static void testChange(final Activity activity, TextView test_change){
         if(BuildConfig.DEBUG || !"sheep".equals(BuildConfig.FLAVOR)){
             test_change.setVisibility(View.VISIBLE);
@@ -21,26 +129,16 @@ public class TestUtil {
             test_change.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-
-                    final String[] items = {"张伟", "测试服", "正式服"};
+                    final ConnectAddress[] connectAddresses = ConnectAddress.values();
                     AlertDialog dialog = new AlertDialog.Builder(activity).setTitle("请选择要切换的服务器")
-                            .setItems(items, new DialogInterface.OnClickListener() {
+                            .setSingleChoiceItems(new ArrayAdapter<>(activity, android.R.layout.simple_list_item_single_choice, connectAddresses), SheepApp.getInstance().getConnectAddress().ordinal(), new DialogInterface.OnClickListener(){
 
                                 @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    switch (items[which]){
-                                        case "张伟":
-                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheepzhangwei);
-                                            break;
-                                        case "测试服":
-                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheeptest);
-                                            break;
-                                        case "正式服":
-                                            SheepApp.getInstance().setConnectAddress(ConnectAddress.sheep);
-                                            break;
-                                    }
+                                public void onClick(DialogInterface dialogInterface, int which) {
+                                    SheepApp.getInstance().setConnectAddress(connectAddresses[which]);
                                 }
-                            }).create();
+                            })
+                            .create();
                     dialog.show();
                 }
             });

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

@@ -15,7 +15,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -12,7 +12,7 @@ import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import java.util.ArrayList;

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

@@ -14,7 +14,7 @@ import com.sheep.gamegroup.util.RxjavaCountDownTimer;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -15,7 +15,7 @@ import com.sheep.gamegroup.presenter.BindDataContract;
 import com.sheep.gamegroup.presenter.BindDataPresenter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import javax.inject.Inject;

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

@@ -19,7 +19,7 @@ import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;

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

@@ -16,7 +16,7 @@ import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -18,7 +18,7 @@ import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -90,7 +90,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     TextView start_task_tv;
     @BindView(R.id.listview)
     MyListview listview;
-    private TaskEty task_entity;
+    private TaskEty taskEty;
     private TaskAcceptedEty task_accepted_entity;
     private List<TaskState> stateList = new ArrayList<>();//状态列表
     private TaskStateAdapter stateAdapter;
@@ -120,20 +120,20 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         initDatas();
         Aria.download(this).register();
         mDownloadTaskService = new DownloadTaskService(this);
-        downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(task_entity);
+        downLoadInfo = mDownloadTaskService.getDownloadTaskByUrl(taskEty);
     }
 
     private void initDatas() {
-        webview.loadUrl(task_entity.getBoot_address());
+        webview.loadUrl(taskEty.getBoot_address());
         Glide.with(this)
-                .load(task_entity.getIcon())
+                .load(taskEty.getIcon())
                 .apply(new RequestOptions().dontAnimate())
                 .into(dialogItemIconIv);
-        dialogItemNameTv.setText(task_entity.getName());
-        dialogItemSizeTv.setText( task_entity.getPackage_size() + "M");
-        isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
+        dialogItemNameTv.setText(taskEty.getName());
+        dialogItemSizeTv.setText( taskEty.getPackage_size() + "M");
+        isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names());
 
-        preference.getTaskState(task_entity.getRelease_task_id());
+        preference.getTaskState(taskEty.getRelease_task_id());
 
     }
 
@@ -145,9 +145,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
 
     private void initViews() {
 
-        task_entity = (TaskEty) getIntent().getSerializableExtra("task_entity");
+        taskEty = (TaskEty) getIntent().getSerializableExtra("task_entity");
         task_accepted_entity = (TaskAcceptedEty) getIntent().getSerializableExtra("task_accepted_entity");
-        if (task_entity == null) {
+        if (taskEty == null) {
             finish();
             return;
         }
@@ -172,7 +172,6 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         stateAdapter = new TaskStateAdapter(activity, stateList);
         listview.setAdapter(stateAdapter);
         stateAdapter.notifyDataSetChanged();
-        TryMakeMoneyAdp.setDebugDownLoad(this, start_task_tv, task_entity);
 
 
     }
@@ -200,15 +199,15 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     private void startStask() {
         DownloadTarget task = null;
         //Todo 暂时判断信用卡，也许以后会增加其他类型，服务器传过来
-        if(task_entity.needDownloadApp()){
-            if(TextUtils.isEmpty(task_entity.getDownload_link()) || !task_entity.getDownload_link().contains("http")){
+        if(taskEty.needDownloadApp()){
+            if(TextUtils.isEmpty(taskEty.getDownload_link()) || !taskEty.getDownload_link().contains("http")){
                 G.showToast("下载地址错误!");
                 return;
             }
-            task = Aria.download(this).load(task_entity.getDownload_link());
+            task = Aria.download(this).load(taskEty.getDownload_link());
         }
 
-        String filePath = DIR+ File.separator+task_entity.getPackage_names()+ ClassFileHelper.FILE_SUFFIX;
+        String filePath = DIR+ File.separator+taskEty.getPackage_names()+ ClassFileHelper.FILE_SUFFIX;
         try{
             switch (type){
                 case 0://领取任务
@@ -246,9 +245,9 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DOWNLOAD);
                     break;
                 case 3://开始安装
-                    isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
+                    isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names());
                     if(isDownLoad){
-                        if(task_entity.getTask_type() != 3){
+                        if(taskEty.getTask_type() != 3){
                             start_task_tv.setText(CommonUtil.OPEN_APPLY);
                         }else {
                             start_task_tv.setText(CommonUtil.START_PLAY);
@@ -256,7 +255,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         type = 1;
                         toTestPlay();
                         return;
-                    }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, task_entity.getPackage_names(), ""))){
+                    }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
                         PackageUtil.installApk(activity, filePath);
                     }else{
                         task.resetState();
@@ -272,9 +271,13 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                     break;
                 case 10://信用卡
 
-                    if(!TextUtils.isEmpty(task_entity.getExt())){
+                    if(taskEty == null) {
+                        G.showToast("服务器数据错误，请联系客服或者稍候重试");
+                    } else if(taskEty.getExtInfo() == null || TextUtils.isEmpty(taskEty.getExtInfo().getUrl())){
+                        Jump2View.getInstance().goTaskDetailView(activity,  taskEty.getId());
+                    } else {
                         Jump2View.getInstance()
-                                .goWebview(activity, task_entity.getExt());
+                                .goWeb(activity, taskEty.getExtInfo().getUrl(), taskEty.getTask_name());
                     }
                     break;
             }
@@ -286,7 +289,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     private void acceptedTask() {
         JSONObject object = new JSONObject();
         object.put("device_id",DeviceUtil.getDeviceId(activity));
-        object.put("release_task_id", Integer.valueOf(task_entity.getRelease_task_id()+""));
+        object.put("release_task_id", Integer.valueOf(taskEty.getRelease_task_id()+""));
         preference.acceptedTask(object);
         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_ACCEPT);
     }
@@ -295,7 +298,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      * 去试玩
      */
     private void toTestPlay(){
-        PackageUtil.startApp(activity, task_entity.getPackage_names());
+        PackageUtil.startApp(activity, taskEty.getPackage_names());
     }
 
     /**
@@ -303,27 +306,27 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
      */
     private void setBtnState(){
         type = 0;
-        if(task_entity.getRunTask() == 0){//领取任务
+        if(taskEty.getRunTask() == 0){//领取任务
             buttonStr = CommonUtil.GET_TASK;
             type = 0;
-        }else if(task_entity.getTask_type() == 2){//信用卡业务
+        }else if(taskEty.getTask_type() == 2){//信用卡业务
             type = 4;
             buttonStr = CommonUtil.START_TASK;
             dialogItemSizeTv.setVisibility(View.INVISIBLE);
-        }else if(task_entity.getTask_type() == 4){//h5
+        }else if(taskEty.getTask_type() == 4){//h5
             type = 10;
             buttonStr = CommonUtil.START_TASK;
             dialogItemSizeTv.setVisibility(View.INVISIBLE);
         }
         else{
             //Todo 以后整理，现在加了个type=3
-            if(isDownLoad && task_entity.getTask_type() != 3){
+            if(isDownLoad && taskEty.getTask_type() != 3){
                 buttonStr = CommonUtil.START_PLAY;;
                 type = 1;
             } else {
                 type = 2;
-                DownloadTarget task = Aria.download(this).load(task_entity.getDownload_link());
-                String filePath = DIR+ File.separator+task_entity.getPackage_names()+ ClassFileHelper.FILE_SUFFIX;
+                DownloadTarget task = Aria.download(this).load(taskEty.getDownload_link());
+                String filePath = DIR+ File.separator+taskEty.getPackage_names()+ ClassFileHelper.FILE_SUFFIX;
                 int taskState = task.getTaskState();
                 switch (taskState){
                     case IEntity.STATE_RUNNING:
@@ -333,11 +336,11 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
                         buttonStr = CommonUtil.CONTINUE_DOWNLOAD;
                         break;
                     case IEntity.STATE_COMPLETE:
-                        isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, task_entity.getPackage_names());
+                        isDownLoad = PackageUtil.isAppInstalled(SheepApp.mContext, taskEty.getPackage_names());
                         if(isDownLoad){
                             buttonStr = CommonUtil.START_PLAY;
                             type = 1;
-                        }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, task_entity.getPackage_names(), ""))){
+                        }else if(!TextUtils.isEmpty(PackageUtil.isExistsFile(activity, taskEty.getPackage_names(), ""))){
                             buttonStr = CommonUtil.START_INSTALL;
                             type = 3;
                         }else{
@@ -366,7 +369,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
         try{
             BaseMessage baseMessage = (BaseMessage) o;
             if(baseMessage.getCode() == 200){
-                task_entity.setRunTask(1);
+                taskEty.setRunTask(1);
                 setBtnState();
                 G.showToast("接收任务成功");
             }
@@ -412,23 +415,23 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     }
 
     @Download.onPre void onPre(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
             start_task_tv.setText("准备下载中");
         }
     }
     @Download.onTaskStart void taskStart(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
             start_task_tv.setText("开始下载中");
         }
     }
     @Download.onTaskResume void taskResume(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
             start_task_tv.setText("恢复下载中");
         }
     }
     //在这里处理任务执行中的状态，如进度进度条的刷新
     @Download.onTaskRunning protected void running(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
             int p = task.getPercent();    //任务进度百分比
 //            mDownloadTaskService.setDownloadTaskPercent(p, task.getCurrentProgress()/1024d/1024d,task.getFileSize()/1024d/1024d,0,task.getKey());
             String speed = task.getConvertSpeed();    //转换单位后的下载速度，单位转换需要在配置文件中打开
@@ -439,7 +442,7 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     }
 
     @Download.onTaskStop void taskStop(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_PAUSE);
             start_task_tv.setText(CommonUtil.CONTINUE_DOWNLOAD);
         }
@@ -449,21 +452,21 @@ public class DialogActivity extends Activity implements TaskDialogContract.View
     }
 
     @Download.onTaskCancel void taskCancel(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
 //            mDownloadTaskService.deleteDownloadTaskByDownloadUrl(task.getKey());
             start_task_tv.setText("已经取消");
         }
     }
 
     @Download.onTaskFail void taskFail(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskStatus(task.getKey(), DownloadTaskService.STATUS_FAIL);
             start_task_tv.setText(CommonUtil.FAIL_DOWNLOAD);
         }
     }
 
     @Download.onTaskComplete void taskComplete(DownloadTask task) {
-        if(task.getKey().equals(task_entity.getDownload_link())) {
+        if(task.getKey().equals(taskEty.getDownload_link())) {
 //            mDownloadTaskService.setDownloadTaskFinish(task.getKey(), task.getDownloadPath());
             //在这里处理任务完成的状态
             start_task_tv.setText(CommonUtil.START_INSTALL);

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

@@ -23,7 +23,7 @@ import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import javax.inject.Inject;

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

@@ -17,7 +17,7 @@ import com.sheep.gamegroup.view.adapter.LieMakeMoneyAdp;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -21,7 +21,7 @@ import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -45,7 +45,7 @@ import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
@@ -438,7 +438,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                             G.showToast("服务器数据错误，请联系客服或者稍候重试");
                         } else {
                             Jump2View.getInstance()
-                                    .goWebview(activity, taskEty.getExtInfo().getUrl());
+                                    .goWeb(activity, taskEty.getExtInfo().getUrl(), taskEty.getTask_name());
                         }
                         break;
                 }

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

@@ -22,7 +22,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -32,7 +32,7 @@ import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;

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

@@ -20,7 +20,7 @@ import com.sheep.gamegroup.view.adapter.TaskListItemAdp;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -7,7 +7,7 @@ import android.support.v4.view.ViewPager;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
 import butterknife.BindView;

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

@@ -27,7 +27,7 @@ import com.sheep.gamegroup.util.MyDbManager;
 import com.sheep.gamegroup.view.adapter.WithdrawalAdapter;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;

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

@@ -16,7 +16,7 @@ import com.sheep.gamegroup.view.adapter.WithdrawalListAdp;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -13,7 +13,7 @@ import com.sheep.gamegroup.presenter.WithdrawalResultPresenter;
 import com.sheep.gamegroup.util.ActivityManager;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 

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

@@ -15,7 +15,7 @@ import com.sheep.gamegroup.util.BtStatusUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 
 import java.util.List;
 

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

@@ -1,407 +0,0 @@
-package com.sheep.gamegroup.view.adapter;
-
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.support.v7.app.AlertDialog;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.bumptech.glide.Glide;
-import com.bumptech.glide.request.RequestOptions;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.Jump2View;
-import com.sheep.gamegroup.util.SelfCountDownTimer;
-import com.sheep.gamegroup.util.TimeUtil;
-import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.inject.Inject;
-
-import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
-
-/**
- * Created by ljy on 2018/4/27.
- */
-
-public class TryMakeMoneyAdb2 extends BaseAdapter {
-    private HashMap<View, SelfCountDownTimer> timerHashMap= new HashMap<>();
-    private ArrayList<Object> list;
-    private Context context;
-    @Inject
-    TryMakeMoneyPresenter presenter;
-    private int type = 0;//0:推荐 1:热门 2:预约
-
-    public TryMakeMoneyAdb2(ArrayList<Object> list, Context context) {
-        this.list = list;
-        this.context = context;
-    }
-    /**
-     * 传入presenter
-     */
-    public void addPresenter(TryMakeMoneyPresenter presenter){
-        this.presenter = presenter;
-    }
-    /**
-     * 传入type
-     */
-    public void addType(int type){
-        this.type = type;
-    }
-
-    /**
-     * 传入正在运行的任务
-     * @param taskAcceptedEty
-     */
-    public void setTaskAcceptedEty(TaskAcceptedEty taskAcceptedEty) {
-        this.taskAcceptedEty = taskAcceptedEty;
-    }
-    private TaskAcceptedEty taskAcceptedEty;
-
-    @Override
-    public int getCount() {
-        return list.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return list.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder holder = null;
-        if(holder == null){
-            holder = new ViewHolder();
-            convertView = LayoutInflater.from(context).inflate(R.layout.try_makemoney_item_recommend, null);
-            holder.item_title_tv = convertView.findViewById(R.id.item_title_tv);
-            holder.item_money = convertView.findViewById(R.id.item_money);
-            holder.item_anem_tv = convertView.findViewById(R.id.item_anem_tv);
-            holder.item_num_tv = convertView.findViewById(R.id.item_num_tv);
-            holder.item_date_tv = convertView.findViewById(R.id.item_date_tv);
-            holder.detail_task_tv = convertView.findViewById(R.id.detail_task_tv);
-            holder.countdown_tv = convertView.findViewById(R.id.countdown_tv);
-            holder.item_num_tv = convertView.findViewById(R.id.item_num_tv);
-            holder.item_title_iv = convertView.findViewById(R.id.item_title_iv);
-            holder.item_icon_iv = convertView.findViewById(R.id.item_icon_iv);
-            holder.line_tv = convertView.findViewById(R.id.line_tv);
-            convertView.setTag(holder);
-        }else {
-            holder = (ViewHolder) convertView.getTag();
-        }
-
-        Object object = getItem(position);
-        if(object == null){
-            return convertView;
-        }
-        if(object instanceof TaskReleaseEty){
-            otherTask(holder, convertView, (TaskReleaseEty) object,position);
-        }else {//正在运行中
-            runTask(holder, convertView, (TaskAcceptedEty) object);
-        }
-
-
-        return convertView;
-    }
-
-    class ViewHolder{
-        TextView item_title_tv, item_money, item_anem_tv, item_num_tv,
-                item_date_tv, detail_task_tv, countdown_tv, line_tv;
-        ImageView item_title_iv, item_icon_iv;
-    }
-
-    /**
-     * 正在运行中的任务
-     */
-    private void runTask(ViewHolder viewHolder,View convertView, final TaskAcceptedEty taskAcceptedEty){
-        viewHolder.line_tv.setVisibility(View.GONE);
-        viewHolder.item_title_tv.setVisibility(View.VISIBLE);
-        viewHolder.item_title_tv.setText("进行中");
-
-
-        viewHolder.item_anem_tv.setText(taskAcceptedEty.getRelease_task().getName()+"");
-        viewHolder.item_num_tv.setText("剩余"+ taskAcceptedEty.getRelease_task().getLast_num()+"份");
-        viewHolder.item_money.setText("+"+ taskAcceptedEty.getRelease_task().getBonus() +"元");
-        viewHolder.item_date_tv.setText(
-                "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskAcceptedEty.getRelease_task().getDeadline()+"")));
-
-        viewHolder.detail_task_tv.setText("取消任务");
-        viewHolder.detail_task_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                presenter.giveUpTask(taskAcceptedEty.getId());
-                //暂停下载
-                CommonUtil.getInstance().stopDownloadTask(context, taskAcceptedEty.getRelease_task().getTask().getDownload_link());
-            }
-        });
-        Glide.with(context)
-                .load(taskAcceptedEty.getRelease_task().getTask().getIcon()+"")
-                .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
-                .into(viewHolder.item_icon_iv);
-        convertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                TaskEty taskEty = taskAcceptedEty.getRelease_task().getTask();
-                taskEty.setRunTask(1);
-                taskEty.setBonus(taskAcceptedEty.getRelease_task().getBonus());
-                taskEty.setRelease_task_id(taskAcceptedEty.getRelease_task().getId());
-                taskEty.setAcceptedTaskId(taskAcceptedEty.getId());
-                taskEty.setName(taskAcceptedEty.getRelease_task().getName());
-                Jump2View.getInstance().goTaskDetailView(context, taskEty, taskAcceptedEty);
-                UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
-            }
-        });
-        setDebugDownLoad(context, convertView, taskAcceptedEty.getRelease_task().getTask());
-
-        /**
-         * 倒计时
-         */
-        if(taskAcceptedEty.getRelease_task().getCancel_duration() > 0){
-            final TextView countdown_tv = viewHolder.countdown_tv;
-            SelfCountDownTimer scTimer = timerHashMap.get(countdown_tv);
-            if(scTimer != null){
-                scTimer.cancel();
-                scTimer = null;
-            }
-
-            countdown_tv.setVisibility(View.VISIBLE);
-            String sr = "若<font color='#ff2d4b'><small>" + "" + "</small></font>后任务未完成，该任务自动取消，您可以重新接受该任务";
-            countdown_tv.setText(sr+"");
-            SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( taskAcceptedEty.getRelease_task().getCancel_duration() * 1000, 1000, taskAcceptedEty.getRelease_task().getCancel_duration()) {
-                @Override
-                public void onTimerRest() {
-                    countdown_tv.setText("");
-                }
-
-                @Override
-                public void onTimerTick(long millisUntilFinished, int counTime) {
-                    countdown_tv.setText(CommonUtil.getInstance().assemblyString(TimeUtil.getHours(millisUntilFinished))+"");
-                }
-
-                @Override
-                public void onTimerFinish() {
-                    countdown_tv.setVisibility(View.GONE);
-                    presenter.giveUpTask(taskAcceptedEty.getId());
-                    //暂停下载
-                    CommonUtil.getInstance().stopDownloadTask(context, taskAcceptedEty.getRelease_task().getTask().getDownload_link());
-                }
-            };
-            selfCountDownTimer.reset(taskAcceptedEty.getRelease_task().getCancel_duration());
-            selfCountDownTimer.start();
-            timerHashMap.put(countdown_tv, selfCountDownTimer);
-        }
-    }
-
-    /**
-     * 其他任务
-     */
-    private void otherTask(ViewHolder viewHolder, View convertView, final TaskReleaseEty taskReleaseEty,int i){
-        if(i == 0){
-            viewHolder.item_title_tv.setVisibility(View.VISIBLE);
-            viewHolder.item_title_iv.setVisibility(View.VISIBLE);
-            String titleStr = "推荐";
-            switch (type){
-                case 0:
-                    titleStr = "推荐";
-                    break;
-                case 1:
-                    titleStr = "热门任务";
-                    break;
-                case 2:
-                    titleStr = "即将开始";
-                    break;
-                default:
-                    titleStr = "推荐";
-                    break;
-            }
-            viewHolder.item_title_tv.setText(titleStr+"");
-            Glide.with(context)
-                    .load(new RequestOptions().placeholder(R.mipmap.task_hot_icon))
-                    .into(viewHolder.item_title_iv);
-
-        }else{
-            viewHolder.item_title_tv.setVisibility(View.GONE);
-            viewHolder.item_title_iv.setVisibility(View.GONE);
-        }
-        if(i == getCount()-1){
-            viewHolder.line_tv.setVisibility(View.GONE);
-        }else {
-            viewHolder.line_tv.setVisibility(View.VISIBLE);
-        }
-        viewHolder.item_anem_tv.setText(taskReleaseEty.getName()+"");
-        viewHolder.item_num_tv.setText("剩余"+ taskReleaseEty.getLast_num()+"份");
-        viewHolder.item_money.setText("+"+ taskReleaseEty.getBonus() +"元");
-        viewHolder.item_date_tv.setText(
-                "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(taskReleaseEty.getDeadline()+"")));
-        viewHolder.detail_task_tv.setText("领取任务");
-        viewHolder.detail_task_tv.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                TaskEty taskEty = taskReleaseEty.getTask();
-                taskEty.setRunTask(0);
-                taskEty.setRelease_task_id(taskReleaseEty.getId());
-                taskEty.setName(taskReleaseEty.getName());
-                Jump2View.getInstance().goDialogActivityView(context, taskEty, taskAcceptedEty);
-            }
-        });
-        Glide.with(context)
-                .load(taskReleaseEty.getTask().getIcon()+"")
-                .apply(new RequestOptions().placeholder(R.mipmap.x_ic_def_head))
-                .into( viewHolder.item_icon_iv);
-        convertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                TaskEty taskEty = taskReleaseEty.getTask();
-                taskEty.setRunTask(0);
-                taskEty.setBonus(taskReleaseEty.getBonus());
-                taskEty.setRelease_task_id(taskReleaseEty.getId());
-                taskEty.setName(taskReleaseEty.getName());
-                Jump2View.getInstance().goTaskDetailView(context, taskEty, taskAcceptedEty);
-            }
-        });
-        setDebugDownLoad(context, convertView, taskReleaseEty.getTask());
-    }
-
-    public static void setDebugDownLoad(final Context context, View view, final TaskEty taskEty) {
-        view.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View view) {
-                final String[] items = {"复制", "系统下载", "浏览器下载"};
-                AlertDialog dialog = new AlertDialog.Builder(context).setTitle("请选择操作")
-                        .setItems(items, new DialogInterface.OnClickListener() {
-
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                switch (items[which]){
-                                    case "复制":
-                                        debugCopy(context, taskEty);
-                                        break;
-                                    case "系统下载":
-                                        debugSysDownload(context, taskEty);
-                                        break;
-                                    case "浏览器下载":
-                                        debugWebDownload(context, taskEty);
-                                        break;
-                                }
-                            }
-                        }).create();
-                dialog.show();
-                return true;
-            }
-        });
-    }
-
-    private static void debugCopy(final Context context, final TaskEty taskEty) {
-        ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-        if(clipboardManager != null && !TextUtils.isEmpty(taskEty.getDownload_link())) {
-            //创建ClipData对象
-            ClipData clipData = ClipData.newPlainText("sheep text copy", taskEty.getDownload_link());
-            //添加ClipData对象到剪切板中
-            clipboardManager.setPrimaryClip(clipData);
-            G.showToast("已经复制游戏下载链接");
-        }
-    }
-
-    private static void debugSysDownload(final Context context, final TaskEty taskEty) {
-        // 创建下载请求
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(taskEty.getDownload_link()));
-
-        /*
-         * 设置在通知栏是否显示下载通知(下载进度), 有 3 个值可选:
-         *    VISIBILITY_VISIBLE:                   下载过程中可见, 下载完后自动消失 (默认)
-         *    VISIBILITY_VISIBLE_NOTIFY_COMPLETED:  下载过程中和下载完成后均可见
-         *    VISIBILITY_HIDDEN:                    始终不显示通知
-         */
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-
-        // 设置通知的标题和描述
-        request.setTitle(taskEty.getTask_name());
-        request.setDescription("下载小绵羊任务中的apk："+taskEty.getPackage_names());
-
-        /*
-         * 设置允许使用的网络类型, 可选值:
-         *     NETWORK_MOBILE:      移动网络
-         *     NETWORK_WIFI:        WIFI网络
-         *     NETWORK_BLUETOOTH:   蓝牙网络
-         * 默认为所有网络都允许
-         */
-//                     request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI);
-
-        // 添加请求头
-        // request.addRequestHeader("User-Agent", "Chrome Mozilla/5.0");
-
-        // 设置下载文件的保存位置
-        File saveFile = new File(DIR, taskEty.getTask_name()+".apk");
-        request.setDestinationUri(Uri.fromFile(saveFile));
-
-        /*
-         * 2. 获取下载管理器服务的实例, 添加下载任务
-         */
-        DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        if(manager != null) {
-            // 将下载请求加入下载队列, 返回一个下载ID
-            long downloadId = manager.enqueue(request);
-            G.showToast("系统开始下载apk");
-        }
-    }
-    private static void debugWebDownload(final Context context, final TaskEty taskEty) {
-        if(context instanceof Activity) {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.addCategory(Intent.CATEGORY_BROWSABLE);
-            intent.setData(Uri.parse(taskEty.getDownload_link()));
-            context.startActivity(intent);
-            G.showToast("浏览器开始下载apk");
-        }
-    }
-
-    /**
-     * 重置map参数
-     */
-    public void cancelAllTimers() {
-        Set<Map.Entry<View, SelfCountDownTimer>> s = timerHashMap.entrySet();
-        Iterator it = s.iterator();
-        while (it.hasNext()) {
-            try {
-                Map.Entry pairs = (Map.Entry) it.next();
-                SelfCountDownTimer cdt = (SelfCountDownTimer) pairs.getValue();
-                cdt.cancel();
-                cdt = null;
-            } catch (Exception ignored) {
-            }
-        }
-        it = null;
-        s = null;
-        timerHashMap.clear();
-    }
-}

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

@@ -1,18 +1,9 @@
 package com.sheep.gamegroup.view.adapter;
 
-import android.app.Activity;
-import android.app.DownloadManager;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.Uri;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.Html;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -34,12 +25,11 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.SelfCountDownTimer;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -49,8 +39,6 @@ import java.util.Set;
 
 import javax.inject.Inject;
 
-import static com.sheep.jiuyan.samllsheep.utils.ClassFileHelper.DIR;
-
 /**
  * Created by ljy on 2018/3/20.
  */
@@ -246,7 +234,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getId());
                     }
                 });
-                setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getTask());
+                TestUtil.setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getTask());
 
             }
 
@@ -334,7 +322,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         UMConfigUtils.onEvent(UMConfigUtils.Event.TASK_DETAIL);
                     }
                 });
-                setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getRelease_task().getTask());
+                TestUtil.setDebugDownLoad(context, viewHolder.itemView, etyList.get(i).getRelease_task().getTask());
 
                 /**
                  * 倒计时
@@ -383,99 +371,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
         });
     }
 
-    public static void setDebugDownLoad(final Context context, View view, final TaskEty taskEty) {
-            view.setOnLongClickListener(new View.OnLongClickListener() {
-                @Override
-                public boolean onLongClick(View view) {
-                    final String[] items = {"复制", "系统下载", "浏览器下载"};
-                    AlertDialog dialog = new AlertDialog.Builder(context).setTitle("请选择操作")
-                            .setItems(items, new DialogInterface.OnClickListener() {
-
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    switch (items[which]){
-                                        case "复制":
-                                            debugCopy(context, taskEty);
-                                            break;
-                                        case "系统下载":
-                                            debugSysDownload(context, taskEty);
-                                            break;
-                                        case "浏览器下载":
-                                            debugWebDownload(context, taskEty);
-                                            break;
-                                    }
-                                }
-                            }).create();
-                    dialog.show();
-                    return true;
-                }
-            });
-    }
-
-    private static void debugCopy(final Context context, final TaskEty taskEty) {
-        ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-        if(clipboardManager != null && !TextUtils.isEmpty(taskEty.getDownload_link())) {
-            //创建ClipData对象
-            ClipData clipData = ClipData.newPlainText("sheep text copy", taskEty.getDownload_link());
-            //添加ClipData对象到剪切板中
-            clipboardManager.setPrimaryClip(clipData);
-            G.showToast("已经复制游戏下载链接");
-        }
-    }
-
-    private static void debugSysDownload(final Context context, final TaskEty taskEty) {
-        // 创建下载请求
-        DownloadManager.Request request = new DownloadManager.Request(Uri.parse(taskEty.getDownload_link()));
-
-        /*
-         * 设置在通知栏是否显示下载通知(下载进度), 有 3 个值可选:
-         *    VISIBILITY_VISIBLE:                   下载过程中可见, 下载完后自动消失 (默认)
-         *    VISIBILITY_VISIBLE_NOTIFY_COMPLETED:  下载过程中和下载完成后均可见
-         *    VISIBILITY_HIDDEN:                    始终不显示通知
-         */
-        request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-
-        // 设置通知的标题和描述
-        request.setTitle(taskEty.getTask_name());
-        request.setDescription("下载小绵羊任务中的apk："+taskEty.getPackage_names());
-
-        /*
-         * 设置允许使用的网络类型, 可选值:
-         *     NETWORK_MOBILE:      移动网络
-         *     NETWORK_WIFI:        WIFI网络
-         *     NETWORK_BLUETOOTH:   蓝牙网络
-         * 默认为所有网络都允许
-         */
-//                     request.setAllowedNetworkTypes(DownloadManager.Request.NETWORK_WIFI);
-
-        // 添加请求头
-        // request.addRequestHeader("User-Agent", "Chrome Mozilla/5.0");
-
-        // 设置下载文件的保存位置
-        File saveFile = new File(DIR, taskEty.getTask_name()+".apk");
-        request.setDestinationUri(Uri.fromFile(saveFile));
-
-        /*
-         * 2. 获取下载管理器服务的实例, 添加下载任务
-         */
-        DownloadManager manager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-        if(manager != null) {
-            // 将下载请求加入下载队列, 返回一个下载ID
-            long downloadId = manager.enqueue(request);
-            G.showToast("系统开始下载apk");
-        }
-    }
-    private static void debugWebDownload(final Context context, final TaskEty taskEty) {
-        if(context instanceof Activity) {
-            Intent intent = new Intent();
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.addCategory(Intent.CATEGORY_BROWSABLE);
-            intent.setData(Uri.parse(taskEty.getDownload_link()));
-            context.startActivity(intent);
-            G.showToast("浏览器开始下载apk");
-        }
-    }
-
     /**
      * 重置map参数
      */

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

@@ -8,7 +8,7 @@ import android.view.WindowManager;
 
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.base.AbsChooseImageActivity;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 
 import me.iwf.photopicker.PhotoPicker;
 

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

@@ -1,279 +0,0 @@
-package com.sheep.gamegroup.view.fragment;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.widget.AbsListView;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.kfzs.duanduan.event.BigEvent;
-import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent2;
-import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
-import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.RequestParameEty;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
-import com.sheep.gamegroup.model.entity.TaskReleaseEty;
-import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
-import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
-import com.sheep.gamegroup.util.CommonUtil;
-import com.sheep.gamegroup.util.MyListview;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdb2;
-import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.base.BaseFragment;
-import com.sheep.jiuyan.samllsheep.utils.G;
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
-
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-/**
- * Created by ljy on 2018/4/27.
- */
-
-public class FgtTryMakeMoney2 extends BaseFragment implements TryMakeMoneyContract.View {
-    @BindView(R.id.recyclerview)
-    MyListview recyclerview;
-    @BindView(R.id.refresh)
-    SwipeRefreshLayout refresh;
-
-    @Inject
-    TryMakeMoneyPresenter presenter;
-    private Activity activity;
-    private TryMakeMoneyAdb2 tryMakeMoneyAdp;
-    private int type = 0;
-    private int position = 0;
-    private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
-    private ArrayList<Object> objectList = new ArrayList<>();
-    private TaskAcceptedEty taskAcceptedEty;
-
-    Handler mhandler = new Handler(){
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            objectList.clear();
-            if(taskAcceptedEty != null){
-                objectList.add(taskAcceptedEty);
-            }
-            if(releaseEtyLists != null && releaseEtyLists.size()>0){
-                objectList.addAll(releaseEtyLists);
-            }
-            tryMakeMoneyAdp.notifyDataSetChanged();
-        }
-    };
-
-    public static FgtTryMakeMoney2 newInstance(int type){
-        FgtTryMakeMoney2 fgtTryMakeMoney = new FgtTryMakeMoney2();
-        Bundle bundle = new Bundle();
-        bundle.putInt("type", type);
-        fgtTryMakeMoney.setArguments(bundle);
-        return fgtTryMakeMoney;
-    }
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.fgt_try_makemoney_layout2;
-    }
-
-    @Override
-    public void onViewCreated() {
-        ButterKnife.bind(this, mView);
-
-        Bundle bundle = getArguments();
-        if(bundle != null){
-            type = bundle.getInt("type", 0);
-        }
-        initView();
-    }
-    public void initView() {
-        EventBus.getDefault().register(this);
-        activity = getActivity();
-//        ButterKnife.bind(this, mContentView);
-        TitleBarUtils
-                .getInstance()
-                .setTitle(activity, "试玩赚钱")
-                .setTitleFinish(activity);
-        DaggerFgtTryMakeMoneyComponent2.builder()
-                .netComponent(SheepApp.get(activity).getNetComponent())
-                .tryMakeMoneyModule(new TryMakeMoneyModule(FgtTryMakeMoney2.this))
-                .build()
-                .inject(FgtTryMakeMoney2.this);
-        tryMakeMoneyAdp = new TryMakeMoneyAdb2(objectList, activity);
-        recyclerview.setAdapter(tryMakeMoneyAdp);
-
-        initListener();
-        initData();
-
-    }
-    public void initListener() {
-        refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                initData();
-                refresh.setRefreshing(false);
-            }
-        });
-        recyclerview.setOnScrollListener(new AbsListView.OnScrollListener() {
-            @Override
-            public void onScrollStateChanged(AbsListView view, int scrollState) {
-            }
-
-            @Override
-            public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-                int topRowVerticalPosition =
-                        (recyclerview == null || recyclerview.getChildCount() == 0) ? 0 : recyclerview.getChildAt(0).getTop();
-
-                refresh.setEnabled(topRowVerticalPosition >= 0);
-            }
-        });
-    }
-    public void initData() {
-        taskAcceptedEty = null;
-        position = 0;
-        tryMakeMoneyAdp.addType(0);
-        tryMakeMoneyAdp.setTaskAcceptedEty(null);
-        RequestParameEty parameEty = new RequestParameEty();
-        parameEty.setHashMap(CommonUtil.getInstance().setHashMap(1,100,1,
-                0,0,type));
-        presenter.releaseTask(parameEty);
-    }
-
-    @Override
-    public void updateData2View(Object o) {
-
-    }
-
-    @Override
-    public void failData2View(Object o) {
-
-    }
-
-    @Override
-    public void acceptedTaskUpdataView(Object o) {
-
-    }
-
-    @Override
-    public void failAcceptedTask2View(Object o) {
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            switch (baseMessage.getCode()){
-                case 300://未查询到数据
-                    G.showToast(" 未查询到数据！");
-                    break;
-                default:
-                    G.showToast(" 网络错误！");
-                    break;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            G.showToast(" 网络错误！");
-        }
-    }
-
-    @Override
-    public void giveUpTaskSuccesView(Object o) {
-        G.showToast("取消任务成功");
-        initData();
-    }
-
-    @Override
-    public void giveUpTaskFailView(Object o) {
-        G.showToast("访问失败");
-    }
-
-    @Override
-    public void returnTaskTaskUpdataView(Object o) {
-
-        try{
-            BaseMessage baseMessage = (BaseMessage) o;
-            taskAcceptedEty = JSONObject.parseObject(JSONObject.toJSONString(baseMessage.getData()), TaskAcceptedEty.class);
-            tryMakeMoneyAdp.addPresenter(presenter);
-            tryMakeMoneyAdp.setTaskAcceptedEty(taskAcceptedEty);
-            position ++;
-//            mhandler.sendEmptyMessage(0);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        mhandler.sendEmptyMessage(0);
-    }
-
-    @Override
-    public void failReturnTask2View(Object o) {
-        try {
-            BaseMessage baseMessage = (BaseMessage) o;
-            switch (baseMessage.getCode()){
-                case 300://未查询到正在运行的任务
-//                    G.showToast(" 未查询到正在运行的任务！");
-                    break;
-                default:
-                    G.showToast(" 网络错误！");
-                    break;
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            G.showToast(" 网络错误！");
-        }
-        mhandler.sendEmptyMessage(0);
-    }
-
-    /**
-     *  获取已经发布任务
-     * @param o
-     */
-    @Override
-    public void releaseTaskTaskUpdataView(Object o) {
-        releaseEtyLists.clear();
-        try{
-            BaseMessage baseMessage = (BaseMessage) o;
-            List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-            if(releaseEtyList != null){
-                releaseEtyLists.addAll(releaseEtyList);
-            }
-
-//            mhandler.sendEmptyMessage(0);
-        }catch (Exception e){
-            e.printStackTrace();
-        }
-        presenter.returnTask(null);
-    }
-
-    @Override
-    public void failReleaseTask2View(Object o) {
-
-        presenter.returnTask(null);
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
-            case ONFRESH_TRYMAKEMANY_PAGE:
-                initData();
-                break;
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if(tryMakeMoneyAdp != null){
-            tryMakeMoneyAdp.cancelAllTimers();
-        }
-    }
-}

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

@@ -54,12 +54,9 @@ public class SheepApp extends BaseApplication {
         super.onCreate();
         mContext = getApplicationContext();
         mSheepApp = this;
-        if(BuildConfig.FLAVOR.equals("sheep") && BuildConfig.BUILD_TYPE.equals("release")){
-            connectAddress = ConnectAddress.sheep;
-        }else {
-            String flavor = SharedPreferences.getInstance().getString("flavor",BuildConfig.FLAVOR);
-            connectAddress = ConnectAddress.valueOf(flavor);
-        }
+
+        String flavor = SharedPreferences.getInstance().getString("flavor", BuildConfig.FLAVOR);
+        connectAddress = ConnectAddress.valueOf(flavor);
 
         registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
         initGoble();

app/src/main/java/com/sheep/jiuyan/samllsheep/base/BaseActivity.java

@@ -1,83 +0,0 @@
-package com.sheep.jiuyan.samllsheep.base;
-
-import android.app.ProgressDialog;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.widget.Toast;
-
-import com.sheep.gamegroup.util.ActivityManager;
-
-import butterknife.ButterKnife;
-
-/**
- * Created by kemllor on 2017/12/15.
- */
-
-public abstract class BaseActivity extends AppCompatActivity {
-
-    protected ProgressDialog  mPd;
-
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(getLayoutId());
-        ButterKnife.bind(this);
-        initView();
-        initListener();
-        initData();
-        ActivityManager.getInstance().pushActivity(this);
-
-    }
-
-    protected void  showProgress(){
-        if(mPd!=null){
-            hideProgress();
-        }
-        mPd = new ProgressDialog(this);
-//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
-//        mPd.setContentView(view);//自己定义布局
-        mPd.setMessage("数据加载中...");
-        mPd.setCancelable(true);//能否够被取消
-//        mPd.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
-        mPd.show();
-    }
-
-    protected void  showProgress(boolean cancel){
-        if(mPd!=null){
-            hideProgress();
-        }
-        mPd = new ProgressDialog(this);
-//        View view= LayoutInflater.from(this).inflate(R.layout.dialog_layout,null);
-//        mPd.setContentView(view);//自己定义布局
-        mPd.setMessage("数据加载中...");
-        mPd.setCancelable(cancel);//能否够被取消
-//        mPd.setProgressStyle(ProgressDialog.STYLE_SPINNER);//圆环风格
-        mPd.show();
-    }
-
-
-    protected void  hideProgress(){
-        if(mPd!=null){
-            mPd.dismiss();
-        }
-
-    }
-
-    protected   void  showToast(String msg){
-        Toast.makeText(this,msg,Toast.LENGTH_LONG).show();
-
-
-    }
-
-    protected abstract int getLayoutId();
-
-    public abstract void initView();
-
-    public abstract void initListener();
-
-    public abstract void initData();
-
-
-}

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

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/bg_gray">
-
-
-    <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/refresh"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/content_padding_10">
-        <com.sheep.gamegroup.util.MyListview
-            android:id="@+id/recyclerview"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="none"
-            android:divider="@null"/>
-    </android.support.v4.widget.SwipeRefreshLayout>
-</LinearLayout>

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

@@ -29,6 +29,14 @@
                 layout="@layout/homepage_item_banner"/>
             <include
                 layout="@layout/homepage_item_4module"/>
+            <ImageView
+                android:id="@+id/homepage_wxfz"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding_10"
+                android:scaleType="fitXY"
+                android:adjustViewBounds="true"
+                android:src="@drawable/homepage_wxfz"/>
             <include
                 layout="@layout/homepage_item_currenttime_reward"/>
 

app/src/main/res/values/dd_styles.xml

@@ -119,7 +119,7 @@
         <item name="android:layout_height">26dp</item>
         <item name="android:paddingStart">@dimen/content_padding_10</item>
         <item name="android:paddingEnd">@dimen/content_padding_10</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">12sp</item>
         <item name="android:textColor">#767676</item>
         <item name="android:gravity">center</item>
         <item name="android:background">@drawable/sp_bg_rectangle_ash</item>