美化界面

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

@@ -56,6 +56,8 @@ public class FgtFriendExtractPage extends BaseFragment {
             ViewGroup view = (ViewGroup) friend_list_ll.getChildAt(i);
             if(i < size){
                 view.setVisibility(View.VISIBLE);
+                if(i % 2 == 0)
+                    view.setBackgroundColor(0xffF8F8F8);
                 int j = 0;
                 Friend friend = list.get(i);
                 TextView friend_item_id = (TextView) view.getChildAt(j++);

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

@@ -347,9 +347,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 Jump2View.getInstance().goAskGetMoney(activity, null);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_INVITE);
                 break;
-            case R.id.card_layout://邀请赚钱
-                Jump2View.getInstance()
-                        .goWebview(activity, 3);
+            case R.id.card_layout://办卡赚钱
+                Jump2View.getInstance().goCreditCardTaskList(activity, null);
                 UMConfigUtils.onEvent(UMConfigUtils.Event.TAB_CREDITCARD);
                 break;
             case R.id.lying_layout://躺着赚钱
@@ -358,8 +357,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 } else if(wechatIsOpen) {
                     Jump2View.getInstance().goLyingView(activity, null);
                     UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_TASK_LIE);
-                } else if(BuildConfig.DEBUG){
-                    Jump2View.getInstance().goCreditCardTaskList(activity, null);
                 } else {
                     G.showToast(R.string.coming_soon);
                 }
@@ -427,7 +424,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 MyDbManager.getInstance().saveOrUpdate(newbie_task_record);
             }
             boolean dontShowNewbieTaskDialog = newbie_task_record != null && newbie_task_record.isDontShowNewbieTaskDialog();//默认可以显示对话框
-            if(!BuildConfig.DEBUG && dontShowNewbieTaskDialog){
+            if(
+                    //!BuildConfig.DEBUG &&
+                    dontShowNewbieTaskDialog){
                 newbie_task.setVisibility(View.VISIBLE);
                 return;
             }

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

@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Locale;
 
 /**
- * Created by ljy on 2018/3/21.
+ * Created by realicing on 2018/4/26.
  */
 
 public class NewbieTaskAdp extends BaseAdapter {

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

@@ -6,8 +6,7 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="@dimen/content_padding_10">
+        android:layout_gravity="center">
 
         <LinearLayout
             android:id="@+id/dialog_center_ll"
@@ -16,6 +15,8 @@
             android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:gravity="center"
             android:orientation="vertical"
+            android:paddingStart="@dimen/content_padding_10"
+            android:paddingEnd="@dimen/content_padding_10"
             android:paddingTop="@dimen/content_padding_10"
             android:paddingBottom="@dimen/content_padding_10">
 

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

@@ -98,32 +98,5 @@
                 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>

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

@@ -49,7 +49,7 @@
             android:layout_marginStart="@dimen/content_padding_3"
             android:layout_toEndOf="@+id/newbie_task_money_iv"
             android:textSize="12sp"
-            android:textColor="#7e7e7e"
+            android:textColor="#FD304A"
             android:text="+0.6元" />
 
         <TextView

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

@@ -237,7 +237,8 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/hint_txt_style"
+                android:textSize="13sp"
+                android:textColor="#5b5b5b"
                 android:text="@string/friend"
                 android:layout_below="@id/tv_size"
                 android:layout_centerHorizontal="true"
@@ -253,24 +254,37 @@
             android:orientation="vertical"
             >
 
-
-            <TextView
-                android:id="@+id/tv_money"
+            <LinearLayout
+                android:id="@+id/tv_money_ll"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/text_size_25"
-                android:textColor="@color/txt_red_ff4a5f"
-                android:textStyle="bold"
                 android:layout_centerInParent="true"
-                />
-
+                android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/tv_money"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="24sp"
+                    android:textColor="@color/txt_red_ff4a5f"
+                    android:textStyle="bold"
+                    />
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textSize="12sp"
+                    android:textColor="@color/txt_red_ff4a5f"
+                    android:textStyle="bold"
+                    android:text="元"
+                    />
+            </LinearLayout>
 
             <TextView
                 android:layout_centerHorizontal="true"
-                android:layout_below="@id/tv_money"
+                android:layout_below="@id/tv_money_ll"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/hint_txt_style"
+                android:textSize="13sp"
+                android:textColor="#5b5b5b"
                 android:text="@string/reward"
                 android:layout_marginTop="8dp"
 
@@ -298,13 +312,16 @@
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginStart="9dp"
             android:layout_marginBottom="@dimen/content_padding_10"
+            android:textSize="@dimen/text_size_15"
+            android:textColor="#191919"
             android:text="已邀请好友列表"/>
         <include layout="@layout/x_ask_getmoney_act_layout_include"/>
         <com.kfzs.duanduan.view.ViewPagerPlus
             android:id="@+id/friend_extract_vp"
             android:layout_width="match_parent"
+            android:layout_marginTop="@dimen/content_padding_10"
             android:layout_height="130dp"/>
         <LinearLayout
             android:layout_width="match_parent"
@@ -316,6 +333,8 @@
                 android:id="@+id/friend_extract_count_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:textSize="11sp"
+                android:textColor="#a3282828"
                 android:text="共0条"/>
             <TextView
                 android:id="@+id/friend_extract_page_tv"
@@ -323,10 +342,12 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/content_padding_20"
                 android:background="@drawable/shape_page"
-                android:paddingStart="@dimen/content_padding_10"
-                android:paddingEnd="@dimen/content_padding_10"
-                android:paddingTop="@dimen/content_padding_3"
-                android:paddingBottom="@dimen/content_padding_3"
+                android:paddingStart="7dp"
+                android:paddingEnd="7dp"
+                android:paddingTop="2dp"
+                android:paddingBottom="2dp"
+                android:textSize="12sp"
+                android:textColor="#282828"
                 android:text="1"/>
         </LinearLayout>
     </LinearLayout>

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

@@ -30,7 +30,7 @@
         android:singleLine="true"
         android:textSize="12sp"
         android:textColor="#282828"
-        android:text="获得奖励金"/>
+        android:text="获得提成"/>
     <TextView
         android:layout_width="0dp"
         android:layout_height="wrap_content"

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

@@ -10,8 +10,8 @@
         android:layout_weight="1"
         android:gravity="center"
         android:singleLine="true"
-        android:textSize="@dimen/text_size_12"
-        android:textColor="#868686"
+        android:textSize="10sp"
+        android:textColor="#a3282828"
         android:text="绵羊ID"/>
     <TextView
         android:layout_width="0dp"
@@ -19,8 +19,8 @@
         android:layout_weight="2"
         android:gravity="center"
         android:singleLine="true"
-        android:textSize="@dimen/text_size_12"
-        android:textColor="#868686"
+        android:textSize="10sp"
+        android:textColor="#a3282828"
         android:text="好友昵称"/>
     <TextView
         android:layout_width="0dp"
@@ -28,8 +28,8 @@
         android:layout_weight="1"
         android:gravity="center"
         android:singleLine="true"
-        android:textSize="@dimen/text_size_12"
-        android:textColor="#868686"
+        android:textSize="10sp"
+        android:textColor="#a3282828"
         android:text="获得奖励金"/>
     <TextView
         android:layout_width="0dp"
@@ -37,8 +37,8 @@
         android:layout_weight="2"
         android:singleLine="true"
         android:gravity="center"
-        android:textSize="@dimen/text_size_12"
-        android:textColor="#868686"
+        android:textSize="10sp"
+        android:textColor="#a3282828"
         android:text="注册时间"/>
 
 </LinearLayout>