Merge branch 'sheep2.0' of http://10.8.230.114:3000/kemllor/small_sheep_android into sheep2.0

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

@@ -43,6 +43,7 @@ import com.sheep.gamegroup.event.MoneyChange;
 import com.sheep.gamegroup.event.UserNameChange;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.BulletinEnty;
+import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
 import com.sheep.gamegroup.model.entity.NewbieTask;
@@ -869,13 +870,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                         break;
                     case 4:
                         if(!TextUtils.isEmpty(clickedGameObj.getObjects())){
-                            Jump2View.getInstance()
-                                    .goWebview(
-                                            activity,
-                                            new WebviewEntity(
-                                                    0,
-                                                    clickedGameObj.getObjects(),
-                                                    null));
+                            Ext ext = EntityUtils.getExtInfo(clickedGameObj.getExt());
+                            if(ext.getTitle() == null)//外部浏览器加载H5
+                                Jump2View.getInstance().goWeb(activity, ext.getUrl());
+                            else//内部WebView加载H5
+                                Jump2View.getInstance().goWeb(activity, ext.getUrl(), ext.getTitle());
+
                         }
 
                         break;

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

@@ -8,6 +8,7 @@ public class Ext {
     private int id;
     private String query_url;
     private String url;
+    private String title;
 
     public int getId() {
         return id;
@@ -32,4 +33,12 @@ public class Ext {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }

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

@@ -42,7 +42,7 @@ public class TestUtil {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 switch (items[which]){
-                                    case "复制":
+                                    case "复制下载地址":
                                         debugCopy(context, taskEty);
                                         break;
                                     case "系统下载":

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

@@ -273,7 +273,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             switch (taskAcceptedEty.getStatus()) {
                 case 1://"已接受任务";
                 case 2:// "正在进行中";
-                case 7:// "提交审核";
                     taskId = taskAcceptedEty.getRelease_task_id();
                     taskAcceptedEty = null;
                     taskReleaseEty = null;
@@ -291,13 +290,20 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     llInfos.addView(getStep("完成任务", "审核失败", 1));
                     return;
                 //不可操作
-
+                case 7:// "提交审核";
+                    llInfos.removeAllViews();
+                    llInfos.addView(getStep("领取任务", "已完成", 0));
+                    llInfos.addView(getStep("APP下载", "已完成", 0));
+                    llInfos.addView(getStep("完成任务", "审核中", 1));
+                    bottom_btn_layout.setVisibility(View.GONE);
+                    return;
                 case 3://完成任务
                     llInfos.removeAllViews();
                     llInfos.addView(getStep("领取任务", "已完成", 0));
                     llInfos.addView(getStep("APP下载", "已完成", 0));
                     llInfos.addView(getStep("完成任务", "已完成", 0));
-                    break;
+                    bottom_btn_layout.setVisibility(View.GONE);
+                    return;
             }
             bottom_btn_layout.setVisibility(View.GONE);
             ((View)llInfos.getParent()).setVisibility(View.GONE);

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

@@ -20,6 +20,7 @@ import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.presenter.TaskListPresenter;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -101,6 +102,7 @@ public class TaskListItemAdp extends BaseAdapter {
                 Jump2View.getInstance().goTaskDetailView(context, ety);
             }
         });
+        TestUtil.setDebugDownLoad(context, convertView, ety.getRelease_task().getTask());
         holder.detail_task_tv.setText(ety.getRemarks());
 //        holder.detail_task_tv.setOnClickListener(new View.OnClickListener() {
 //            @Override