任务和挂机系统的实现

Signed-off-by: 刁铃刚 <315096953@qq.com>

app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -10,6 +10,7 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v4.widget.SwipeRefreshLayout;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -51,6 +52,8 @@ public class MainActivity extends BaseActivity {
     private FgtMainPageTask mFgtMainPageTask;
     private FgtMainPageOffline mFgtMainPageOffline;
     private AppBarLayout mAppBarLayout;
+    private boolean mIsTopest = true;//下滑是否在最顶端
+    private boolean mIsLeftest = true;//右滑时是否在最左端
 
 
     @Override
@@ -117,9 +120,8 @@ public class MainActivity extends BaseActivity {
         mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
             public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-                if (positionOffsetPixels > 10 && mSwipeRefreshLayout.isEnabled()) {
-                    mSwipeRefreshLayout.setEnabled(false);
-                }
+                mIsLeftest = positionOffsetPixels < 8;
+                reSetSwipeRefreshLayout();
             }
 
             @Override
@@ -130,7 +132,7 @@ public class MainActivity extends BaseActivity {
             @Override
             public void onPageScrollStateChanged(int state) {
                 if (state == SCROLL_STATE_IDLE) {
-                    mSwipeRefreshLayout.setEnabled(true);
+                    mSwipeRefreshLayout.setEnabled(mIsTopest);
                 }
             }
         });
@@ -138,11 +140,8 @@ public class MainActivity extends BaseActivity {
         mAppBarLayout.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
             @Override
             public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                if (verticalOffset >= 0) {
-                    mSwipeRefreshLayout.setEnabled(true);
-                } else {
-                    mSwipeRefreshLayout.setEnabled(false);
-                }
+                mIsTopest = verticalOffset >= 0;
+                reSetSwipeRefreshLayout();
             }
         });
 
@@ -157,6 +156,16 @@ public class MainActivity extends BaseActivity {
         });
     }
 
+    private void reSetSwipeRefreshLayout() {
+        if (mIsLeftest && mIsTopest && !mSwipeRefreshLayout.isEnabled()) {
+            mSwipeRefreshLayout.setEnabled(true);
+        } else if (mSwipeRefreshLayout.isEnabled()) {
+            mSwipeRefreshLayout.setEnabled(false);
+        } else if (mSwipeRefreshLayout.isEnabled() && (!mIsLeftest || !mIsTopest)) {
+            mSwipeRefreshLayout.setEnabled(false);
+        }
+    }
+
     @Override
     public void initData() {
         ((TextView) findViewById(R.id.txt_main_activity_money))

app/src/main/java/com/sheep/jiuyan/samllsheep/page/adapter/AdpMainActivity.java

@@ -25,7 +25,7 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
 
     public final static int TAG_TASK = R.id.tagid1;
     private final static int TAG_URL = R.id.tagid2;
-    private final static String HTML_FORMAT = "任务数量：<font color=\"#ef712c\">数量</font>/总数";
+    private final static String HTML_FORMAT = "任务数量：<font color=\"#ef712c\">当前数量</font>/总数";
 
     /**
      * 点击后的监听处理，一定要先设置再setAdapter
@@ -55,7 +55,7 @@ public class AdpMainActivity extends AdpCommonRecy<TaskPublish> {
         holder.getView(R.id.txt_baseactivity_title, TextView.class)
                 .setText(taskPublish.getTask().getTitle());
         holder.getView(R.id.tv_count, TextView.class)
-                .setText(Html.fromHtml(HTML_FORMAT.replace("数量", taskPublish.getSurplusCount() + "")
+                .setText(Html.fromHtml(HTML_FORMAT.replace("当前数量", taskPublish.getSurplusCount() + "")
                         .replace("总数", taskPublish.getTotalCouont() + "")));
         holder.getView(R.id.tv_time, TextView.class)
                 .setText(String.format("截止日期：%s", taskPublish.getOverTime()));

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size
+        android:width="100dp"
+        android:height="100dp" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/colorPrimaryDark" />
+    <gradient
+        android:angle="45"
+        android:endColor="@color/colorPrimary"
+        android:startColor="#FEF2A9" />
+</shape>

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

@@ -1,12 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout 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"
     android:background="@color/white"
     android:orientation="vertical">
-<TextView
-    android:text="dfgsdfgdsfgdfg"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="60dp">
+
+        <ImageView
+            android:layout_width="140dp"
+            android:layout_height="140dp"
+            android:src="@drawable/sp_start_offline"
+            android:text="dfgsdfgdsfgdfg" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="开始挂机"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_6" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="40dp"
+        android:text="免费云端挂机，平台自动做任务"
+        android:textColor="@color/black_text_deep"
+        android:textSize="@dimen/text_size_4" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="20dp"
+        android:text="云端挂机无需下载，任务奖金一分不少"
+        android:textColor="@color/black_text_light"
+        android:textSize="@dimen/text_size_2" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/content_padding_small"
+        android:text="使用不常用微信小号，随时随地离线做任务"
+        android:textColor="@color/black_text_light"
+        android:textSize="@dimen/text_size_2" />
 </LinearLayout>

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

@@ -39,13 +39,16 @@
                         android:layout_height="wrap_content"
                         android:text="xxx元"
                         android:textColor="@color/black_text_gray"
+                        android:textSize="@dimen/text_size_4"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintRight_toRightOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />
 
                     <LinearLayout
+                        android:id="@+id/linearLayout"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/content_padding"
                         android:background="@drawable/texe_background_round_theme_left"
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
@@ -82,12 +85,13 @@
                         android:gravity="center_vertical"
                         android:paddingBottom="@dimen/content_padding_small"
                         android:paddingLeft="@dimen/content_padding"
+                        android:paddingRight="@dimen/content_padding_small"
                         android:paddingTop="@dimen/content_padding_small"
                         android:text="现金提现"
                         android:textColor="@color/theme_sheep_dark"
                         android:textSize="@dimen/text_size_2"
                         app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/txt_main_activity_money" />
+                        app:layout_constraintTop_toTopOf="@+id/linearLayout" />
 
                 </android.support.constraint.ConstraintLayout>
 

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

@@ -2,15 +2,15 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/dingwei1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/content_padding"
-        android:background="@color/backgroud"
-        android:padding="@dimen/content_padding">
+        android:layout_margin="@dimen/content_padding_big"
+        android:background="@color/backgroud">
 
         <ImageView
             android:id="@+id/img_icon"
@@ -18,23 +18,22 @@
             android:layout_height="50dp"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
+            android:layout_marginLeft="@dimen/content_padding"
             android:src="@drawable/icon" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:layout_marginLeft="10dp"
-            android:layout_marginTop="5dp"
+            android:layout_marginBottom="@dimen/content_padding_small"
+            android:layout_marginLeft="@dimen/content_padding_small"
+            android:layout_marginTop="@dimen/content_padding_small"
             android:layout_toRightOf="@id/img_icon"
             android:orientation="vertical">
 
             <TextView
                 android:id="@+id/txt_baseactivity_title"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginLeft="5dp"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:text="title"
                 android:textColor="@color/black_text_deep"
@@ -44,9 +43,8 @@
             <TextView
                 android:id="@+id/tv_count"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginLeft="5dp"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding_small"
                 android:gravity="center_vertical"
                 android:text="250/250"
                 android:textColor="@color/black_text_gray"
@@ -55,14 +53,12 @@
             <TextView
                 android:id="@+id/tv_time"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginLeft="5dp"
-                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/content_padding_small"
                 android:gravity="center_vertical"
                 android:text="截止时间：2018-1-1"
                 android:textColor="@color/black_text_gray"
                 android:textSize="@dimen/text_size_2" />
-
         </LinearLayout>
 
 
@@ -72,6 +68,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_alignTop="@id/img_icon"
+            android:layout_centerVertical="true"
             android:layout_marginRight="10dp"
             android:text="5.00"
             android:textColor="@color/orange_text_light"
@@ -83,6 +80,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/tv_money"
+            android:layout_centerVertical="true"
             android:layout_marginBottom="3dp"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="3dp"
@@ -96,7 +94,7 @@
             android:id="@+id/tv_money"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignTop="@id/img_icon"
+            android:layout_centerVertical="true"
             android:layout_toLeftOf="@id/tv_text1"
             android:text="5.00"
             android:textColor="@color/orange_text_light"
@@ -105,15 +103,22 @@
 
     </RelativeLayout>
 
+    <ImageView
+        android:id="@+id/img_task_item_iscomplete"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="@dimen/content_padding_small"
+        android:layout_marginTop="@dimen/content_padding_small"
+        android:src="@drawable/completed" />
+
     <TextView
         android:id="@+id/tv_guide"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/btn_task_item"
         android:layout_below="@id/dingwei1"
         android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginRight="@dimen/content_padding"
-        android:layout_marginTop="@dimen/content_padding"
         android:gravity="center_vertical"
         android:text="任务详情  >"
         android:textColor="@color/black_text_gray"
@@ -125,8 +130,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
+        android:layout_alignTop="@id/tv_guide"
         android:layout_below="@id/dingwei1"
-        android:layout_margin="@dimen/content_padding"
+        android:layout_marginBottom="20dp"
+        android:layout_marginRight="@dimen/content_padding"
         android:text="下载游戏" />
 
     <View

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

@@ -34,8 +34,8 @@
         <item name="android:minHeight">12dp</item>
         <item name="android:paddingLeft">16dp</item>
         <item name="android:paddingRight">16dp</item>
-        <item name="android:paddingTop">4dp</item>
-        <item name="android:paddingBottom">4dp</item>
+        <item name="android:paddingTop">6dp</item>
+        <item name="android:paddingBottom">6dp</item>
         <item name="android:textSize">@dimen/text_size_2</item>
         <item name="android:textColor">@color/black_text_deep</item>
         <item name="android:background">@drawable/sp_btn_common</item>