小绵羊2.6，任务详情部分修改提交

app/build.gradle

@@ -222,14 +222,6 @@ dependencies {
     compile files('libs/SocialSDK_WeiXin_Full.jar')
     compile files('libs/SocialSDK_QQ_Full.jar')
     compile 'com.zhy:okhttputils:2.6.2'
-    //umeng share
-    compile files('libs/umeng-share-core-6.9.2.jar')
-    compile files('libs/umeng-share-QQ-simplify-6.9.2.jar')
-    compile files('libs/umeng-share-wechat-simplify-6.9.2.jar')
-    compile files('libs/umeng-shareboard-widget-6.9.2.jar')
-    compile files('libs/umeng-sharetool-6.9.2.jar')
-    compile files('libs/SecurityEnvSDK-release-1.1.0.jar')
-    compile files('libs/utdid4all-1.1.5.3_proguard.jar')
 
     //    compile 'com.kf.framework:kf-utils:latest.integration@aar'
     compile 'com.kf.framework:kf-utils:1.4.5@aar'

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

@@ -9,6 +9,17 @@ import com.sheep.jiuyan.samllsheep.SheepApp;
  */
 
 public enum ConnectAddress {
+    ruanlang {
+
+        @Override
+        public String getAppUrl() {
+            return "http://10.8.240.23:8080/";
+        }
+        @Override
+        public String getName() {
+            return "阮浪";
+        }
+    },
     sheepxiexing {
 
         @Override

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

@@ -484,6 +484,15 @@ public class Jump2View {
         }
 
     }
+    public synchronized void goTaskDetailView(Context context, Object o, boolean b){
+        Intent intent = new Intent(context, TaskDetailAct.class);
+        if(o instanceof Integer){
+            intent.putExtra("task_id", (Integer) o);
+        }
+        intent.putExtra("btn_show", b);
+        context.startActivity(intent);
+
+    }
 
     /**
      * 跳到已做过任务列表页面

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

@@ -22,11 +22,13 @@ import com.sheep.gamegroup.model.entity.UserLabel;
 import com.sheep.gamegroup.model.entity.UserLabelList;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
+import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.media.UMImage;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -248,8 +250,10 @@ public class TestUtil {
      * umen 分享
      */
     public void testUmen(Activity context){
+        UMImage umImage = new UMImage(context, R.mipmap.icon);
         new ShareAction(context)
                 .withText("hehe")
+                .withMedia(umImage)
                 .setDisplayList(
                         SHARE_MEDIA.QQ,
                         SHARE_MEDIA.WEIXIN)

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

@@ -113,6 +113,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     MyListview detail_task_listview;
     @BindView(R.id.empty_view)
     View empty_view;
+    @BindView(R.id.detail_shrae_friend_layout)
+    LinearLayout detail_shrae_friend_layout;
     private Activity activity;
     @Inject
     TaskDetailPresenter presenter;
@@ -133,6 +135,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private AdpTaskDetailChildListview adpTaskDetailChildListview;
     private List<TaskChild> taskChildList = new ArrayList<>();
 
+    //2.6
+    private boolean btn_show;//true:不显示按钮
 
     @Override
     protected int getLayoutId() {
@@ -143,6 +147,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     public void initView() {
         activity = this;
         taskAcceptedEty = (TaskAcceptedEty) getIntent().getSerializableExtra("task_entity");
+        btn_show = getIntent().getBooleanExtra("btn_show", false);
         isFromTaskList = taskAcceptedEty != null;
         taskId = getIntent().getIntExtra("task_id", -1);
         DaggerTaskDetailComponent.builder()
@@ -182,6 +187,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     private void initWigget() {
+        detail_shrae_friend_layout.setVisibility(View.VISIBLE);
+
         taskEty = taskReleaseEty.getTask();
         if (taskEty.getChild() != null && taskEty.getChild().size() > 0) {
             taskChildList.clear();
@@ -283,6 +290,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         taskSchedule();
+        //2.6修改
+        if(btn_show)
+            bottom_btn_layout.setVisibility(View.GONE);
     }
 
     private void checkAcceptedTask() {

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

@@ -290,8 +290,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private void bindReleaseTask(ViewHolder holder, final List<TaskReleaseEty> etyList){
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
-//        recyclerView.setLayoutManager(new StaggeredGridLayoutManager(1,
-//                StaggeredGridLayoutManager.VERTICAL));
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
         recyclerView.setAdapter(new RecyclerView.Adapter(){
 
@@ -350,24 +348,34 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
-                switch (type){
-                    case 2://即将开始
-                        detail_task_tv.setText("即将开始");
-                        detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
-                        detail_task_tv.setEnabled(false);
-                        viewHolder.itemView.setEnabled(false);
-                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                "开始时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getOnline_time()))+"");
-                        break;
-                    default:
-                        detail_task_tv.setText("领取任务");
-                        detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
-                        detail_task_tv.setEnabled(true);
-                        viewHolder.itemView.setEnabled(true);
-                        ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
-                                "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
-                        break;
+                if("0".equals(etyList.get(i).getLast_num())){
+                    detail_task_tv.setText("已抢光");
+                    detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                    detail_task_tv.setEnabled(false);
+                    viewHolder.itemView.setEnabled(false);
+                    ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                            "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
+                }else {
+                    switch (type){
+                        case 2://即将开始
+                            detail_task_tv.setText("即将开始");
+                            detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_rectangle_bg_gray_radius));
+                            detail_task_tv.setEnabled(false);
+                            viewHolder.itemView.setEnabled(false);
+                            ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                    "开始时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getOnline_time()))+"");
+                            break;
+                        default:
+                            detail_task_tv.setText("领取任务");
+                            detail_task_tv.setBackground(context.getResources().getDrawable(R.drawable.sp_bg_gradient_rectangle_blue));
+                            detail_task_tv.setEnabled(true);
+                            viewHolder.itemView.setEnabled(true);
+                            ((TextView)viewHolder.itemView.findViewById(R.id.item_date_tv)).setText(
+                                    "截止时间:" + TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(etyList.get(i).getDeadline()))+"");
+                            break;
+                    }
                 }
+
                 viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
 
                 //CommonUtil.getInstance().getCharSequence(context, etyList.get(i).getName(), "")
@@ -389,7 +397,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_num_tv)).setText("剩余"+ etyList.get(i).getLast_num()+"份");
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_money)).setText("+"+ etyList.get(i).getBonus() +"元");
 
-                viewHolder.itemView.findViewById(R.id.detail_task_tv).setOnClickListener(new View.OnClickListener() {
+                detail_task_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         if(!ListUtil.hasIndex(etyList, i)){
@@ -423,6 +431,10 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         taskEty.setBonus(etyList.get(i).getBonus());
                         taskEty.setRelease_task_id(etyList.get(i).getId());
                         taskEty.setName(etyList.get(i).getName());
+                        if("0".equals(etyList.get(i).getLast_num())){
+                            Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getId(), true);
+                            return;
+                        }
                         Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getId());
                     }
                 });

app/src/main/res/drawable/sp_bg_blue_solid_gray.xml

@@ -8,9 +8,6 @@
         android:bottomLeftRadius="15dp"
         android:bottomRightRadius="15dp"/>
 
-    <stroke
-        android:width="1dp"
-        android:color="@color/gray"/>
     <solid
         android:color="@color/blue_E2F4FE"/>
 

app/src/main/res/drawable/sp_bg_blue_top.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners
+        android:topRightRadius="15dp"
+        android:topLeftRadius="15dp"
+        android:bottomRightRadius="0dp"
+        android:bottomLeftRadius="0dp"/>
+
+    <solid
+        android:color="@color/blue_91BDD6"/>
+</shape>

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

@@ -104,13 +104,16 @@
                         android:orientation="horizontal"
                         android:layout_below="@+id/item_layout"
                         android:padding="@dimen/content_padding_10"
-                        android:background="@drawable/sp_bg_blue_solid_gray">
+                        android:background="@drawable/sp_bg_blue_solid_gray"
+                        android:visibility="gone">
                         <TextView
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_weight="1"
                             android:text="邀请好友完成任务，可额外获取任务奖励的20%哦!"
-                            style="@style/nomal_txt_style"/>
+                            style="@style/nomal_txt_style_13"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="center_vertical"/>
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -118,7 +121,10 @@
                             android:textColor="@color/txt_bule"
                             android:textSize="@dimen/text_size_3"
                             android:layout_gravity="center_vertical"
-                            android:padding="@dimen/common_margin_10"
+                            android:paddingLeft="@dimen/common_margin_10"
+                            android:paddingRight="@dimen/common_margin_10"
+                            android:paddingBottom="@dimen/tag_vertical_spacing"
+                            android:paddingTop="@dimen/tag_vertical_spacing"
                             android:background="@drawable/sp_appointment_bg"/>
                     </LinearLayout>
                 </RelativeLayout>

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

@@ -0,0 +1,30 @@
+<?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">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:background="@drawable/sp_bg_blue_top"
+        android:padding="@dimen/tag_vertical_spacing">
+        <TextView
+            android:id="@+id/title_item_tv"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="middle"
+            style="@style/white_txt_style_13"/>
+        <ImageView
+            android:id="@+id/select_tab_iv"
+            android:layout_width="@dimen/view_size_30"
+            android:layout_height="@dimen/view_size_30"
+            android:padding="@dimen/content_padding_8"
+            android:src="@mipmap/arrow_down" />
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -16,6 +16,7 @@
     <dimen name="text_size_8sp">8sp</dimen>
     <dimen name="text_size_1">9sp</dimen>
     <dimen name="text_size_2">11sp</dimen>
+    <dimen name="text_size_13">13sp</dimen>
     <dimen name="text_size_3">14sp</dimen>
     <dimen name="text_size_4">16sp</dimen>
     <dimen name="text_size_5">18sp</dimen>

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

@@ -7,6 +7,7 @@
     <color name="black">#000000</color>
     <color name="black_191919">#191919</color>
     <color name="black_444444">#444444</color>
+    <color name="black_E6F3FB">#E6F3FB</color>
     <color name="white_bg_line">#dfdfdf</color>
     <color name="txt_red">#ff2d4b</color>
     <color name="txt_bule">#4889ff</color>
@@ -38,5 +39,6 @@
     <color name="white_FFF7F7F7">#FFF7F7F7</color>
     <color name="gray_F2F2F2">#F2F2F2</color>
     <color name="green_60BE5E">#60BE5E</color>
+    <color name="blue_91BDD6">#91BDD6</color>
 
 </resources>

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

@@ -11,6 +11,14 @@
         <item name="android:textSize">20dp</item>
     </style>
 
+    <style name="nomal_txt_style_13">
+        <item name="android:textSize">@dimen/text_size_13</item>
+        <item name="android:textColor">@color/black_444444</item>
+    </style>
+    <style name="white_txt_style_13">
+        <item name="android:textSize">@dimen/text_size_13</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
     <style name="nomal_txt_style_12">
         <item name="android:textSize">@dimen/text_size_12</item>
         <item name="android:textColor">@color/black_444444</item>