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

# Conflicts:
#	app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
#	app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

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

@@ -459,8 +459,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 break;
             case R.id.icon_layout://
                 if(TestUtil.isTest()) {
-                    TestUtil.test(getActivity());
-//                    Jump2View.getInstance().testIntent(activity);
+//                    TestUtil.test(getActivity());
+                    Jump2View.getInstance().testIntent(activity);
                 }else
                     Jump2View.getInstance().goPersonnalCenterView(activity, null);
                 break;

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

@@ -22,6 +22,10 @@ import com.arialyy.aria.core.Aria;
 import com.arialyy.aria.core.download.DownloadTarget;
 import com.arialyy.aria.core.inf.IEntity;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.kfzs.duanduan.event.BigEvent;
+import com.kfzs.duanduan.event.EventTypes;
+import com.kfzs.duanduan.fragment.FgtSmallSheep;
+import com.kfzs.duanduan.utils.dlg.SkipUtils;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.alipay.PayResult;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -31,22 +35,32 @@ import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
+import com.sheep.gamegroup.model.entity.TaskListen;
 import com.sheep.gamegroup.model.entity.UserEntity;
+import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.WithdrawalEty;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
+import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
+import com.sheep.gamegroup.view.activity.RechargeAct;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.service.MonitorAppService;
 import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMAuthListener;
 import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.UMShareListener;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.umeng.socialize.media.UMWeb;
+import com.umeng.socialize.shareboard.SnsPlatform;
+import com.umeng.socialize.utils.ShareBoardlistener;
+
+import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -145,6 +159,7 @@ public class CommonUtil {
                 count = count + 2;
             }
             if(maxLen==count || (item>=128 && maxLen+1==count)){
+                endIndex=i;
             }
         }
 //        if (count <= maxLen) {
@@ -197,8 +212,41 @@ public class CommonUtil {
         }
     }
 
+    /**
+     * 倒计时
+     */
+    public void countDownTimer(final TextView tv, long full_second, SelfCountDownTimer countDownUtil){
+        countDownUtil = new SelfCountDownTimer(full_second * 1000, 1000,(int)full_second) {
+            @Override
+            public void onTimerRest() {
+                tv.setText("");
+            }
+
+            @Override
+            public void onTimerTick(long millisUntilFinished, int counTime) {
+                String textStr = counTime + " s";
+                tv.setText("");
+            }
+
+            @Override
+            public void onTimerFinish() {
+                tv.setText("");
+            }
+        };
+    }
+
+    /**
+     * 任务倒计时
+     * 组装String
+     * 若00:00:00后任务未完成，视为自动放弃，您可重新接受
+     */
+    public String assemblyString(String date){
+        String str = "若<font color='#ff2d4b'><small>" + date + "</small></font>后任务未完成，视为自动放弃，您可重新接受";
+        return str;
+    }
     public String assemblyStrings(String date, String notice){
-        return notice + "<font color='#ff2d4b'><small>" + date + "</small></font>";
+        String str = notice + "<font color='#ff2d4b'><small>" + date + "</small></font>";
+        return str;
     }
     /**
      * 任务传送数据组装
@@ -251,8 +299,8 @@ public class CommonUtil {
                 Drawable mipmap = context.getResources().getDrawable(
                         getResourceId(source)
                 );
-                mipmap.setBounds(0, 0, mipmap.getIntrinsicWidth(),
-                        mipmap.getIntrinsicHeight());
+                mipmap.setBounds(0, 0, mipmap.getIntrinsicWidth() / 1,
+                        mipmap.getIntrinsicHeight() / 1);
                 return mipmap;
             }
         }, null);
@@ -539,7 +587,7 @@ public class CommonUtil {
      * 任务详情、连续任务、子任务组装
      */
     public void bindDataTaskDetailSon(TaskChild taskChild, TextView textView, int i){
-        String state;
+        String state = "";
         switch (taskChild.getStatus()){
             case 1:
             default:
@@ -568,7 +616,7 @@ public class CommonUtil {
     }
     public void bindDataTaskDetailSonStep(TaskDescEntity taskDescEntity, TextView textView, int i){
 
-        String state;
+        String state = "";
         switch (i+1){
             case 1:
             default:
@@ -636,6 +684,7 @@ public class CommonUtil {
         SelfCountDownTimer scTimer = timerHashMap.get(textView);
         if(scTimer != null){
             scTimer.cancel();
+            scTimer = null;
         }
     }
     public void addTimerHashMap(TextView textView, SelfCountDownTimer selfCountDownTimer){
@@ -654,9 +703,12 @@ public class CommonUtil {
                 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();
     }
 
@@ -682,9 +734,16 @@ public class CommonUtil {
                             SHARE_MEDIA.QQ,
                             SHARE_MEDIA.WEIXIN)
                     .setCallback(new UMShareListener())
+//                    .addButton("copy_share_url","copy_share_url","icon","icon")
+//                    .setShareboardclickCallback(new ShareBoardlistener() {
+//                        @Override
+//                        public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
+//
+//                        }
+//                    })
                     .open();
         }else {
-            SHARE_MEDIA share_media;
+            SHARE_MEDIA share_media = SHARE_MEDIA.QQ;
             if(type.equals("qq")){
                 share_media = SHARE_MEDIA.QQ;
             }else {
@@ -742,15 +801,17 @@ public class CommonUtil {
                     public void run() {
 
                         PayResult payResult = new PayResult(result);
-                        /*
-                          同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
-                          detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
-                          docType=1) 建议商户依赖异步通知
+                        /**
+                         * 同步返回的结果必须放置到服务端进行验证（验证的规则请看https://doc.open.alipay.com/doc2/
+                         * detail.htm?spm=0.0.0.0.xdvAU6&treeId=59&articleId=103665&
+                         * docType=1) 建议商户依赖异步通知
                          */
 //						String resultInfo = payResult.getResult();// 同步返回需要验证的信息
 
                         String resultStatus = payResult.getResultStatus();
                         Jump2View.getInstance().goRechargeResultAct(activity, resultStatus);
+                        if(activity instanceof GameTaskOrderListAct)
+                            EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_GAMETASK_ORDER_LIST_PAGE));
                         if(dialog != null){
                             dialog.dismiss();
                         }
@@ -815,6 +876,8 @@ public class CommonUtil {
                     @Override
                     public void onError(BaseMessage baseMessage) {
                         G.showToast(baseMessage.getMsg() +"");
+                        ViewUtil.newInstance()
+                                .hideProgress(context);
 
                     }
 
@@ -825,6 +888,7 @@ public class CommonUtil {
                             ViewUtil.newInstance()
                                     .hideProgress(context);
                             if(status == 2){
+                                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_GAMETASK_ORDER_LIST_PAGE));
                                 return;
                             }
                             if(finalPay_type == 1){
@@ -833,6 +897,7 @@ public class CommonUtil {
                                                 context,
                                                 null);
                             }else {
+                                EventBus.getDefault().post(new BigEvent().setEventTypes(EventTypes.ONFRESH_GAMETASK_ORDER_LIST_PAGE));
                                 G.showToast("充值成功!");
                             }
                         } catch (Exception e) {

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -1207,6 +1208,8 @@ public class Jump2View {
         activity.startActivity(intent);
     }
     public void testIntent(Context activity){
-        activity.startActivity(new Intent(activity.getPackageName()));
+        PackageManager packageManager = activity.getPackageManager();
+
+        activity.startActivity(packageManager.getLaunchIntentForPackage(activity.getPackageName()));
     }
 }

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

@@ -438,6 +438,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
             }
             bottom_btn_layout.setVisibility(View.GONE);
             ((View)llInfos.getParent()).setVisibility(View.GONE);
+            setSonVuewShow();
         }
     }
 
@@ -977,8 +978,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         item_layout.setBackgroundResource(R.drawable.sp_bg_white_solid_top);
         detail_task_recyclerview.setVisibility(View.GONE);
         ems_game_layout.setVisibility(View.GONE);
-        taskdetail_explain_layout.setVisibility(View.GONE);
         taskdetail_user_use_layout.setVisibility(View.GONE);
+        taskdetail_explain_layout.setVisibility(View.VISIBLE);
         switch (taskEty.getTask_type()){
             case 1000://连续任务
                 if(taskEty.getChild().size() > 0 && taskEty.getChild().get(0).getDescEntityList() != null){
@@ -1080,12 +1081,12 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //        }
 
         //截至时间
-        if(taskReleaseEty != null && taskReleaseEty.isIs_running() && taskReleaseEty.getDemo_time() > 0){
+        if(taskReleaseEty != null && taskReleaseEty.isIs_running() && taskReleaseEty.getCancel_duration() > 0){
             CommonUtil.getInstance().getHashMap(end_of_time_tv);
 
             end_of_time_tv.setVisibility(View.VISIBLE);
-            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(taskReleaseEty.getDemo_time(), end_of_time_tv, "");
-            selfCountDownTimer.reset(taskReleaseEty.getDemo_time());
+            SelfCountDownTimer selfCountDownTimer = CommonUtil.getInstance().getCountDownTimer(taskReleaseEty.getCancel_duration(), end_of_time_tv, "");
+            selfCountDownTimer.reset(taskReleaseEty.getCancel_duration());
             selfCountDownTimer.start();
 
             CommonUtil.getInstance().addTimerHashMap(end_of_time_tv, selfCountDownTimer);

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

@@ -217,7 +217,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                     screens_iv.setAdjustViewBounds(true);
                     screens_iv.setScaleType(ImageView.ScaleType.FIT_XY);
 
-                    screens_iv.setLayoutParams(new LinearLayout.LayoutParams(with, with));
+                    viewHolder.itemView.setLayoutParams(new LinearLayout.LayoutParams(with, with));
 
                     if(TextUtils.isEmpty(taskDescEntity.getDesc())){
                         screens_tv.setVisibility(View.GONE);

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

@@ -209,7 +209,7 @@ public class FgtGameMakeMoney extends BaseFragment implements TryMakeMoneyContra
                                 G.showToast(" 网络错误！");
                             }
                             getNetWork(type);
-                            notifyDataSetChanged();
+//                            notifyDataSetChanged();
                         }
 
                         @Override

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

@@ -268,7 +268,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             e.printStackTrace();
         }
         getNetWork(type);
-        notifyDataSetChanged();
+//        notifyDataSetChanged();
     }
 
     @Override
@@ -288,7 +288,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             G.showToast(" 网络错误！");
         }
         getNetWork(type);
-        notifyDataSetChanged();
+//        notifyDataSetChanged();
     }
 
     /**

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

@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:background="@color/blue_E9EFF2">
+
+        <TextView
+            android:id="@+id/share_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="选择要分享的平台"
+            android:padding="@dimen/content_padding_15"/>
+        <!--暂时两个这么弄-->
+        <LinearLayout
+            android:id="@+id/share_item_layout"
+            android:layout_below="@+id/share_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:layout_marginBottom="@dimen/content_padding_15">
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:src="@mipmap/icon" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginTop="@dimen/content_padding_2"
+                    android:text="QQ"
+                    style="@style/nomal_txt_style_12"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:src="@mipmap/icon" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="微信"
+                    android:layout_marginTop="@dimen/content_padding_2"
+                    style="@style/nomal_txt_style_12"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:visibility="invisible">
+
+                <ImageView
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:src="@mipmap/icon" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="QQ" />
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/copy_share_url_layotu"
+            android:layout_below="@+id/share_item_layout"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginBottom="@dimen/content_padding_15"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/tv_link"
+                android:layout_width="0dp"
+                android:layout_height="30dp"
+                android:layout_weight="1"
+                android:layout_marginLeft="@dimen/content_padding_15"
+                android:background="@drawable/recharge_bg_angle_blue_normal"
+                android:gravity="left|center_vertical"
+                android:lines="1"
+                android:maxLines="1"
+                android:paddingLeft="@dimen/content_padding_10"
+                android:paddingRight="@dimen/content_padding_10"
+                android:singleLine="true"
+                android:textColor="#999999"
+                android:textSize="@dimen/text_size_15" />
+
+            <TextView
+                android:id="@+id/withdrawal"
+                style="@style/style_button_show_1"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/content_padding_30"
+                android:layout_marginBottom="5dp"
+                android:layout_marginStart="10dp"
+                android:layout_marginTop="5dp"
+                android:text="复制链接" />
+        </LinearLayout>
+        <TextView
+            android:id="@+id/cancel_share_tv"
+            android:layout_below="@+id/copy_share_url_layotu"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:background="@color/white"
+            android:text="取消分享"
+            style="@style/txt_style_15"
+            android:gravity="center"/>
+    </RelativeLayout>
+
+</FrameLayout>

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

@@ -170,24 +170,24 @@
                                 android:textSize="@dimen/text_size_2"
                                 android:layout_gravity="center_horizontal"
                                 android:textColor="@color/txt_black_818181"/>
+                            <TextView
+                                android:id="@+id/detail_task_tv"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="任务截图"
+                                android:minWidth="@dimen/view_size_73"
+                                android:textColor="@color/white"
+                                android:textSize="@dimen/text_size_12"
+                                android:gravity="center"
+                                android:padding="@dimen/content_padding_3"
+                                android:layout_alignParentRight="true"
+                                android:background="@drawable/sp_bg_gradient_rectangle_yellow"
+                                android:visibility="gone"
+                                android:layout_marginTop="@dimen/content_padding_8"
+                                android:layout_alignParentBottom="true"/>
                         </LinearLayout>
 
                     </RelativeLayout>
-                    <TextView
-                        android:id="@+id/detail_task_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="任务截图"
-                        android:minWidth="@dimen/view_size_73"
-                        android:textColor="@color/white"
-                        android:textSize="@dimen/text_size_12"
-                        android:gravity="center"
-                        android:padding="@dimen/content_padding_3"
-                        android:layout_alignParentRight="true"
-                        android:layout_below="@+id/item_layout"
-                        android:background="@drawable/sp_bg_gradient_rectangle_yellow"
-                        android:visibility="gone"
-                        android:layout_alignParentBottom="true"/>
                     <LinearLayout
                         android:id="@+id/detail_shrae_friend_layout"
                         android:layout_width="match_parent"

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

@@ -19,6 +19,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:text=""
+        android:lines="1"
+        android:ellipsize="end"
         android:layout_marginTop="@dimen/content_padding_small"
         android:visibility="visible"/>
 </LinearLayout>

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

@@ -4,16 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
-    android:layout_margin="@dimen/content_padding_10"
-    android:paddingRight="@dimen/content_padding_small"
-    android:paddingTop="@dimen/content_padding_small"
-    android:paddingBottom="@dimen/content_padding_15"
     android:orientation="vertical"
+    android:layout_margin="@dimen/content_padding_10"
     android:visibility="gone">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingRight="@dimen/content_padding_small"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingBottom="@dimen/content_padding_15"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
         <TextView

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

@@ -30,6 +30,7 @@
     <color name="yellow_FAF632">#FAF632</color>
     <color name="blue_start">#80d2fe</color>
     <color name="blue_E2F4FE">#E2F4FE</color>
+    <color name="blue_E9EFF2">#E9EFF2</color>
     <color name="blue_end">#1394e8</color>
     <color name="blue_34a6e7">#34a6e7</color>
     <color name="blue_FF53BBF2">#FF53BBF2</color>

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

@@ -53,4 +53,6 @@
     <string name="warm_prompt_n">温馨提示</string>
     <string name="warm_prompt_content">游戏必须是在小绵羊平台下载的游戏，且游戏账号是新注册的，否者任务奖励无法使用。</string>
     <string name="warm_prompt_content_notice">注意：用户若删除游戏后，系统自动检测让其下载安装游戏。</string>
+
+    <string name="copy_share_url">复制连接</string>
 </resources>