小绵羊3.3--邀请赚钱邀请码与背景变化；

任务列表与任务详情按UI图修改

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

@@ -110,7 +110,7 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
         if(TextUtils.isEmpty(descEntity.getAmount())){
             holder.title_item_layout.setVisibility(View.GONE);
             holder.item_show_layout.setPadding(10,3,3,3);
-            holder.item_detail_show_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
+//            holder.item_detail_show_layout.setBackgroundResource(R.drawable.x_shap_shadow_bg_rectgangle_white);
         }else {
             holder.title_item_layout.setVisibility(View.VISIBLE);
             holder.num_item_textview.setText(position + 1+"");

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoney.java

@@ -68,6 +68,8 @@ public class FgtAskGetMoney extends BaseFragment {
     ViewPagerAutoHeigh pager;
     @BindView(R.id.my_invitation_tv)
     TextView my_invitation_tv;
+    @BindView(R.id.ask_act_code)
+    TextView ask_act_code;
     @BindView(R.id.copy_my_invitation_tv)
     TextView copy_my_invitation_tv;
 
@@ -107,10 +109,10 @@ public class FgtAskGetMoney extends BaseFragment {
 //                "</html>";
 //        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
 //        ask_bg.loadData(content, "text/html", "UTF-8");
-        GlideImageLoader.setImage(ask_bg, "http://cdngame.kuaifazs.com/yaoqingzq2_bg.png");
+        GlideImageLoader.setImage(ask_bg, "http://cdngame.kuaifazs.com/yaoqingzq_bg_3.png");
 //                16,18,19
         LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
-        layoutParams1.height = G.WIDTH * 560 / 625;
+        layoutParams1.height = G.WIDTH * 600 / 625;
         ask_top_1.setLayoutParams(layoutParams1);
         LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) ask_top_2.getLayoutParams();
         layoutParams2.height = G.WIDTH * 112 / 625;
@@ -120,6 +122,8 @@ public class FgtAskGetMoney extends BaseFragment {
         ask_top_3.setLayoutParams(layoutParams3);
         ViewUtil.setDefaultText(tvSize);
         ViewUtil.setDefaultText(tvMoney);
+        ViewUtil.setDefaultText(my_invitation_tv);
+        ViewUtil.setDefaultText(ask_act_code);
         showViewPager();
         initData(true);
 
@@ -188,6 +192,7 @@ public class FgtAskGetMoney extends BaseFragment {
                 if (result != null) {
                     userEntity = result;
                     String audit_total_audit = String.format(activity.getResources().getString(R.string.my_invitation_str), userEntity.getInvitation_code());
+                    ask_act_code.setText(audit_total_audit);
                     my_invitation_tv.setText(audit_total_audit);
                 }
             }
@@ -209,10 +214,11 @@ public class FgtAskGetMoney extends BaseFragment {
         CommonUtil.getInstance().reflex(indicator, activity);
     }
 
-    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.refresh, R.id.ask_act_rule})
+    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv, R.id.refresh, R.id.ask_act_rule, R.id.ask_act_code_copy})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.copy_my_invitation_tv:
+            case R.id.ask_act_code_copy:
                 if (TextUtils.isEmpty(my_invitation_tv.getText().toString()))
                     return;
                 QR_COPY.onEvent();

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -3,23 +3,17 @@ package com.sheep.gamegroup.view.fragment;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
-import com.scwang.smartrefresh.layout.SmartRefreshLayout;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener;
-import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
-import com.sheep.gamegroup.event.BigEvent;
-import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.di.components.DaggerFgtTryMakeMoneyComponent;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
@@ -32,7 +26,6 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:bottomRightRadius="12dp"
+        android:topRightRadius="12dp"/>
+    <solid
+        android:color="#814CDE"/>
+</shape>

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FF6600"/>
+    <corners
+        android:radius="10dp"/>
+
+</shape>

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/bg_gray">
+    android:background="@color/white">
 
     <include
         layout="@layout/title"/>

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

@@ -108,6 +108,7 @@
         android:gravity="center_vertical"
         android:layout_gravity="center_horizontal"
         android:background="@drawable/button_full_nomal_yellow_click"
+        android:visibility="gone"
         android:padding="@dimen/dp_10">
         <TextView
             android:id="@+id/my_invitation_tv"

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

@@ -4,7 +4,8 @@
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/content_padding_10"
     android:paddingEnd="4dp"
-    android:paddingStart="4dp">
+    android:paddingStart="4dp"
+    android:background="@color/white">
 
     <include
         android:id="@+id/empty_view"

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/bg_gray"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <include

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

@@ -8,30 +8,19 @@
     android:layout_marginLeft="@dimen/content_padding_10"
     android:layout_marginRight="@dimen/content_padding_10"
     android:layout_marginTop="@dimen/content_padding_10"
-    android:visibility="gone">
+    android:visibility="visible">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingRight="@dimen/content_padding_small"
         android:paddingTop="@dimen/content_padding_small"
-        android:paddingBottom="@dimen/content_padding_15"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
-
-        <TextView
-            android:layout_width="4dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/content_padding_3"
-            android:background="@color/blue_FF53BBF2"
-            android:text="1"
-            android:textColor="@color/blue_FF53BBF2"
-            android:textSize="@dimen/text_size_2" />
+        android:paddingBottom="@dimen/content_padding_15">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_marginLeft="@dimen/content_padding_15">
+            android:orientation="vertical">
             <TextView
                 android:id="@+id/item_exlpain_title"
                 style="@style/txt_style_15_323232"

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

@@ -65,31 +65,18 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:background="@drawable/sp_bg_white_solid_bottom"
             android:orientation="vertical"
-            android:paddingBottom="@dimen/content_padding_15"
             android:paddingTop="@dimen/dp_10">
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15">
-
-                <TextView
-                    android:layout_width="4dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:background="@color/blue_FF53BBF2"
-                    android:text="1"
-                    android:textColor="@color/blue_FF53BBF2"
-                    android:textSize="@dimen/text_size_2" />
+                android:layout_height="wrap_content">
 
                 <TextView
                     style="@style/txt_style_15_323232"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="@dimen/content_padding_15"
                     android:text="任务详情" />
 
                 <TextView
@@ -103,13 +90,16 @@
                     android:text="剩余试玩时间：00:28:12"
                     android:textSize="@dimen/text_size_12" />
             </RelativeLayout>
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
+                android:background="#F1F0F0"/>
             <com.sheep.gamegroup.util.MyListview
                 android:id="@+id/item_detail_listview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15"
-                android:layout_marginStart="@dimen/content_padding_15"
                 android:divider="@null"
                 android:listSelector="@color/transparent"
                 android:scrollbars="none" />
@@ -119,37 +109,33 @@
             android:id="@+id/ar_code_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/content_padding_15"
             android:layout_marginBottom="@dimen/content_padding_15"
             android:visibility="visible">
 
-            <TextView
-                android:id="@+id/qr_code_blue_line"
-                android:layout_width="4dp"
-                android:layout_height="wrap_content"
-                android:background="@color/blue_FF53BBF2"
-                android:text="1"
-                android:textColor="@color/blue_FF53BBF2"
-                android:textSize="@dimen/text_size_2"
-                app:layout_constraintBottom_toBottomOf="@+id/qr_code_tv"
-                app:layout_constraintTop_toTopOf="@+id/qr_code_tv" />
 
             <TextView
                 android:id="@+id/qr_code_tv"
                 style="@style/txt_style_15_323232"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/content_padding_15"
-                android:text="二维码"
-                app:layout_constraintStart_toEndOf="@+id/qr_code_blue_line" />
+                android:text="二维码"/>
 
+            <View
+                android:id="@+id/qr_code_line"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="12dp"
+                android:background="#F1F0F0"
+                app:layout_constraintTop_toBottomOf="@+id/qr_code_tv"/>
             <ImageView
                 android:id="@+id/qr_code_iv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/content_padding_18"
+                android:layout_marginTop="12dp"
                 android:src="@mipmap/qr_code_taskdetail_zhanwei"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/qr_code_tv" />
+                app:layout_constraintTop_toBottomOf="@+id/qr_code_line" />
 
             <TextView
                 android:id="@+id/btn_task_item"
@@ -187,7 +173,6 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginTop="@dimen/content_padding_13"
-            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
             android:orientation="vertical"
             android:paddingBottom="@dimen/content_padding_15"
             android:paddingTop="@dimen/dp_10"
@@ -195,25 +180,20 @@
 
             <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/content_padding_15">
-
-                <TextView
-                    android:layout_width="4dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/content_padding_3"
-                    android:background="@color/blue_FF53BBF2"
-                    android:text="1"
-                    android:textColor="@color/blue_FF53BBF2"
-                    android:textSize="@dimen/text_size_2" />
+                android:layout_height="wrap_content">
 
                 <TextView
                     style="@style/txt_style_15_323232"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/content_padding_15"
                     android:text="示例截图" />
             </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginBottom="12dp"
+                android:background="#F1F0F0"/>
             <!--<com.sheep.gamegroup.util.MyListview-->
             <!--android:id="@+id/recycler_screenshot_view"-->
             <!--android:layout_width="match_parent"-->
@@ -225,7 +205,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/dp_10"
-                android:layout_marginStart="@dimen/content_padding_15"
                 android:scrollbars="none" />
         </LinearLayout>
     </LinearLayout>

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

@@ -3,7 +3,7 @@
     android:id="@+id/layout_navigationBar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="@color/white_F9F9F9">
+    android:background="@color/white">
 
     <ImageView
         android:id="@+id/img_baseactivity_title"

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/bg_gray"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <include layout="@layout/title" />

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

@@ -168,7 +168,7 @@
                 android:layout_height="24dp"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentTop="true"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="28dp"
                 android:background="@drawable/sp_bg_purple_left_radius_12"
                 android:gravity="center"
                 android:paddingEnd="6dp"
@@ -176,6 +176,34 @@
                 android:text="活动规则"
                 android:textColor="#ffffffff"
                 android:textSize="10sp" />
+            <TextView
+                android:id="@+id/ask_act_code"
+                android:layout_width="wrap_content"
+                android:layout_height="24dp"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:layout_marginTop="28dp"
+                android:background="@drawable/sp_bg_purple_right_radius_12"
+                android:gravity="center"
+                android:paddingEnd="10dp"
+                android:paddingStart="6dp"
+                android:text="我的邀请码：976873"
+                android:textColor="#ffffffff"
+                android:textSize="10sp" />
+            <TextView
+                android:id="@+id/ask_act_code_copy"
+                android:layout_width="wrap_content"
+                android:layout_height="20dp"
+                android:layout_alignParentTop="true"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="30dp"
+                android:background="@drawable/sp_bg_rectangle_orange_10"
+                android:gravity="center"
+                android:paddingEnd="12dp"
+                android:paddingStart="12dp"
+                android:text="复制"
+                android:textColor="#ffffffff"
+                android:textSize="10sp" />
         </RelativeLayout>
     </android.support.v4.widget.NestedScrollView>
 </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>

app/src/main/res/values/dd_styles.xml

@@ -191,7 +191,6 @@
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">#767676</item>
         <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/sp_bg_rectangle_ash</item>
     </style>
 
     <style name="style_ash_num">