按照美工设计的UI图优化界面

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

@@ -15,6 +15,7 @@ import android.os.Message;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
@@ -32,7 +33,6 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.google.gson.Gson;
@@ -73,7 +73,6 @@ import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.MyListview;
-import com.sheep.gamegroup.util.NestedScrollView;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
@@ -184,6 +183,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     TextView homepage_item_juan_tv;
     @BindView(R.id.recyclerview_line)
     View recyclerview_line;
+    @BindView(R.id.bottom_line_text)
+    TextView bottom_line_text;
 
 
     @Inject
@@ -240,12 +241,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     }
                     int count = item.getDataCount();
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                    params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding_20));
+                    params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
                     mViewPager.setLayoutParams(params);
                     break;
                 case 7:
                     isShowRedPackages(activity);
-                    LogUtil.logI("handle message");
                     break;
             }
 
@@ -302,6 +302,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
         isShowRedPackage();
+        bottom_line_text.setText("我是有底线的，双占我回到顶部");
     }
 
 
@@ -593,12 +594,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if(null ==  homeListEntitysGridview.get(position)){
+                HomeListEntity homeListEntity= ListUtil.getItem(homeListEntitysGridview, position);
+                if(homeListEntity == null){
                     return;
                 }
-                HomeListEntity homeListEntity= homeListEntitysGridview.get(position);
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if(homeListEntity.getJump().equals("-2")){
+                if("-2".equals(homeListEntity.getJump())){
                     setValueList(!homeListEntity.isSelect());
                 }else {
                     CommonUtil.getInstance()
@@ -627,7 +628,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
 
     @OnClick({R.id.recharge, R.id.withdrawal, R.id.view_rob_duty,
-            R.id.newbie_task, R.id.icon_img_iv, R.id.user_layout
+            R.id.newbie_task, R.id.icon_img_iv, R.id.user_layout,
+            R.id.bottom_line
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -653,6 +655,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             case R.id.view_rob_duty://抢任务弹框
                 ViewUtil.showRobDutyDialog(getActivity(), getView());
                 break;
+            case R.id.bottom_line://我是有底线的，双占我回到顶部
+                scrollView.fullScroll(NestedScrollView.FOCUS_UP);
+                break;
         }
     }
 
@@ -1131,11 +1136,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      */
     private void inviteNotice(final List<BulletinEnty> bulletinEntyList) {
         homepageItemNoticeLayout.setVisibility(View.GONE);
-//        List<String> infoList = new ArrayList<>();
-//        for(BulletinEnty bulletinEnty: bulletinEntyList){
-//            infoList.add(bulletinEnty.getContent()+"");
-//        }
-//        homepageItemNoticeMv.startWithList(infoList, R.anim.anim_left_in,R.anim.anim_right_out);
         homepageItemNoticeMv.removeAllViews();
         for (final BulletinEnty entity : bulletinEntyList) {
             StringBuilder sb = new StringBuilder();

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

@@ -87,6 +87,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Random;
 
 import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
@@ -247,9 +248,9 @@ public class ViewUtil {
         ImageView ivClose = view.findViewById(R.id.iv_close);
         final TextView tvTitel = view.findViewById(R.id.tv_duty_title);
         final TextView tvDutyMoney = view.findViewById(R.id.tv_robduty_money);
+        ViewUtil.setDefaultText(tvTitel);
+        ViewUtil.setDefaultText(tvDutyMoney);
         mRobTask = getTask(ivIcon, tvTitel, tvDutyMoney);
-        /**
-         * */
         final PopupWindow popupWindow = new PopupWindow(mActivity);
         popupWindow.setContentView(view);
         popupWindow.setAnimationStyle(R.style.Rising);
@@ -301,6 +302,20 @@ public class ViewUtil {
 
     }
 
+    /**
+     * 设置默认方块文本
+     * @param textView
+     */
+    public static void setDefaultText(TextView textView) {
+        String text = textView.getText().toString();
+        int length = TextUtils.isEmpty(text) ? Math.abs(new Random().nextInt(7)) : text.length();
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            stringBuilder.append("\u2588");
+        }
+        textView.setText(stringBuilder);
+    }
+
 
     /**
      * 兑换红包弹窗

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

@@ -384,6 +384,23 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     /**
+     * 设置自动审核的连续任务底部按钮的状态（任务未下线且有任务记录且已经安装游戏）
+     * 注：前提是gettaskAcceptedEty不为空哦
+     */
+    private void setAutoSuccessionTaskBottomState() {
+        boolean hasChildRunning = taskEty.hasChildRunning();//有子任务正在进行
+        boolean hasChildCanAccepted = taskEty.hasChildCanAccepted();//有子任务处于可领取状态
+
+        if (hasChildRunning) {//有子任务正在进行
+        } else if (hasChildCanAccepted) {//有子任务处于可领取状态
+            btnUpImag.setVisibility(View.GONE);
+            btnTaskItem.setText(CommonUtil.GET_TASK);//可以领取子任务
+            type = TASK_TYPE_INIT;
+        } else {//不能上传截图则不显示第二按钮
+            btnUpImag.setVisibility(View.GONE);
+        }
+    }
+    /**
      * 设置非自动审核的连续任务底部按钮的状态（任务未下线且有任务记录且已经安装游戏）
      * 注：前提是gettaskAcceptedEty不为空哦
      */
@@ -438,6 +455,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         btnUpImag.setVisibility(View.GONE);
                         break;
                     default:
+                        if(taskEty.getTask_type() == 1000)//连续任务
+                            setAutoSuccessionTaskBottomState();
                         break;
                 }
                 break;
@@ -811,6 +830,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         @Override
                         public void onNext(BaseMessage baseMessage) {
                             CommonUtil.getInstance().setTAskEnty(null);
+                            //这里领取了奖励，要刷新用户信息
+                            CommonUtil.getInstance().updateUserInfo(null);
                             String amount = taskReleaseEty.getBonus();
                             try {
                                 Map h = JSON.parseObject(baseMessage.getData() + "");
@@ -921,6 +942,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
 //                            onGetNetImageUrl(data);
         dismissLoaddingDialog();
         G.showToast("提交成功，等待审核!");
+        //这里领取了奖励，要刷新用户信息
+        CommonUtil.getInstance().updateUserInfo(null);
         if (DataUtil.IS_USE_SCREEN_SHOT) {//小绵羊截图方案：上传截图成功后删除之前的截图
             DataUtil.getInstance().clearScreenShots();
         }
@@ -1313,6 +1336,8 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     public void onNext(BaseMessage baseMessage) {
                         hideProgress();
 //                        G.showToast(taskReleaseEty.getBonus() + "元");
+                        //这里领取了奖励，要刷新用户信息
+                        CommonUtil.getInstance().updateUserInfo(null);
                         ViewUtil.showMsgDialog(activity,
                                 "恭喜你获得" + taskReleaseEty.getBonus() + "元奖励",
                                 "提示",

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

@@ -80,7 +80,7 @@ public class DialogNewbieTaskList {
                         if(activity instanceof BaseActivity){
                             ((BaseActivity) activity).hideProgress();
                         }
-                        G.showToast(!TextUtils.isEmpty(baseMessage.getMsg()) ? baseMessage.getMsg() : "网络错误，请重启重试");
+                        G.showToast(baseMessage);
                     }
                 });
     }

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

@@ -91,7 +91,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         if(!ListUtil.isEmpty(releaseEtyListsBegin))
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.BEGIN_TASK, releaseEtyListsBegin));
         tryMakeMoneyAdp.refreshAdapter();
-        boolean showEmpty = tryMakeMoneyAdp.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty();
+        boolean showEmpty = acceptedEtyList.isEmpty() && releaseEtyLists.isEmpty() && releaseEtyListsBegin.isEmpty();
         LogUtil.println("showEmpty", showEmpty);
         CommonUtil.getInstance().updateEmptyView(empty_view, showEmpty);
         refresh.setRefreshing(false);

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

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

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

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

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

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bottom_line"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:layout_margin="@dimen/content_padding_20"
+    android:padding="@dimen/content_padding_20"
     android:orientation="horizontal">
 
     <ImageView
@@ -14,6 +15,7 @@
         android:src="@mipmap/bottom_icon"/>
 
     <TextView
+        android:id="@+id/bottom_line_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/content_padding"

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

@@ -1,172 +1,172 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:clipChildren="true"
-    android:background="@color/bg_gray">
-
-    <!--<com.flipboard.bottomsheet.BottomSheetLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="match_parent"-->
-        <!--android:fitsSystemWindows="true">-->
+    android:background="@color/white"
+    android:clipChildren="true">
 
     <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-    <com.sheep.gamegroup.util.NestedScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:layout_gravity="fill_vertical"
-        android:scrollbars="none"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-        <LinearLayout
+
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:orientation="vertical">
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_vertical"
+            android:fillViewport="true"
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <include
-                layout="@layout/homepage_item_top2"
-                android:visibility="gone"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-            <include
-                layout="@layout/check_net_view"/>
+                <include
+                    layout="@layout/homepage_item_top2"
+                    android:visibility="gone" />
 
-            <include
-                layout="@layout/homepage_item_banner"/>
+                <include layout="@layout/check_net_view" />
 
-            <include
-                layout="@layout/homepage_item_gridview_listview"
-                android:visibility="visible"/>
+                <include layout="@layout/homepage_item_banner" />
 
-            <include
-                layout="@layout/homepage_item_notice_and_currenttime"/>
+                <include
+                    layout="@layout/homepage_item_gridview_listview"
+                    android:visibility="visible" />
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="10dp"
-                android:background="#fff5f5f5"/>
+                <include layout="@layout/homepage_item_notice_and_currenttime" />
 
-            <include
-                layout="@layout/homepage_item_get_award"/>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:background="#fff5f5f5"/>
-
-            <include
-                layout="@layout/homepage_item_notice"
-                android:visibility="gone"/>
-            <include
-                layout="@layout/homepage_item_currenttime_reward"
-                android:visibility="gone"/>
-
-            <include
-                layout="@layout/homepage_item_4module"
-                android:visibility="gone"/>
-
-            <include
-                layout="@layout/homepage_item_liy_q"
-                android:visibility="gone"/>
-            <include
-                layout="@layout/homepage_item_gridview_listview"
-                android:visibility="gone"/>
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recyclerview"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:paddingLeft="@dimen/content_padding_10"
-                android:paddingRight="@dimen/content_padding_10"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="#fff5f5f5" />
 
-            <View
-                android:id="@+id/recyclerview_line"
-                android:layout_width="match_parent"
-                android:layout_height="10dp"
-                android:layout_marginBottom="@dimen/content_padding_8"
-                android:layout_marginTop="@dimen/content_padding_8"
-                android:background="#fff5f5f5"
-                android:visibility="gone"/>
+                <include layout="@layout/homepage_item_get_award" />
 
-            <!--选项卡-->
-            <include
-                layout="@layout/tablayout_viewpager_layout"/>
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:background="#fff5f5f5" />
 
-        </LinearLayout>
+                <include
+                    layout="@layout/homepage_item_notice"
+                    android:visibility="gone" />
 
-    </com.sheep.gamegroup.util.NestedScrollView>
-    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
+                <include
+                    layout="@layout/homepage_item_currenttime_reward"
+                    android:visibility="gone" />
+
+                <include
+                    layout="@layout/homepage_item_4module"
+                    android:visibility="gone" />
 
-    <!--</com.flipboard.bottomsheet.BottomSheetLayout>-->
+                <include
+                    layout="@layout/homepage_item_liy_q"
+                    android:visibility="gone" />
+
+                <include
+                    layout="@layout/homepage_item_gridview_listview"
+                    android:visibility="gone" />
+
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/recyclerview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingLeft="@dimen/content_padding_10"
+                    android:paddingRight="@dimen/content_padding_10" />
+
+                <View
+                    android:id="@+id/recyclerview_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:layout_marginBottom="@dimen/content_padding_8"
+                    android:layout_marginTop="@dimen/content_padding_8"
+                    android:background="#fff5f5f5"
+                    android:visibility="gone" />
+
+                <!--选项卡-->
+                <include layout="@layout/tablayout_viewpager_layout" />
+
+                <include layout="@layout/find_item_bottom"/>
+
+            </LinearLayout>
+
+        </android.support.v4.widget.NestedScrollView>
+    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
 
     <com.kfzs.duanduan.view.DragRelativeLayout
         android:id="@+id/newbie_task"
         android:layout_width="40dp"
         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_alignParentEnd="true"
         android:layout_marginBottom="@dimen/content_padding_20"
+        android:layout_marginEnd="@dimen/content_padding_10"
         android:gravity="center"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_10"
         android:visibility="gone">
+
         <ImageView
             android:id="@+id/bg_newbie_task"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:scaleType="fitXY"
-            android:adjustViewBounds="true"/>
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY" />
     </com.kfzs.duanduan.view.DragRelativeLayout>
+
     <com.kfzs.duanduan.view.DragRelativeLayout
         android:id="@+id/view_rob_duty"
         android:layout_width="wrap_content"
         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_alignParentEnd="true"
         android:layout_marginBottom="@dimen/content_padding_20"
+        android:layout_marginEnd="@dimen/content_padding_10"
         android:gravity="center"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_10"
         android:visibility="visible">
+
         <ImageView
             android:id="@+id/iv_rob_duty"
             android:layout_width="55dp"
             android:layout_height="45dp"
+            android:adjustViewBounds="true"
             android:scaleType="fitXY"
-            android:src="@mipmap/red_package_floatbtn"
-            android:adjustViewBounds="true"/>
+            android:src="@mipmap/red_package_floatbtn" />
     </com.kfzs.duanduan.view.DragRelativeLayout>
+
     <TextView
         android:id="@+id/test_change_user"
         style="@style/style_button_small_yellow"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:layout_margin="@dimen/content_padding_10"
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"
+        android:layout_margin="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingStart="@dimen/content_padding_10"
         android:text="切换账号"
-        android:visibility="gone"/>
+        android:visibility="gone" />
+
     <TextView
         android:id="@+id/test_change"
         style="@style/style_button_small_yellow"
         android:layout_width="wrap_content"
         android:layout_height="30dp"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:layout_margin="@dimen/content_padding_10"
         android:layout_above="@+id/test_change_user"
         android:layout_alignParentStart="true"
+        android:layout_margin="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingStart="@dimen/content_padding_10"
         android:text="切换服务器"
-        android:visibility="gone"/>
+        android:visibility="gone" />
 </RelativeLayout>

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

@@ -1,50 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingTop="@dimen/content_padding_10"
+    android:layout_margin="@dimen/content_padding_10"
     android:paddingBottom="@dimen/content_padding_10"
-    android:layout_margin="@dimen/content_padding_10">
+    android:paddingTop="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/homepage_item_get_award_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/homepage_item_jiangli"
-        android:paddingTop="@dimen/content_padding_2"/>
+        android:layout_marginStart="5dp"
+        android:paddingTop="@dimen/content_padding_2"
+        android:src="@mipmap/homepage_item_jiangli" />
 
     <TextView
         android:id="@+id/homepage_item_get_award_name_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/common_margin_10"
         android:text="你还有329元的奖励未领取"
         android:textColor="@color/black_333333"
         android:textSize="@dimen/text_size_3"
-        app:layout_constraintLeft_toRightOf="@id/homepage_item_get_award_iv"
-        android:layout_marginLeft="@dimen/common_margin_10"/>
+        app:layout_constraintLeft_toRightOf="@id/homepage_item_get_award_iv" />
 
     <TextView
         android:id="@+id/homepage_item_money_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text=""
-        app:layout_constraintStart_toStartOf="@id/homepage_item_get_award_name_tv"
-        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
+        android:text=""
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_1"/>
+        android:textSize="11sp"
+        app:layout_constraintStart_toStartOf="@id/homepage_item_get_award_name_tv"
+        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv" />
 
     <TextView
         android:id="@+id/homepage_item_juan_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text=""
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
+        android:layout_marginEnd="2dp"
+        android:text=""
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_1"/>
+        android:textSize="11sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv" />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:background="@color/bg_gray"
     android:paddingLeft="@dimen/content_padding_10"
     android:paddingTop="@dimen/content_padding_10"
     android:paddingRight="@dimen/content_padding_10">

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

@@ -7,8 +7,7 @@
     android:background="@color/white"
     android:orientation="horizontal"
     android:gravity="center_vertical"
-    android:padding="@dimen/content_padding_small"
-    android:visibility="gone">
+    android:padding="@dimen/content_padding_small">
 
     <TextView
         android:layout_width="wrap_content"

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

@@ -3,68 +3,75 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/content_padding_10"
     android:layout_margin="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/notice_currenttime_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="55dp"
-        android:minWidth="55dp"
-        android:src="@mipmap/homepage_mianyangtt"/>
+        android:layout_centerVertical="true"
+        android:layout_marginStart="3dp"
+        android:layout_marginEnd="5dp"
+        android:src="@mipmap/homepage_mianyangtt" />
 
     <LinearLayout
         android:id="@+id/homepage_notice_layout"
-        android:layout_toRightOf="@+id/notice_currenttime_iv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
+        android:layout_toRightOf="@+id/notice_currenttime_iv"
+        android:gravity="center"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="【公告】"/>
+            android:text="【公告】"
+            android:textColor="#666666"
+            android:textSize="11sp" />
+
         <com.sunfusheng.marqueeview.MarqueeView
             android:id="@+id/homepage_item_notice_mv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/content_padding_10"
+            android:minHeight="20dp"
             android:paddingEnd="@dimen/content_padding_10"
-            android:minHeight="30dp"
+            android:paddingStart="@dimen/content_padding_10"
             app:mvAnimDuration="1000"
             app:mvDirection="bottom_to_top"
             app:mvInterval="3000"
+            app:mvSingleLine="true"
             app:mvTextColor="@color/white"
-            app:mvTextSize="14sp"
-            app:mvSingleLine="true" />
+            app:mvTextSize="11sp" />
     </LinearLayout>
+
     <LinearLayout
-        android:layout_below="@+id/homepage_notice_layout"
-        android:layout_toRightOf="@+id/notice_currenttime_iv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="center">
+        android:layout_below="@+id/homepage_notice_layout"
+        android:layout_toRightOf="@+id/notice_currenttime_iv"
+        android:gravity="center"
+        android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="【动态】"/>
+            android:text="【动态】"
+            android:textColor="#666666"
+            android:textSize="11sp" />
+
         <com.sunfusheng.marqueeview.MarqueeView
             android:id="@+id/upview1"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="@dimen/content_padding_10"
+            android:minHeight="20dp"
             android:paddingEnd="@dimen/content_padding_10"
-            android:minHeight="30dp"
+            android:paddingStart="@dimen/content_padding_10"
             app:mvAnimDuration="1000"
             app:mvDirection="bottom_to_top"
             app:mvInterval="3000"
+            app:mvSingleLine="true"
             app:mvTextColor="@color/white"
-            app:mvTextSize="14sp"
-            app:mvSingleLine="true" />
+            app:mvTextSize="14sp" />
     </LinearLayout>
 
 

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

@@ -16,7 +16,7 @@
             android:layout_height="@dimen/content_padding_65"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="120dp"
-            android:src="@mipmap/understand_sheep_b" />
+            android:src="@drawable/loading_01" />
 
         <TextView
             android:id="@+id/tv_duty_title"

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

@@ -2,12 +2,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
-    android:paddingLeft="@dimen/content_padding_20"
-    android:paddingRight="@dimen/content_padding_20"
-    android:layout_marginBottom="@dimen/content_padding_10"
-    android:layout_marginLeft="@dimen/content_padding_10"
-    android:layout_marginRight="@dimen/content_padding_10">
+    android:paddingTop="@dimen/content_padding_10"
+    android:paddingBottom="@dimen/content_padding_10">
 
     <ImageView
         android:id="@+id/icon_iv"

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

@@ -3,25 +3,23 @@
     android:id="@+id/item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_marginBottom="12dp">
+    android:layout_marginBottom="12dp"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/item_title_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="13dp"
         android:text="推荐"
         android:textColor="@color/black"
         android:textSize="15dp"
-        android:layout_marginBottom="13dp"
-        android:visibility="gone"/>
+        android:visibility="gone" />
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/release_task_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/content_padding_4"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
-
-    </android.support.v7.widget.RecyclerView>
+        android:paddingBottom="@dimen/content_padding_4" />
 
 </LinearLayout>

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

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/bg_gray">
+    android:layout_height="match_parent">
 
     <include
         android:id="@+id/title"
@@ -13,22 +12,23 @@
         layout="@layout/empty_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/title" />
+        android:layout_below="@+id/title"
+        android:layout_marginTop="100dp" />
 
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/content_padding_13"
-        android:layout_below="@+id/title">
+        android:layout_below="@+id/title"
+        android:paddingStart="@dimen/content_padding_16"
+        android:paddingEnd="@dimen/content_padding_16">
 
         <ListView
             android:id="@+id/withdrawal_listview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_below="@+id/title"
-            android:divider="@color/transparent"
-            android:dividerHeight="@dimen/content_padding_10"
+            android:divider="@color/gray_F5F5F5"
+            android:dividerHeight="1dp"
             android:listSelector="@color/transparent"
             android:scrollbars="none" />
 

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

@@ -23,8 +23,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:text="内容"
-    android:textSize="@dimen/text_size_12"
-    android:textColor="#7F7F7F"
+    android:textColor="#666666"
+    android:textSize="11sp"
     android:gravity="center_vertical"
     android:ellipsize="marquee"
     android:singleLine="true" />