新手任务位置修改

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

@@ -326,9 +326,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 .apply(new RequestOptions().diskCacheStrategy(DiskCacheStrategy.RESOURCE))
                 .preload(800, 800);
         if(userEntity.getIs_new() == 2){//为1时代表老玩家
-
-        } else {
             newbie_task.setVisibility(View.GONE);
+        } else {
             try {
                 newbie_task_record = MyDbManager.getInstance().dbFindNewbieTaskRecord(userEntity.getInvitation_code());
             } catch (DbException e) {

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

@@ -19,12 +19,15 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import java.util.List;
 import java.util.Locale;
 
+import static com.sheep.gamegroup.view.adapter.NewbieTaskAdp.doActionByTask;
+
 /**
  * Created by ljy on 2018/3/21.
  */
 
 public class DialogNewbieTaskAdp extends BaseAdapter {
     private Context context;
+    private View.OnClickListener onClickListener;
     private List<NewbieTask> etyList;
 
     public DialogNewbieTaskAdp(Context context, List<NewbieTask> etyList) {
@@ -32,6 +35,11 @@ public class DialogNewbieTaskAdp extends BaseAdapter {
         this.etyList = etyList;
     }
 
+    public DialogNewbieTaskAdp setOnClickListener(View.OnClickListener onClickListener) {
+        this.onClickListener = onClickListener;
+        return this;
+    }
+
     @Override
     public int getCount() {
         return etyList.size();
@@ -61,6 +69,14 @@ public class DialogNewbieTaskAdp extends BaseAdapter {
 
         final NewbieTask ety = (NewbieTask) getItem(position);
         setTextSure(holder.dialog_sure_1,ety, position);
+        holder.dialog_sure_1.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if(onClickListener != null)
+                    onClickListener.onClick(view);
+                doActionByTask(context, ety);
+            }
+        });
         return convertView;
     }
 
@@ -81,7 +97,7 @@ public class DialogNewbieTaskAdp extends BaseAdapter {
                 dialog_sure.setText((index+1)+".首次做任务赚钱（额外奖+"+newbieTask.getAmount()+"元）");
                 break;
             case 6://加入官方QQ群
-                dialog_sure.setText((index+1)+".加入官方QQ群（++"+newbieTask.getAmount()+"元）");
+                dialog_sure.setText((index+1)+".加入官方QQ群（+"+newbieTask.getAmount()+"元）");
                 break;
         }
     }

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

@@ -46,26 +46,24 @@ public class DialogNewbieTask1 {
                 case 4://首次做任务赚钱
                     start = "获得首次做任务赚钱额外奖励";
                     break;
+                case 6://加入官方QQ群
+                    start = "获得加入官方QQ群奖励";
+                    break;
             }
             String sr = start+" <font color='#e2271d'><big>" + task.getAmount() + "</big></font> 元";
             dialog_tip.setText(Html.fromHtml(sr));
         }
-        final ListView dialog_sure_list = ViewFindUtils.find(view, R.id.dialog_sure_list);
-        dialog_sure_list.setAdapter(new DialogNewbieTaskAdp(activity, newbieTaskList));
-        dialog_sure_list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-                mAlertDialog.dismiss();
-                doActionByTask(activity, newbieTaskList.get(i));
-            }
-        });
-        final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
-        dialog_close.setOnClickListener(new View.OnClickListener() {
+        View.OnClickListener onClickListener = new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 mAlertDialog.dismiss();
             }
-        });
+        };
+
+        final ListView dialog_sure_list = ViewFindUtils.find(view, R.id.dialog_sure_list);
+        dialog_sure_list.setAdapter(new DialogNewbieTaskAdp(activity, newbieTaskList).setOnClickListener(onClickListener));
+        final View dialog_close = ViewFindUtils.find(view, R.id.dialog_close);
+        dialog_close.setOnClickListener(onClickListener);
         try {
             mAlertDialog.show();
         } catch (Exception e) {

app/src/main/res/drawable/shape_newbie_task_tv.xml

@@ -3,5 +3,5 @@
     android:shape="rectangle">
     <corners android:radius="15dp"/>
 
-    <solid android:color="#ffe55d"/>
+    <solid android:color="#F81B60"/>
 </shape>

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:background="@color/bg_gray">
 
     <ScrollView
@@ -114,33 +113,6 @@
                         android:textColor="@color/txt_white"
                         android:textSize="@dimen/text_size_12"/>
                 </RelativeLayout>
-                <RelativeLayout
-                    android:id="@+id/newbie_task"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentBottom="true"
-                    android:visibility="gone">
-                    <TextView
-                        android:id="@+id/newbie_task_tip_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="@dimen/content_padding_13"
-                        android:paddingTop="@dimen/content_padding_small"
-                        android:paddingBottom="@dimen/content_padding_small"
-                        android:paddingStart="@dimen/content_padding_15"
-                        android:paddingEnd="@dimen/content_padding_15"
-                        android:background="@drawable/shape_newbie_task_tv"
-                        android:textSize="12sp"
-                        android:textColor="#5A4E48"
-                        android:text="新手任务"/>
-                    <ImageView
-                        android:layout_width="8dp"
-                        android:layout_height="8dp"
-                        android:layout_alignParentTop="true"
-                        android:layout_alignEnd="@+id/newbie_task_tip_tv"
-                        android:src="@drawable/sp_dot_red" />
-                </RelativeLayout>
 
             </RelativeLayout>
 
@@ -264,4 +236,26 @@
         </LinearLayout>
     </ScrollView>
 
-</LinearLayout>
+    <RelativeLayout
+        android:id="@+id/newbie_task"
+        android:layout_width="30dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/content_padding_10"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:gravity="center"
+        android:background="@drawable/shape_newbie_task_tv">
+        <TextView
+            android:id="@+id/newbie_task_tip_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:ems="1"
+            android:textSize="13sp"
+            android:textColor="#ffffff"
+            android:text="新手任务"/>
+    </RelativeLayout>
+</RelativeLayout>