Merge remote-tracking branch 'origin/2.8' into 2.8

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

@@ -207,7 +207,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
                 break;
             case R.id.recommend_friend_layout://推荐给好友
                 if (userEntity != null) {
-                    ViewUtil.shareLink(activity, userEntity.getShareLink());
+                    ViewUtil.shareLink(activity, CommonUtil.getInstance().jointString(userEntity.getShareLink(), "ohter"));
                 }
                 USER_SHARE.onEvent();
                 break;

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

@@ -485,7 +485,7 @@ public interface ApiService {
     @GET("app/game_consumption/my_games")
     Observable<BaseMessage> getMyGames(@Query("page") int page, @Query("per_page") int per_page);
     /**
-     * 获取定向消费游戏列表
+     * 获取定向消费游戏
      */
     @GET("app/game_consumption/my_game/{id}")
     Observable<BaseMessage> getMyGame(@Path("id") String third_task_id);

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

@@ -730,15 +730,10 @@ public class CommonUtil {
      * 分享
      * type: qq wx all
      */
-    public void popShare(Activity activity, String url, String type){
+    public void popShare(Activity activity, String url, String type, String description){
         if(activity == null || TextUtils.isEmpty(type) || TextUtils.isEmpty(url)){
             return;
         }
-        UMImage umImage = new UMImage(activity, R.mipmap.icon);
-        UMWeb umWeb = new UMWeb(url);
-        umWeb.setTitle(activity.getResources().getString(R.string.app_name));
-        umWeb.setThumb(umImage);
-        umWeb.setDescription(activity.getResources().getString(R.string.app_name));
         if(type.equals("all")){
 
             ViewUtil.newInstance()
@@ -760,12 +755,18 @@ public class CommonUtil {
 //                    })
                     .open();*/
         }else {
+            UMImage umImage = new UMImage(activity, R.mipmap.icon);
             SHARE_MEDIA share_media = SHARE_MEDIA.QQ;
             if(type.equals("qq")){
                 share_media = SHARE_MEDIA.QQ;
             }else {
                 share_media = SHARE_MEDIA.WEIXIN;
             }
+
+            UMWeb umWeb = new UMWeb(jointString(url, type));
+            umWeb.setTitle(activity.getResources().getString(R.string.app_name));
+            umWeb.setThumb(umImage);
+            umWeb.setDescription(TextUtils.isEmpty(description)?activity.getResources().getString(R.string.app_name):description);
             new ShareAction(activity)
                     .setPlatform(share_media)
                     .withMedia(umWeb)
@@ -773,6 +774,9 @@ public class CommonUtil {
                     .share();
         }
     }
+    public void popShare(Activity activity, String url, String type){
+        popShare(activity, url, type, null);
+    }
 
     class UMShareListener implements com.umeng.socialize.UMShareListener{
 
@@ -1641,4 +1645,18 @@ public class CommonUtil {
         }
 
     }
+
+    /**
+     * 分享 url type 拼接
+     */
+    public String jointString(String url, String type){
+        switch (type){
+            case "qq":
+                return url + "&type=2";
+            case "wx":
+                return url + "&type=1";
+            default:
+                return url + "&type=4";
+        }
+    }
 }

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

@@ -73,6 +73,7 @@ public class ViewUtil {
     }
 
     public static void showQR(final Activity activity, String link) {
+        link = CommonUtil.getInstance().jointString(link, "ohter");
         QR_SHARE.onEvent();
         View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
         final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)

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

@@ -123,18 +123,14 @@ public class AskGetMoneyAct extends BaseUMActivity implements UMShareListener, A
             G.showToast("数据正在加载中");
             return;
         }
-        UMImage thumb = new UMImage(this, R.drawable.icon);
-        UMWeb web = new UMWeb(userEntity.getShareLink());
-        web.setTitle(mEntity.getShare_title());//标题
-        web.setThumb(thumb);  //缩略图
-        web.setDescription(mEntity.getShare_desc());//描述
         ShareAction shareAction = new ShareAction(AskGetMoneyAct.this);
         if (code == 1) {
             shareAction.setPlatform(SHARE_MEDIA.WEIXIN);
+            CommonUtil.getInstance().popShare(AskGetMoneyAct.this, userEntity.getShareLink(), "wx",mEntity.getShare_desc());
         } else {
             shareAction.setPlatform(SHARE_MEDIA.QQ);
+            CommonUtil.getInstance().popShare(AskGetMoneyAct.this, userEntity.getShareLink(), "qq",mEntity.getShare_desc());
         }
-        shareAction.setCallback(this).withMedia(web).share();
     }
 
 

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

@@ -181,8 +181,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private TaskAcceptedEty gettaskAcceptedEty;
 
     private int releaseTaskId = -1;
-    private String game_id;
-    private int game_type = -1;
 
     private int type;//-1:开始任务 1：下载 2：安装 3：打开  10：打开H5，101：充值  100:领取奖励
 
@@ -208,9 +206,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         btn_show = getIntent().getBooleanExtra("btn_show", false);
         isFromTaskList = getIntent().getBooleanExtra("is_from_task_list", false);
         releaseTaskId = getIntent().getIntExtra("task_id", -1);
-        game_id = getIntent().getStringExtra("game_id");
-        game_type = getIntent().getIntExtra("game_type", -1);
-        LogUtil.println("TaskDetailAct", "btn_show =", btn_show, "isFromTaskList =", isFromTaskList, "taskId =", releaseTaskId, "game_id =", game_id, "game_type =", game_type);
         DaggerTaskDetailComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .taskDetailModule(new TaskDetailModule(this))
@@ -284,7 +279,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         bottom_btn_layout.setVisibility(View.VISIBLE);
         btnTaskItem.setVisibility(View.VISIBLE);
         btnUpImag.setVisibility(View.VISIBLE);
-        if ((gettaskAcceptedEty != null && gettaskAcceptedEty.isIs_running()) || taskReleaseEty.isIs_running() || game_id != null) {//已经领取任务
+        if (gettaskAcceptedEty != null && (gettaskAcceptedEty.isIs_running() || gettaskAcceptedEty.getStatus() == 3)) {//已经领取任务
             switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务
                 case 4://h5业务
                     type = 10;
@@ -336,7 +331,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     bottom_btn_layout.setVisibility(View.GONE);
                     break;
                 case 3://完成任务
-                    if(game_type != 1)
+                    if(!taskEty.isGameTask())
                         bottom_btn_layout.setVisibility(View.GONE);
                     break;
                 case 8://任务已经下线
@@ -377,8 +372,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                                 btnTaskItem.setText(CommonUtil.GAME_INSTALL);
                                 break;
                             case DownloadTaskService.STATUS_INSTALLED:
-                                if (game_type == 1) {
+                                if (gettaskAcceptedEty.getStatus() ==3) {
                                     btnUpImag.setText(CommonUtil.GAME_RECHAGE);
+                                    btnUpImag.setVisibility(View.VISIBLE);
                                     btnTaskItem.setText("启动游戏");
                                 } else {
                                     btnTaskItem.setVisibility(View.GONE);
@@ -607,9 +603,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     }
                     break;
                 case R.id.btn_up_imag:
-                    if(game_type == 1){
-                        if(game_id != null){
-                            ViewUtil.showGamePayAccount(activity, game_id, taskReleaseEty.getName());
+                    if(gettaskAcceptedEty.getStatus() ==3 &&taskEty.isGameTask()){
+                        if(taskEty.getThird_task_id() != null){
+                            ViewUtil.showGamePayAccount(activity, taskEty.getThird_task_id(), taskReleaseEty.getName());
                             return;
                         }
                     }else if(taskEty.isGameTask()){
@@ -1081,7 +1077,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
 
         //截至时间
-        if(gettaskAcceptedEty != null &&taskReleaseEty != null && taskReleaseEty.isIs_running() && gettaskAcceptedEty.getEnd_time() > 0){
+        if(gettaskAcceptedEty != null &&taskReleaseEty != null && gettaskAcceptedEty.isIs_running() && gettaskAcceptedEty.getEnd_time() > 0){
             CommonUtil.getInstance().getHashMap(end_of_time_tv);
 
             end_of_time_tv.setVisibility(View.VISIBLE);
@@ -1137,26 +1133,26 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private void getAcceptedTaskDetail(final int releaseTaskId){
         showProgress();
         CommonUtil.getInstance().getTaskAllDetail(releaseTaskId, new Action1<BaseMessage>() {
-                    @Override
-                    public void call(BaseMessage baseMessage) {
-                        if(baseMessage.getCode() == 0)
-                            gettaskAcceptedEty = baseMessage.getData(TaskAcceptedEty.class);
-                        if(gettaskAcceptedEty != null)
-                            taskReleaseEty = gettaskAcceptedEty.getRelease_task();
-                        if(taskReleaseEty == null){
-                            initTaskReleaseEty();
-                        } else {
-                            hideProgress();
-                            empty_view.setVisibility(View.GONE);
-                            initWigget();
-                        }
-                    }
-                });
+            @Override
+            public void call(BaseMessage baseMessage) {
+                if(baseMessage.getCode() == 0)
+                    gettaskAcceptedEty = baseMessage.getData(TaskAcceptedEty.class);
+                if(gettaskAcceptedEty != null)
+                    taskReleaseEty = gettaskAcceptedEty.getRelease_task();
+                if(taskReleaseEty == null){
+                    initTaskReleaseEty();
+                } else {
+                    hideProgress();
+                    empty_view.setVisibility(View.GONE);
+                    initWigget();
+                }
+            }
+        });
     }
 
     private void initTaskReleaseEty() {
         taskReleaseEty = DataUtil.getInstance().getCacheResult(ApiKey.releaseTaskDesc(releaseTaskId), TaskReleaseEty.class);
-            hideProgress();
+        hideProgress();
         if (taskReleaseEty != null) {
             empty_view.setVisibility(View.GONE);
             initWigget();

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

@@ -46,12 +46,12 @@ public class DialogShare {
         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);
+            tv_link.setText(CommonUtil.getInstance().jointString(link, "ohter"));
 
         withdrawal.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                StringUtils.CopyText(link);
+                StringUtils.CopyText(CommonUtil.getInstance().jointString(link, "ohter"));
                 G.showToast("复制链接成功");
             }
         });