bug 修改

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

@@ -16,6 +16,7 @@ import android.view.ViewTreeObserver;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.sdk.app.PayTask;
 import com.arialyy.aria.core.Aria;
@@ -30,6 +31,8 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.GamePayList;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.model.entity.RecyleObj;
+import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
@@ -65,6 +68,7 @@ import java.security.MessageDigest;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -1225,6 +1229,8 @@ public class CommonUtil {
 
                         ViewUtil.newInstance().hideProgress((Activity) context);
                         G.showToast(baseMessage.getMsg() + "");
+                        if(action1 != null)
+                            action1.call(null);
                     }
 
                     @Override
@@ -1265,6 +1271,40 @@ public class CommonUtil {
                     }
                 });
     }
+    /**
+     * 领取游戏账号
+     */
+    public void gameTask(final Context context, final String task_type,final String name, final Action1<BaseMessage> action1) {
+        ViewUtil.newInstance().showProgress((Activity) context);
+
+        SheepApp.getInstance()
+                .getNetComponent()
+                .getApiService()
+                .releaseGameTask(
+                        1,
+                        100,
+                        0,
+                        task_type,
+                        name)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage.getMsg());
+                        if (action1 != null)
+                            action1.call(null);
+                    }
+
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+
+                        if (action1 != null)
+                            action1.call(baseMessage);
+
+                    }
+                });
+    }
 
     /**
      * show view

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

@@ -48,6 +48,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_HELP;
@@ -248,36 +249,23 @@ public class ActGameAgencyRecharge extends BaseActivity {
         notifyDataSetChanged();
         if(gridViewEntity == null)
             return;
-        SheepApp.getInstance()
-                .getNetComponent()
-                .getApiService()
-                .releaseGameTask(
-                1,
-                100,
-                0,
-                 task_type,
-                "")
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+        CommonUtil.getInstance()
+                .gameTask(activity, task_type, "", new Action1<BaseMessage>() {
                     @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage.getMsg());
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
-                        if(releaseEtyList != null){
-                            releaseEtyLists.clear();
-                            releaseEtyLists.addAll(releaseEtyList);
-                            tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.GAME_AGENCY_PAYMENT, releaseEtyLists),1);
-                            notifyDataSetChanged();
+                    public void call(BaseMessage baseMessage) {
+                        try {
+                            List<TaskReleaseEty> releaseEtyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), TaskReleaseEty.class);
+                            if(releaseEtyList != null){
+                                releaseEtyLists.clear();
+                                releaseEtyLists.addAll(releaseEtyList);
+                                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.GAME_AGENCY_PAYMENT, releaseEtyLists),1);
+                                notifyDataSetChanged();
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
-
                     }
                 });
-
     }
 
     @Override

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

@@ -15,12 +15,16 @@ import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.alibaba.fastjson.JSONArray;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.RecyleObj;
+import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.SearchGameRecord;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyDbManager;
@@ -40,6 +44,7 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.OnClick;
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.SEARCH_GAME_COMMIT;
@@ -271,28 +276,26 @@ public class ActSearchGame extends BaseActivity {
             Jump2View.getInstance().goWeb(activity, inputText, "测试内部H5");
             return;
         }
-        //执行搜索
-        SheepApp.getInstance().getNetComponent().getApiService()
-                .releaseTask(1, 9,
-                        SheepApp.getInstance().getConnectAddress().getPlatForm(), 1,
-                        0, 0,
-                        "1002,1003,1004", 3, inputText)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<TaskReleaseEty> newList = baseMessage.getDatas(TaskReleaseEty.class);
-                        list.clear();
-                        ListUtil.addAll(list, newList);
-                        notifyDataSetChanged();
-                    }
 
+        CommonUtil.getInstance()
+                .gameTask(activity, "1002,1003,1004", inputText, new Action1<BaseMessage>() {
                     @Override
-                    public void onError(BaseMessage baseMessage) {
-                        G.showToast("暂无游戏");
-                        list.clear();
-                        notifyDataSetChanged();
+                    public void call(BaseMessage baseMessage) {
+                        try {
+                            if(baseMessage == null){
+
+                                G.showToast("暂无游戏");
+                                list.clear();
+                                notifyDataSetChanged();
+                            }else {
+                                List<TaskReleaseEty> newList = baseMessage.getDatas(TaskReleaseEty.class);
+                                list.clear();
+                                ListUtil.addAll(list, newList);
+                                notifyDataSetChanged();
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
                     }
                 });
     }

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

@@ -85,6 +85,8 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.GAME_INSTEAD_OF_RECHARGE_GET;
+
 /**
  * 任务详情页面
  * Created by ljy on 2018/4/2.
@@ -344,6 +346,14 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 btnTaskItem.setVisibility(View.GONE);
             }
         }
+        /**
+         * detail_task_tv 游戏任务，显示
+         */
+        if(taskEty.isGameTask() &&taskEty.isIs_receive_account()){
+            detailTaskTv.setVisibility(View.VISIBLE);
+            detailTaskTv.setText("领取福利号");
+            detailTaskTv.setBackground(activity.getResources().getDrawable(R.drawable.selector_button_full_main));
+        }
     }
     //设置底部按钮状态
     private void setBottomState() {
@@ -505,6 +515,19 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         try {
             switch (view.getId()) {
                 case R.id.detail_task_tv://查看任务截图
+                    if(taskEty.isGameTask() &&taskEty.isIs_receive_account()){
+
+                        GAME_INSTEAD_OF_RECHARGE_GET.onEvent();
+                        CommonUtil.getInstance()
+                                .gameAccountManager(activity, Integer.parseInt(taskReleaseEty.getTask_id()), new Action1<BaseMessage>() {
+                                    @Override
+                                    public void call(BaseMessage baseMessage) {
+                                        G.showToast("领取成功");
+                                        initData();
+                                    }
+                                });
+                        return;
+                    }
                     if (gettaskAcceptedEty == null || TextUtils.isEmpty(gettaskAcceptedEty.getScreenshots())) {
                         G.showToast("任务截图为空");
                         return;

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

@@ -60,6 +60,10 @@ public class DialogAddAccount {
     private TextView game_account_game_list_tv_spinner;
     private EditText game_account_et;
     private TextView game_account_plator_spinner_tv;
+    private RadioGroup radio_group_tencent;
+
+    //qq:1 wx:2
+    private int tencentType;
 
     public DialogAddAccount(Activity activity) {
         this.activity = activity;
@@ -98,6 +102,11 @@ public class DialogAddAccount {
         View view = LayoutInflater.from(activity).inflate(R.layout.dialog_add_account, dialog_center_ll, true);
         dialog_title.setText("添加账号");
 
+        /**
+         * radio_group_tencent
+         */
+        radio_group_tencent = view.findViewById(R.id.radio_group_tencent);
+
         TextView sureTv = view.findViewById(R.id.add_sure_tv);
         game_account_et = view.findViewById(R.id.game_account_et);
         final EditText game_pwd_et = view.findViewById(R.id.game_pwd_et);
@@ -175,6 +184,25 @@ public class DialogAddAccount {
             }
         });
 
+        radio_group_tencent.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(RadioGroup group, int checkedId) {
+
+                // 获取选中的RadioButton的id
+                int id = group.getCheckedRadioButtonId();
+                // 通过id实例化选中的这个RadioButton
+                RadioButton choise = (RadioButton) activity.findViewById(id);
+                switch (id){
+                    case R.id.conmon_id_tencent:
+                        tencentType = 1;
+                        break;
+                    case R.id.fixation_id_tencent:
+                        tencentType = 2;
+                        break;
+                }
+            }
+        });
+
 
         /**
          * 添加账号提交
@@ -194,11 +222,16 @@ public class DialogAddAccount {
                     return;
                 }
 
+                if(tencentType < 1){
+                    G.showToast("请选择QQ或微信");
+                }
+
                 JSONObject jsonObject = new JSONObject();
                 jsonObject.put("account", account);
                 jsonObject.put("password", password);
                 jsonObject.put("task_id", task_id);
-                jsonObject.put("game_type", game_type);
+                jsonObject.put("game_type", game_type);//Todo
+                jsonObject.put("tx_plotform", tencentType);//Todo
 
                 ViewUtil.newInstance().showProgress(activity);
                 SheepApp.getInstance()
@@ -415,6 +448,12 @@ public class DialogAddAccount {
             task_id = 0;
         }
         game_type = new_game_type;
+        if(game_type == 1003 && radio_group_tencent != null){//腾讯游戏
+            radio_group_tencent.setVisibility(View.VISIBLE);
+        }else {
+            radio_group_tencent.setVisibility(View.GONE);
+        }
+
     }
 
     private void selectGame(int position) {

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

@@ -40,6 +40,7 @@ public class DialogModifyAccount {
     private TextView sureTv;
     private int id;
     private GameAccountEntity gameAccountEntity;
+    private AlertDialog dialog;
 
     private TextView game_title_et;
     private TextView game_account_et;
@@ -78,7 +79,7 @@ public class DialogModifyAccount {
             return;
 
         View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
-        final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+        dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
                 .setView(dialog_parent)
                 .create();
         TextView dialog_title = dialog_parent.findViewById(R.id.dialog_title);
@@ -169,10 +170,15 @@ public class DialogModifyAccount {
                 .getGameAccountDetail(activity, id, new Action1<BaseMessage>() {
                     @Override
                     public void call(BaseMessage baseMessage) {
-                        gameAccountEntity = baseMessage.getData(GameAccountEntity.class);
-                        if(gameAccountEntity != null){
-                            initView();
+                        if(baseMessage != null){
+                            gameAccountEntity = baseMessage.getData(GameAccountEntity.class);
+                            if(gameAccountEntity != null){
+                                initView();
+                            }
+                        }else {
+
                         }
+
                     }
                 });
     }

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

@@ -15,12 +15,15 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.GamePayList;
 import com.sheep.gamegroup.model.entity.OrienteeringDetail;
 import com.sheep.gamegroup.model.entity.PayEntity;
+import com.sheep.gamegroup.model.entity.RecyleObj;
+import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -35,6 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 /**
@@ -204,31 +208,19 @@ public class DialogPayAccount {
      */
     private void intitDataAccountList(String name, PayEntity payEntity) {
 
-        SheepApp.getInstance()
-                .getNetComponent()
-                .getApiService()
-                .releaseGameTask(
-                        1,
-                        100,
-                        0,
-                        TextUtils.isEmpty(payEntity.getTask_type())?"1002,1003,1004":payEntity.getTask_type(),
-                        name)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
+        CommonUtil.getInstance()
+                .gameTask(activity, TextUtils.isEmpty(payEntity.getTask_type())?"1002,1003,1004":payEntity.getTask_type(), name, new Action1<BaseMessage>() {
                     @Override
-                    public void onError(BaseMessage baseMessage) {
-
-                        G.showToast(baseMessage.getMsg() + "");
-                    }
-
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<GamePayList> taskReleaseEtyList = baseMessage.getDatas(GamePayList.class);
-                        if (!ListUtil.isEmpty(taskReleaseEtyList)) {
-                            gamePayLists.clear();
-                            gamePayLists.addAll(taskReleaseEtyList);
-                            showListAccount(game_et);
+                    public void call(BaseMessage baseMessage) {
+                        try {
+                            List<GamePayList> taskReleaseEtyList = baseMessage.getDatas(GamePayList.class);
+                            if (!ListUtil.isEmpty(taskReleaseEtyList)) {
+                                gamePayLists.clear();
+                                gamePayLists.addAll(taskReleaseEtyList);
+                                showListAccount(game_et);
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
                         }
                     }
                 });

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

@@ -53,6 +53,37 @@
             android:checked="false"
             android:paddingStart="@dimen/content_padding_15"/>
     </RadioGroup>
+    <RadioGroup
+        android:id="@+id/radio_group_tencent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingRight="@dimen/content_padding_20"
+        android:paddingBottom="@dimen/dp_10"
+        android:paddingTop="@dimen/dp_10"
+        android:paddingLeft="@dimen/content_padding_20"
+        android:visibility="gone">
+
+        <RadioButton
+            android:id="@+id/conmon_id_tencent"
+            android:layout_width="match_parent"
+            android:layout_weight="1"
+            android:layout_height="match_parent"
+            android:text="QQ"
+            android:textSize="@dimen/text_size_13"
+            android:drawablePadding="@dimen/content_padding_5"
+            android:paddingStart="@dimen/content_padding_15"/>
+
+        <RadioButton
+            android:id="@+id/fixation_id_tencent"
+            android:layout_width="match_parent"
+            android:layout_weight="1"
+            android:layout_height="match_parent"
+            android:text="微信"
+            android:textSize="@dimen/text_size_13"
+            android:checked="false"
+            android:paddingStart="@dimen/content_padding_15"/>
+    </RadioGroup>
 
     <TextView
         android:id="@+id/game_account_game_list_tv_spinner"