冲突错误修改

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

@@ -36,7 +36,6 @@ public class TaskEty implements Serializable, IDownload {
     private String desc;// 任务详情介绍
     private String ext;// 对应的信用卡配置的id
     private List<TaskChild> child;
-    private int is_reservation;//是否预约任务 0不是 1是
     private boolean can_download;//是否可以下载
     private int appointment_time;//预约时间
 
@@ -69,14 +68,6 @@ public class TaskEty implements Serializable, IDownload {
         this.is_receive_account = is_receive_account;
     }
 
-    public int getIs_reservation() {
-        return is_reservation;
-    }
-
-    public void setIs_reservation(int is_reservation) {
-        this.is_reservation = is_reservation;
-    }
-
     public String getScreenshots() {
         return screenshots;
     }

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

@@ -143,6 +143,14 @@ public class DialogAddAccount {
             }
         });
 
+        final TextView game_account_plator_spinner_tv = view.findViewById(R.id.game_account_plator_spinner_tv);
+        game_account_plator_spinner_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                new SelfPopupWindow(activity, game_account_plator_spinner_tv).showPopup();
+            }
+        });
+
         Spinner game_account_plator_spinner = view.findViewById(R.id.game_account_plator_spinner);
         game_account_game_list_spinner = view.findViewById(R.id.game_account_game_list_spinner);
 

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

@@ -31,7 +31,7 @@ public class SelfPopupWindow {
 
 
     /** TextView选择框 */
-    private View mSelectTv;
+    private TextView mSelectTv;
 
     /** popup窗口里的ListView */
     private MyListview myListview;
@@ -46,7 +46,7 @@ public class SelfPopupWindow {
     private ArrayAdapter<String> testDataAdapter;
 
     public SelfPopupWindow(Activity activity, View view) {
-        this.mSelectTv = view;
+        this.mSelectTv = (TextView) view;
         this.activity = activity;
     }
 
@@ -66,6 +66,7 @@ public class SelfPopupWindow {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 G.showToast(testData.get(position)+"");
+                mSelectTv.setText(testData.get(position)+"");
                 typeSelectPopup.dismiss();
             }
         });

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

@@ -12,11 +12,19 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/common_margin_10"
         android:paddingTop="@dimen/content_padding_5"
-        android:paddingBottom="@dimen/content_padding_5"/>
+        android:paddingBottom="@dimen/content_padding_5"
+        android:visibility="gone"/>
 
     <TextView
+        android:id="@+id/game_account_plator_spinner_tv"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:background="@drawable/sp_bg_blue_stroke"
+        android:hint=""
+        android:minWidth="@dimen/view_size_150"
+        android:padding="@dimen/content_padding_small"
+        android:text=""
+        android:textSize="@dimen/text_size_13"  />
 
 
     <RadioGroup