修复游戏账号的问题

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

@@ -2,6 +2,9 @@ package com.sheep.gamegroup.model.entity;
 
 import android.text.TextUtils;
 
+import com.sheep.gamegroup.util.TestUtil;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+
 import org.xutils.db.annotation.Column;
 import org.xutils.db.annotation.Table;
 
@@ -315,4 +318,8 @@ public class UserEntity implements Serializable {
     public boolean canBindMobile(){
         return must_bind_mobile == 0 && TextUtils.isEmpty(mobile);
     }
+    //测试服用测试分享链接，正式服用正式的
+    public String getShareLink(){
+        return TestUtil.isTest() ? "http://10.8.210.230:8902/share.html?invitation_code="+getInvitation_code(): getShare_link();
+    }
 }

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

@@ -254,16 +254,16 @@ public class Jump2View {
                     CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
                         @Override
                         public void call(UserEntity userEntity) {
-                            if(userEntity != null && !TextUtils.isEmpty(userEntity.getShare_link())) {
+                            if(userEntity != null && !TextUtils.isEmpty(userEntity.getShareLink())) {
 //                                GlideImageLoader.downLoadImage(userEntity.getShare_link().hashCode(), AppUtil.getQRLink(userEntity.getShare_link(), 800), null);
 //                                //PersionInfoAct.java与AskGetMoneyAct.java中分享二维码时的图片预下载
                                 Glide.with(activity)
-                                        .load(AppUtil.getQRLink(userEntity.getShare_link(), 800))
+                                        .load(AppUtil.getQRLink(userEntity.getShareLink(), 800))
                                         .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                                         .preload(800, 800);
                             }
 
-                            if(userEntity != null && userEntity.canBindMobile() && !hasShowBindPhone(userEntity)){//老用户没有绑定手机号，且没有展示过绑定手机号界面
+                            if(userEntity != null && userEntity.canBindMobile()){//老用户没有绑定手机号，且没有展示过绑定手机号界面
                                 Jump2View.getInstance().goBindPhone(activity, 1);
                                 return;
                             }
@@ -285,20 +285,6 @@ public class Jump2View {
 //        });
     }
 
-    /**
-     * 该用户 显示过绑定手机号的界面
-     * @param userEntity
-     * @return
-     */
-    private boolean hasShowBindPhone(UserEntity userEntity) {
-        String string = ACache.get(SheepApp.getInstance()).getAsString(userEntity.getOpen_id());
-        if(string == null){
-            //因为只显示一次，所以直接保存值
-            ACache.get(SheepApp.getInstance()).put(userEntity.getOpen_id(), userEntity.getNickname());
-            return false;
-        }
-        return true;
-    }
 
     /**
      * 跳到手机登录页面

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

@@ -24,7 +24,7 @@ public abstract class SelfCountDownTimer extends CountDownTimer{
     public void reset(int full_second){
         this.cancel();
         countTime = full_second;
-
+        onTimerRest();
     }
 
     @Override

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

@@ -139,6 +139,7 @@ public class UMConfigUtils {
         GAME_INSTEAD_OF_RECHARGE_GAME("游戏代充模块 -> 点击游戏充值按钮"),//51
         GAME_INSTEAD_OF_RECHARGE_PAY("游戏代充模块 -> 点击游戏充值按钮 -> 点击立即支付"),//51
         USER_GAME_ACCOUNT_ADD("个人中心 -> 游戏账号 -> 点击添加图标"),//51
+        USER_GAME_ACCOUNT_ADD_COMMIT("个人中心 -> 游戏账号 -> 点击添加图标 -> 提交"),//51
         ;
         private String tag;
 

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

@@ -1,7 +1,6 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
-import android.opengl.Visibility;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
@@ -11,16 +10,13 @@ import android.view.View;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.GameAccountSuper;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.ViewUtil;
-import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 import com.sheep.gamegroup.view.adapter.AdpGameAccount;
-import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.customview.SheepmSwipeRefreshLayout;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -30,14 +26,13 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_ADD;
+
 /**
  * 游戏账号
  * Created by ljy on 2018/7/9.
@@ -51,9 +46,6 @@ public class ActGameAccount extends BaseActivity {
     @BindView(R.id.empty_view)
     View empty_view;
     private Activity activity;
-    private List<GameAccountEntity> gameAccountPlotformEntity = new ArrayList<>();
-    private List<GameAccountEntity> gameAccountTencentEntity = new ArrayList<>();
-    private List<GameAccountEntity> gameAccountXiaomiEntity = new ArrayList<>();
 
     private AdpGameAccount adpGameAccount;
 
@@ -74,9 +66,8 @@ public class ActGameAccount extends BaseActivity {
                         new View.OnClickListener() {
                             @Override
                             public void onClick(View v) {
-                                ViewUtil.newInstance()
-                                        .showAddAccount(activity);
-
+                                ViewUtil.newInstance().showAddAccount(activity);
+                                USER_GAME_ACCOUNT_ADD.onEvent();
                             }
                         });
 
@@ -139,15 +130,15 @@ public class ActGameAccount extends BaseActivity {
                         GameAccountSuper gameAccountSuper = baseMessage.getData(GameAccountSuper.class);
                         if(gameAccountSuper != null){
                             int position = 0;
-                            if(ListUtil.isEmpty(gameAccountSuper.getPlatform())){
+                            if(!ListUtil.isEmpty(gameAccountSuper.getPlatform())){
                                 adpGameAccount.add(RecyleObj.make(RecyleType.GAME_ACCOUNT_PLATFORM, gameAccountSuper.getPlatform()),position);
                                 position++;
                             }
-                            if(ListUtil.isEmpty(gameAccountSuper.getTengxun())){
+                            if(!ListUtil.isEmpty(gameAccountSuper.getTengxun())){
                                 adpGameAccount.add(RecyleObj.make(RecyleType.GAME_ACCOUNT_TENCENT, gameAccountSuper.getTengxun()),position);
                                 position++;
                             }
-                            if(ListUtil.isEmpty(gameAccountSuper.getXiaomi())){
+                            if(!ListUtil.isEmpty(gameAccountSuper.getXiaomi())){
                                 adpGameAccount.add(RecyleObj.make(RecyleType.GAME_ACCOUNT_XIAOMI, gameAccountSuper.getXiaomi()),position);
                             }
 

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

@@ -198,9 +198,7 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
             @Override
             public void onTimerFinish() {
-                canGetCaptchaPhone = true;
-                phoneBtnCode.setText(getString(R.string.get_captcha));
-                phone_btn_code_old.setText(getString(R.string.get_captcha));
+                onTimerRest();
             }
         };
     }
@@ -427,7 +425,8 @@ public class ChangeTelAct extends BaseActivity implements PhoneContract.View{
 
     @Override
     public void bindTelSmsFail(BaseMessage o) {
-        G.showToast(o.getMsg() + "");
+        G.showToast(o);
+        selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
 
     }
 

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

@@ -103,7 +103,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
                 tvSheepId.setText(mEntity.getInvitation_code());
 
                 Glide.with(PersionInfoAct.this)
-                        .load(AppUtil.getQRLink(mEntity.getShare_link(), 90))
+                        .load(AppUtil.getQRLink(mEntity.getShareLink(), 90))
                         .into(tvQr);
                 Glide.with(PersionInfoAct.this)
                         .load("http://cdngame.kuaifazs.com/icon.png")
@@ -146,7 +146,7 @@ public class PersionInfoAct extends AbsChooseImageActivity {
                 USER_INFO_NAME.onEvent();
                 break;
             case R.id.rl_qr:
-                ViewUtil.showQR(PersionInfoAct.this, mEntity.getShare_link());
+                ViewUtil.showQR(PersionInfoAct.this, mEntity.getShareLink());
                 break;
             case R.id.rl_head:
                 showChooseDialog();

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

@@ -19,6 +19,7 @@ import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
+import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -43,11 +44,10 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
         this.context = context;
     }
 
-    public AdpGameAccount(Context context, Context context1) {
-        super(context);
-        this.context = context1;
+    @Override
+    public int getItemViewType(int position) {
+        return getmListDatas().get(position).getRecyleType().ordinal();
     }
-
     @Override
     public int getViewIdByType(int type) {
         int resId = R.layout.empty;
@@ -64,42 +64,46 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
 
     @Override
     public void convert(final com.kfzs.appstore.utils.adapter.recyclerview.ViewHolder holder, RecyleObj recyleObj) {{
-        final List<GameAccountEntity> etyList = (List<GameAccountEntity>)recyleObj.getDataObj();
+        final List<GameAccountEntity> etyList = (List<GameAccountEntity>) recyleObj.getDataObj();
         if(etyList == null)
             return;
-        TextView item_title_tv = holder.getView(R.id.item_title_tv, TextView.class);
+        if(recyleObj.getRecyleType() == RecyleType.NONE) {
+            G.showToast("0000000");
+            return;
+        }
+//        TextView item_title_tv = holder.getView(R.id.item_title_tv, TextView.class);
+        if(holder.itemView instanceof LinearLayout){
+            if(((LinearLayout) holder.itemView).getChildCount() == 0){
+                G.showToast("11111111111111111");
+                return;
+            }
+        }
+        TextView item_title_tv = holder.itemView.findViewById(R.id.item_title_tv);
         switch (recyleObj.getRecyleType()){
             case GAME_ACCOUNT_PLATFORM:
                 item_title_tv.setText("快发平台账号");
                 break;
             case GAME_ACCOUNT_TENCENT:
-                item_title_tv.setText("小米游戏账号");
+                item_title_tv.setText("腾讯游戏账号");
                 break;
             case GAME_ACCOUNT_XIAOMI:
-                item_title_tv.setText("腾讯游戏账号");
+                item_title_tv.setText("小米游戏账号");
                 break;
         }
         RecyclerView recyclerView = holder.getView(R.id.release_task_listview, RecyclerView.class);
         recyclerView.setHasFixedSize(true);
         recyclerView.setLayoutManager(new LinearLayoutManager(context));
-        recyclerView.setAdapter(new RecyclerView.Adapter(){
+        recyclerView.setAdapter(new AdbCommonRecycler<GameAccountEntity>(context, etyList){
+
 
             @Override
-            public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int i) {
-                LinearLayout view = (LinearLayout) LayoutInflater.from(context)
-                        .inflate(R.layout.adp_game_account_item, viewGroup,false);
-                RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
-                    @Override
-                    public String toString() {
-                        return super.toString();
-                    }
-                };
-                return viewHolder;
+            public int getViewIdByType(int type) {
+                return R.layout.adp_game_account_item;
             }
 
             @Override
-            public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, final int i) {
-                if(etyList.get(i) == null){
+            public void convert(ViewHolder holder, final GameAccountEntity item) {
+                if(item == null){
                     return;
                 }
                 TextView account_tv = holder.itemView.findViewById(R.id.account_tv);
@@ -107,20 +111,20 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
                 TextView look_tv = holder.itemView.findViewById(R.id.look_tv);
                 LinearLayout delete_layout = holder.itemView.findViewById(R.id.delete_layout);
 
-                account_tv.setText("账号："+ CommonUtil.getInstance().returnStarData(etyList.get(i).getAccount(), 4, 2, 3));
-                state_tv.setText(etyList.get(i).getTypeName());
+                account_tv.setText("账号："+ CommonUtil.getInstance().returnStarData(item.getAccount(), 4, 2, 3));
+                state_tv.setText(item.getTypeName());
                 look_tv.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         ViewUtil.newInstance()
-                                .showGameAccountDetail((Activity) context, etyList.get(i).getId());
+                                .showGameAccountDetail((Activity) context, item.getId());
                     }
                 });
                 delete_layout.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
 
-                        ViewUtil.showMsgDialog((Activity)context, new DialogConfig().setTitle("删除确认").setMsg("确定删除吗？").setBtnRightText("取消")
+                        ViewUtil.showMsgDialog(context, new DialogConfig().setTitle("删除确认").setMsg("确定删除吗？").setBtnRightText("取消")
                                 .setBtnLeftText("确定").setBtnLeftOnClickListener(new View.OnClickListener() {
                                     @Override
                                     public void onClick(View view) {
@@ -141,11 +145,6 @@ public class AdpGameAccount extends AdpCommonRecy<RecyleObj> {
                     }
                 });
             }
-
-            @Override
-            public int getItemCount() {
-                return etyList.size();
-            }
         });
     }
 

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.dialog;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.os.Handler;
+import android.os.Looper;
 import android.os.Message;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
@@ -12,26 +13,20 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
-import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.sheep.gamegroup.model.entity.Agreement;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.GridViewEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -43,6 +38,8 @@ import java.util.List;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_GAME_ACCOUNT_ADD_COMMIT;
+
 /**
  * Created by ljy on 2018/7/10.
  */
@@ -51,14 +48,13 @@ public class DialogAddAccount {
     private Activity activity;
 
     private List<GameAccountEntity> gameAccountEntity = new ArrayList<>();
-    private ArrayList<Object> gamePlatorEntity = new ArrayList<>();
-    private ArrayList<Object> gameAccountListEntity = new ArrayList<>();
+    private ArrayList<GridViewEntity> gamePlatorEntity = new ArrayList<>();
+    private ArrayList<GameAccountEntity> gameAccountListEntity = new ArrayList<>();
 
     private int game_type;
     private int task_id;
     private String account;
     private String password;
-    private int task_type;
     private TextView game_account_game_list_tv_spinner;
     private EditText game_account_et;
     private TextView game_account_plator_spinner_tv;
@@ -67,7 +63,7 @@ public class DialogAddAccount {
         this.activity = activity;
     }
 
-    Handler mHandler = new Handler() {
+    private Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
@@ -135,7 +131,7 @@ public class DialogAddAccount {
                 showPlotFormList();
             }
         });
-
+        selectPlatform(0);
 
         /**
          * 游戏列表
@@ -184,7 +180,7 @@ public class DialogAddAccount {
         sureTv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-
+                USER_GAME_ACCOUNT_ADD_COMMIT.onEvent();
                 account = game_account_et.getText().toString().trim();
                 password = game_pwd_et.getText().toString().trim();
                 if (TextUtils.isEmpty(account)) {
@@ -332,10 +328,7 @@ public class DialogAddAccount {
                 .SelfPopupWindow(activity, game_account_game_list_tv_spinner, new AdapterView.OnItemClickListener() {
                             @Override
                             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                                GameAccountEntity entity = gameAccountEntity.get(position);
-                                G.showToast(entity.getTask_name() + "");
-                                game_account_game_list_tv_spinner.setText(gameAccountEntity.get(position).getTask_name() + "");
-                                task_id = entity.getTask_id();
+                                selectGame(position);
                                 SelfPopupWindow.newInstance().hidePop();
                             }
                         },
@@ -343,13 +336,15 @@ public class DialogAddAccount {
                             @Override
                             public boolean convert(int position, View convertView, ViewGroup parent, GameAccountEntity item) {
                                 final TextView name_tv = ViewFindUtils.find(convertView, R.id.name_tv);
-                                name_tv.setText(item.getTask_name() + "");
+                                ViewUtil.setText(name_tv, item.getTask_name());
                                 return true;
                             }
                         })
                 .initPopup()
                 .showPop();
     }
+
+
     /**
      * 账号列表显示
      */
@@ -358,24 +353,30 @@ public class DialogAddAccount {
                 .SelfPopupWindow(activity, game_account_et, new AdapterView.OnItemClickListener() {
                             @Override
                             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                                GameAccountEntity entity = (GameAccountEntity) gameAccountListEntity.get(position);
-                                G.showToast(entity.getTask_name() + "");
-                                game_account_et.setText(gameAccountEntity.get(position).getTask_name() + "");
-//                                task_id = entity.getTask_id();
+                                selectAccount(position);
                                 SelfPopupWindow.newInstance().hidePop();
                             }
                         },
-                        new com.sheep.gamegroup.view.adapter.ArrayAdapter<Object>(activity, R.layout.dialog_item_game_list, gameAccountListEntity) {
+                        new com.sheep.gamegroup.view.adapter.ArrayAdapter<GameAccountEntity>(activity, R.layout.dialog_item_game_list, gameAccountListEntity) {
                             @Override
-                            public boolean convert(int position, View convertView, ViewGroup parent, Object item) {
+                            public boolean convert(int position, View convertView, ViewGroup parent, GameAccountEntity item) {
                                 final TextView name_tv = ViewFindUtils.find(convertView, R.id.name_tv);
-                                name_tv.setText(((GameAccountEntity)item).getTask_name() + "");
+                                ViewUtil.setText(name_tv, item.getTask_name());
                                 return true;
                             }
                         })
                 .initPopup()
                 .showPop();
     }
+
+    private void selectAccount(int position) {
+        GameAccountEntity item = ListUtil.getIndex(gameAccountListEntity, position);
+        if(item == null)
+            return;
+        ViewUtil.setText(game_account_et, item.getTask_name());
+//                                task_id = entity.getTask_id();
+    }
+
     /**
      * 平台显示
      */
@@ -384,27 +385,40 @@ public class DialogAddAccount {
                 .SelfPopupWindow(activity, game_account_plator_spinner_tv, new AdapterView.OnItemClickListener() {
                             @Override
                             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                                GridViewEntity gridViewEntity = (GridViewEntity) gamePlatorEntity.get(position);
-                                G.showToast(gridViewEntity.getName() + "");
-                                game_account_plator_spinner_tv.setText(gridViewEntity.getName() + "");
-                                try {
-                                    game_type = Integer.parseInt(gridViewEntity.getTask_type());
-                                } catch (NumberFormatException e) {
-                                    e.printStackTrace();
-                                    task_type = 0;
-                                }
+                                selectPlatform(position);
                                 SelfPopupWindow.newInstance().hidePop();
                             }
                         },
-                        new com.sheep.gamegroup.view.adapter.ArrayAdapter<Object>(activity, R.layout.dialog_item_game_list, gamePlatorEntity) {
+                        new com.sheep.gamegroup.view.adapter.ArrayAdapter<GridViewEntity>(activity, R.layout.dialog_item_game_list, gamePlatorEntity) {
                             @Override
-                            public boolean convert(int position, View convertView, ViewGroup parent, Object item) {
+                            public boolean convert(int position, View convertView, ViewGroup parent, GridViewEntity item) {
                                 final TextView name_tv = ViewFindUtils.find(convertView, R.id.name_tv);
-                                name_tv.setText(((GridViewEntity)item).getName() + "");
+                                ViewUtil.setText(name_tv, item.getName());
                                 return true;
                             }
                         })
                 .initPopup()
                 .showPop();
     }
+
+    private void selectPlatform(int position) {
+        GridViewEntity item = ListUtil.getIndex(gamePlatorEntity, position);
+        if(item == null)
+            return;
+        ViewUtil.setText(game_account_plator_spinner_tv, item.getName());
+        int new_game_type = NumberFormatUtils.parseInteger(item.getTask_type());
+        if(new_game_type != game_type) {//选择不同平台时，游戏重置
+            ViewUtil.setText(game_account_game_list_tv_spinner);
+            task_id = 0;
+        }
+        game_type = new_game_type;
+    }
+
+    private void selectGame(int position) {
+        GameAccountEntity item = ListUtil.getIndex(gameAccountEntity, position);
+        if(item == null)
+            return;
+        ViewUtil.setText(game_account_game_list_tv_spinner, item.getTask_name());
+        task_id = item.getTask_id();
+    }
 }

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

@@ -4,20 +4,13 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.PopupWindow;
-import android.widget.TextView;
 
-import com.kfzs.duanduan.utils.dlg.ViewFindUtils;
-import com.sheep.gamegroup.model.entity.GameAccountEntity;
-import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.view.adapter.ArrayAdapter;
 import com.sheep.jiuyan.samllsheep.R;
-import com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,7 +38,7 @@ public class SelfPopupWindow {
     private View mSelectTv;
 
     /** popup窗口里的ListView */
-    private MyListview myListview;
+    private ListView myListview;
 
     /** popup窗口 */
     private PopupWindow typeSelectPopup;
@@ -68,7 +61,7 @@ public class SelfPopupWindow {
     }
 
     public SelfPopupWindow initPopup(){
-        myListview = new MyListview(activity);
+        myListview = new ListView(activity);
         TestData();
         myListview.setAdapter(testDataAdapter);
         myListview.setOnItemClickListener(onItemClickListener);

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

@@ -12,7 +12,10 @@
         android:background="@drawable/sp_bg_blue_stroke"
         android:hint=""
         android:minWidth="@dimen/view_size_150"
-        android:padding="@dimen/content_padding_small"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingEnd="@dimen/content_padding"
         android:text=""
         android:textSize="@dimen/text_size_13"
         android:drawableRight="@mipmap/arrow_down"
@@ -58,7 +61,10 @@
         android:background="@drawable/sp_bg_blue_stroke"
         android:hint=""
         android:minWidth="@dimen/view_size_150"
-        android:padding="@dimen/content_padding_small"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingEnd="@dimen/content_padding"
         android:text=""
         android:textSize="@dimen/text_size_13"
         android:layout_marginBottom="@dimen/common_margin_10"
@@ -73,7 +79,10 @@
         android:background="@drawable/sp_bg_blue_stroke"
         android:hint="输入游戏帐号"
         android:minWidth="@dimen/view_size_150"
-        android:padding="@dimen/content_padding_small"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingEnd="@dimen/content_padding"
         android:text=""
         android:textSize="@dimen/text_size_13" />
 
@@ -94,7 +103,10 @@
         android:hint="输入密码"
         android:inputType="number"
         android:minWidth="@dimen/view_size_150"
-        android:padding="@dimen/content_padding_small"
+        android:paddingTop="@dimen/content_padding_small"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:paddingStart="@dimen/content_padding"
+        android:paddingEnd="@dimen/content_padding"
         android:textSize="@dimen/text_size_13" />
 
     <TextView

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

@@ -2,7 +2,10 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/content_padding_3">
+    android:paddingTop="@dimen/content_padding_3"
+    android:paddingBottom="@dimen/content_padding_3"
+    android:paddingStart="@dimen/content_padding"
+    android:paddingEnd="@dimen/content_padding">
 
     <TextView
         android:id="@+id/name_tv"