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

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

@@ -274,7 +274,7 @@ public class TaskEty implements Serializable{
      * 重组desc字段
      * @param desc
      */
-    private Object regroupDesc(String desc){
+    public Object regroupDesc(String desc){
         if(TextUtils.isEmpty(desc)){
             return desc;
         }

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

@@ -727,7 +727,10 @@ public class CommonUtil {
         umWeb.setDescription(activity.getResources().getString(R.string.app_name));
         if(type.equals("all")){
 
-            new ShareAction(activity)
+            ViewUtil.newInstance()
+                    .showShare(activity, url);
+
+            /*new ShareAction(activity)
                     .withText("")
                     .withMedia(umWeb)
                     .setDisplayList(
@@ -741,7 +744,7 @@ public class CommonUtil {
 //
 //                        }
 //                    })
-                    .open();
+                    .open();*/
         }else {
             SHARE_MEDIA share_media = SHARE_MEDIA.QQ;
             if(type.equals("qq")){

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

@@ -509,6 +509,21 @@ public class Jump2View {
         context.startActivity(intent);
 
     }
+    public synchronized void goGameTaskDetailView(Context context, Object o, Object b, int type){
+        Intent intent = new Intent(context, TaskDetailAct.class);
+        if(o instanceof Integer){
+            intent.putExtra("task_id", (Integer) o);
+        }
+        if(b instanceof Integer){
+            intent.putExtra("game_id", (Integer) b);
+        }else
+        if(b instanceof Boolean){
+            intent.putExtra("btn_show", (Boolean) b);
+        }
+        intent.putExtra("game_type", type);
+        context.startActivity(intent);
+
+    }
 
     /**
      * 跳到已做过任务列表页面

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

@@ -34,6 +34,7 @@ import com.sheep.gamegroup.view.activity.SplashAct;
 import com.sheep.gamegroup.view.dialog.DialogOrienteeringDetails;
 import com.sheep.gamegroup.view.dialog.DialogPayAccount;
 import com.sheep.gamegroup.view.dialog.DialogPayGame;
+import com.sheep.gamegroup.view.dialog.DialogShare;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
@@ -553,6 +554,15 @@ public class ViewUtil {
         new DialogPayGame(activity, game_account_etStr, game_pay_etStr,gameId).showPayGame();
     }
 
+    /**
+     * 分享
+     * @param activity
+     * @param url
+     */
+    public void showShare(Activity activity, String url){
+        new DialogShare(activity, url).showShare();
+    }
+
     public static void setText(TextView textView) {
         if(textView != null){
             textView.setText("");

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

@@ -18,6 +18,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.arialyy.annotations.Download;
 import com.arialyy.aria.core.Aria;
@@ -178,6 +179,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 
     private int taskId = -1;
     private int game_id = -1;
+    private int game_type = -1;
 
     private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5，101：充值  100:领取奖励
 
@@ -205,6 +207,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         isFromTaskList = taskAcceptedEty != null;
         taskId = getIntent().getIntExtra("task_id", -1);
         game_id = getIntent().getIntExtra("game_id", -1);
+        game_type = getIntent().getIntExtra("game_type", -1);
         DaggerTaskDetailComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .taskDetailModule(new TaskDetailModule(this))
@@ -360,7 +363,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             if(taskEty.getTask_type() == 1002 ||taskEty.getTask_type() == 1003){
                 btnTaskItem.setVisibility(View.GONE);
                 //奖励领取是否
-                if(gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3){
+                if((gettaskAcceptedEty != null && gettaskAcceptedEty.getStatus() == 3) || game_type == 1){
                     btnUpImag.setText("充值游戏");
                     type = 101;
                 }
@@ -383,6 +386,20 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             bottom_btn_layout.setVisibility(View.GONE);
         }
 
+        //h5
+        if(type == 10){
+            btnUpImag.setVisibility(View.VISIBLE);
+            btnUpImag.setText("上传截图");
+        }
+
+        //自动审核
+        if(taskEty.getInspect_type() == 3){
+
+            taskdetail_explain_layout.setVisibility(View.VISIBLE);
+        }else {
+            taskdetail_explain_layout.setVisibility(View.GONE);
+        }
+
     }
 
     private void checkAcceptedTask() {
@@ -438,6 +455,17 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             }
             bottom_btn_layout.setVisibility(View.GONE);
             ((View)llInfos.getParent()).setVisibility(View.GONE);
+            if(taskEty == null){
+                taskEty = taskReleaseEty.getTask();
+                if(taskEty != null && taskEty.getDesc() != null){
+                    if(taskEty.getDesc().startsWith("[")){
+                        List<TaskDescEntity> taskDescEntityList = JSONArray.parseArray(taskEty.getDesc(), TaskDescEntity.class);
+                        taskEty.setDescEntityList(taskDescEntityList);
+                    }
+
+                }
+            }
+
             setSonVuewShow();
         }
     }
@@ -979,10 +1007,10 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         detail_task_recyclerview.setVisibility(View.GONE);
         ems_game_layout.setVisibility(View.GONE);
         taskdetail_user_use_layout.setVisibility(View.GONE);
-        taskdetail_explain_layout.setVisibility(View.VISIBLE);
+        taskdetail_explain_layout.setVisibility(View.GONE);
         switch (taskEty.getTask_type()){
             case 1000://连续任务
-                if(taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null){
+                if(taskEty.getChild() != null && taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null){
                     detail_task_recyclerview.setVisibility(View.VISIBLE);
                     detail_item_layout_2.setVisibility(View.GONE);
                     detail_item_layout_3.setVisibility(View.GONE);
@@ -993,9 +1021,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     item_exlpain_conetent.setText(getString(R.string.supplement_explain));
                     sonListviewAdp = new TaskdetailSonListviewAdp(taskEty.getChild(), activity);
                     detail_task_recyclerview.setAdapter(sonListviewAdp);
+                    isSuccession = true;
+                }else {
+
+                    isSuccession = false;
                 }
 
-                isSuccession = true;
                 break;
             case 1002:
             case 1003://游戏任务
@@ -1081,12 +1112,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //        }
 
         //截至时间
-        if(taskReleaseEty != null && taskReleaseEty.isIs_running() && taskReleaseEty.getCancel_duration() > 0){
+        if(gettaskAcceptedEty != null &&taskReleaseEty != null && taskReleaseEty.isIs_running() && gettaskAcceptedEty.getEnd_time() > 0){
             CommonUtil.getInstance().getHashMap(end_of_time_tv);
 
             end_of_time_tv.setVisibility(View.VISIBLE);
-            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(taskReleaseEty.getCancel_duration(), end_of_time_tv, "");
-            selfCountDownTimer.reset(taskReleaseEty.getCancel_duration());
+            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(gettaskAcceptedEty.getEnd_time(), end_of_time_tv, "");
+            selfCountDownTimer.reset((int) gettaskAcceptedEty.getEnd_time());
             selfCountDownTimer.start();
 
             CommonUtil.getInstance().addTimerHashMap(end_of_time_tv, selfCountDownTimer);

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

@@ -12,6 +12,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -76,6 +77,8 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
     LinearLayout bottom_btn_layout;
     @BindView(R.id.detail_task_listview)
     MyListview detail_task_listview;
+    @BindView(R.id.item_layout)
+    RelativeLayout item_layout;
     private Activity activity;
 
     private TaskEty taskEty;
@@ -109,6 +112,7 @@ public class TaskDetailCreditCardAct extends AbsChooseImageActivity {
             netTaskSchedule();
             return;
         }
+        item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
         webText.setWebChromeClient(new WebChromeClient() {
 
         });

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

@@ -76,7 +76,7 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         }
         if(gameTaskOrderEnty.getPay_type() == 1){
             if(!TextUtils.isEmpty(payType)){
-                payType  += ",";
+                payType  += "\n" + " ";
             }else {
                 payType  += "";
             }
@@ -84,7 +84,7 @@ public class AdpGameTaskOrderList extends BaseAdapter {
         }else {//3
             payType = "绵羊币(" + gameTaskOrderEnty.getAmount() +")";
         }
-        holder.pay_type_tv.setText("支付方式：" + payType);
+        holder.pay_type_tv.setText(payType);
         holder.date_tv.setText("提交时间："+TimeUtil.getDate(TimeUtil.FORMAT, Long.valueOf(gameTaskOrderEnty.getCreate_time()))+"");
         holder.price_tv.setText("提交金额："+gameTaskOrderEnty.getAmount());
         holder.order_type_tv.setText("订单状态：");

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

@@ -258,7 +258,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                         if(item == null){
                             return;
                         }
-                        Jump2View.getInstance().goTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id());
+                        Jump2View.getInstance().goGameTaskDetailView(context,  etyList.get(i).getRelease_task_id(), etyList.get(i).getGame_id(),1);
                         UMConfigUtils.IdEvent.TASK.commit(item.getId());
 
                     }
@@ -589,7 +589,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
 
                     countdown_tv.setVisibility(View.VISIBLE);
                     String sr = "<font color='#ff2d4b'><small>" + "" + "</small></font>";
-                    countdown_tv.setText(sr+"");
+//                    countdown_tv.setText(sr+"");
                     SelfCountDownTimer selfCountDownTimer = new SelfCountDownTimer( etyList.get(i).getEnd_time() * 1000, 1000, etyList.get(i).getRelease_task().getCancel_duration()) {
                         @Override
                         public void onTimerRest() {

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

@@ -0,0 +1,99 @@
+package com.sheep.gamegroup.view.dialog;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActWeb;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+/**
+ * Created by ljy on 2018/6/22.
+ */
+
+public class DialogShare {
+    private Activity activity;
+    private String link;
+
+    public DialogShare(Activity activity, String link) {
+        this.activity = activity;
+        this.link = link;
+    }
+    public void showShare(){
+        if(activity == null){
+            return;
+        }
+        View dialog_parent = View.inflate(activity, R.layout.share_panel_layout, null);
+        final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.AppTheme_Dialog_Alert)
+                .setView(dialog_parent)
+                .create();
+        LinearLayout qq_layotu = dialog_parent.findViewById(R.id.qq_layotu);
+        LinearLayout weixin_layotu = dialog_parent.findViewById(R.id.weixin_layotu);
+        TextView withdrawal = dialog_parent.findViewById(R.id.withdrawal);
+        TextView tv_link = dialog_parent.findViewById(R.id.tv_link);
+        TextView cancel_share_tv = dialog_parent.findViewById(R.id.cancel_share_tv);
+        if (!TextUtils.isEmpty(link))
+            tv_link.setText(link);
+
+        withdrawal.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                StringUtils.CopyText(activity, link);
+                G.showToast("复制链接成功");
+            }
+        });
+
+
+        qq_layotu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.getInstance().popShare(activity, link, "qq");
+
+                dialog.dismiss();
+            }
+        });
+        weixin_layotu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                CommonUtil.getInstance().popShare(activity, link, "wx");
+                dialog.dismiss();
+            }
+        });
+
+        cancel_share_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialogInterface) {
+            }
+        });
+        try {
+            dialog.show();
+            Window window = dialog.getWindow();
+            window.setGravity(Gravity.BOTTOM);
+            WindowManager.LayoutParams params = dialog.getWindow().getAttributes();
+            params.width = G.WIDTH > G.HEIGHT? G.HEIGHT : G.WIDTH;
+            dialog.getWindow().setAttributes(params);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -139,7 +139,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 .inject(FgtTryMakeMoney.this);
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < 3; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         recyclerview.setAdapter(tryMakeMoneyAdp);
@@ -185,7 +185,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         releaseEtyLists.clear();
         tryMakeMoneyAdp.clear();
         tryMakeMoneyAdp.addType(type);
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < 3; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));
         }
         tryMakeMoneyAdp.setTaskAcceptedEty(null);

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

@@ -3,7 +3,7 @@
     android:shape="rectangle">
 
     <solid
-        android:color="@color/transparent"/>
+        android:color="@color/white"/>
 
     <corners
         android:radius="@dimen/radius_25"/>

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

@@ -16,16 +16,27 @@
         style="@style/style_nomal_tv"
         android:text="提交金额："
         app:layout_constraintTop_toBottomOf="@+id/date_tv"/>
-    <TextView
-        android:id="@+id/pay_type_tv"
-        style="@style/style_nomal_tv"
-        android:text="支付方式："
-        app:layout_constraintTop_toBottomOf="@+id/price_tv"/>
+    <LinearLayout
+        android:id="@+id/pay_type_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:layout_constraintTop_toBottomOf="@+id/price_tv">
+        <TextView
+            style="@style/style_nomal_tv"
+            android:text="支付方式:"
+            />
+        <TextView
+            android:id="@+id/pay_type_tv"
+            style="@style/style_nomal_tv"
+            android:text=""
+            />
+    </LinearLayout>
     <TextView
         android:id="@+id/order_type_tv"
         style="@style/style_nomal_tv"
         android:text="订单状态："
-        app:layout_constraintTop_toBottomOf="@+id/pay_type_tv"/>
+        app:layout_constraintTop_toBottomOf="@+id/pay_type_layout"/>
     <TextView
         android:id="@+id/order_end_time_tv"
         style="@style/style_nomal_tv"

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

@@ -27,6 +27,7 @@
             android:layout_marginBottom="@dimen/content_padding_15">
 
             <LinearLayout
+                android:id="@+id/qq_layotu"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
@@ -36,7 +37,7 @@
                 <ImageView
                     android:layout_width="35dp"
                     android:layout_height="35dp"
-                    android:src="@mipmap/icon" />
+                    android:src="@drawable/umeng_socialize_qq" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -48,6 +49,7 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/weixin_layotu"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
@@ -55,9 +57,10 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@mipmap/icon" />
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:scaleType="fitXY"
+                    android:src="@drawable/umeng_socialize_wechat"  />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -77,9 +80,9 @@
                 android:visibility="invisible">
 
                 <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@mipmap/icon" />
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:src="@drawable/umeng_socialize_qq" />
 
                 <TextView
                     android:layout_width="wrap_content"

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

@@ -78,7 +78,7 @@
                     android:layout_marginTop="@dimen/content_padding_10"
                     android:layout_marginLeft="@dimen/content_padding_10"
                     android:layout_marginRight="@dimen/content_padding_10"
-                    android:layout_marginBottom="@dimen/content_padding_22">
+                    android:layout_marginBottom="@dimen/content_padding_10">
                     <RelativeLayout
                         android:id="@+id/item_layout"
                         android:layout_width="match_parent"
@@ -231,7 +231,6 @@
                     android:divider="@null"
                     android:layout_marginStart="@dimen/content_padding_10"
                     android:layout_marginEnd="@dimen/content_padding_10"
-                    android:layout_marginBottom="@dimen/content_padding_10"
                     android:visibility="visible"/>
 
                 <com.sheep.gamegroup.util.MyListview
@@ -252,7 +251,9 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:padding="@dimen/content_padding_20"
-                    android:layout_margin="@dimen/content_padding_10"
+                    android:layout_marginLeft="@dimen/content_padding_10"
+                    android:layout_marginRight="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_10"
                     android:orientation="vertical"
                     android:visibility="gone">
 
@@ -277,7 +278,9 @@
                     android:layout_height="match_parent"
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
                     android:padding="@dimen/content_padding_20"
-                    android:layout_margin="@dimen/content_padding_10"
+                    android:layout_marginLeft="@dimen/content_padding_10"
+                    android:layout_marginRight="@dimen/content_padding_10"
+                    android:layout_marginTop="@dimen/content_padding_10"
                     android:orientation="vertical"
                     android:visibility="gone">
 

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

@@ -5,7 +5,9 @@
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:orientation="vertical"
-    android:layout_margin="@dimen/content_padding_10"
+    android:layout_marginLeft="@dimen/content_padding_10"
+    android:layout_marginRight="@dimen/content_padding_10"
+    android:layout_marginTop="@dimen/content_padding_10"
     android:visibility="gone">
 
     <LinearLayout

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

@@ -61,6 +61,7 @@
             android:orientation="horizontal"
             android:layout_gravity="center_vertical"
             android:background="@drawable/sp_bg_white_solid_bottom"
+            android:paddingTop="@dimen/content_padding_3"
             android:paddingBottom="@dimen/content_padding_15">
             <TextView
                 android:layout_width="4dp"

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

@@ -121,6 +121,7 @@
             android:textSize="@dimen/text_size_12"
             android:textColor="@color/txt_black_8e8e8e"/>
         <LinearLayout
+            android:id="@+id/item_date_layout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -168,6 +169,7 @@
     </android.support.constraint.ConstraintLayout>
 
     <TextView
+        android:id="@+id/countdown_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/sp_rectangle_bg_gray_radius"

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

@@ -216,8 +216,8 @@
     </style>
 
     <style name="style_circle_main_v">
-        <item name="android:layout_width">18dp</item>
-        <item name="android:layout_height">18dp</item>
+        <item name="android:layout_width">10dp</item>
+        <item name="android:layout_height">10dp</item>
         <item name="android:background">@drawable/sp_bg_circle_main</item>
     </style>
 
@@ -226,7 +226,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">#353235</item>
-        <item name="android:textSize">15sp</item>
+        <item name="android:textSize">10sp</item>
     </style>
 
     <style name="style_about_us_title">