打卡布局调整

app/src/main/java/com/sheep/gamegroup/model/entity/TaskEty.java

@@ -637,10 +637,10 @@ public class TaskEty implements Serializable, IDownload {
             case 1003:
             case 1004:
                 return false;
-            case 1:
-            case 3:
             case 1000:
                 return open_mode == 1;// 1:打开应用 2:H5内部 3:H5外部
+            case 1:
+            case 3:
             default:
                 return true;
         }

app/src/main/java/com/sheep/gamegroup/view/customview/CircleView.java

@@ -1,50 +0,0 @@
-package com.sheep.gamegroup.view.customview;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.support.annotation.Nullable;
-import android.util.AttributeSet;
-import android.view.View;
-
-import com.sheep.gamegroup.util.LogUtil;
-import com.sheep.jiuyan.samllsheep.utils.G;
-
-/**
- * Created by realicing on 2018/9/11.
- * realicing@sina.com
- */
-public class CircleView extends View {
-    public CircleView(Context context) {
-        super(context);
-        initPaint();
-    }
-
-    public CircleView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-        initPaint();
-    }
-
-    public CircleView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initPaint();
-    }
-
-    private Paint paint;
-
-    private void initPaint() {
-        //画笔
-        paint = new Paint();
-        //设置颜色
-        paint.setColor(Color.parseColor("#2EBEF2"));
-        //设置是否为空心
-        paint.setStyle(Paint.Style.FILL);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        canvas.drawCircle(G.WIDTH / 2, getHeight() / 2, G.WIDTH * 11 / 12, paint);
-    }
-}

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

@@ -73,8 +73,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/ask_share_title"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="@dimen/content_padding_15" />
+            android:layout_centerVertical="true"
+            android:layout_marginBottom="8dp"/>
     </RelativeLayout>
 
 

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

@@ -1,87 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:orientation="vertical">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    <include layout="@layout/title" />
 
-        <com.sheep.gamegroup.view.customview.CircleView
-            android:layout_width="wrap_content"
-            android:layout_height="800dp"
-            android:layout_marginTop="-440dp" />
+    <android.support.v4.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/white">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:clipChildren="false"
             android:orientation="vertical">
 
-            <include layout="@layout/title" />
-
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:orientation="horizontal">
+                android:layout_height="wrap_content">
 
-                <TextView
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:gravity="center_vertical"
-                    android:paddingEnd="13dp"
-                    android:paddingStart="13dp"
-                    android:text="明早打卡可平分"
-                    android:textColor="#ffffffff"
-                    android:textSize="14sp" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/daka_bg"
+                    android:layout_marginBottom="20dp"
+                    android:orientation="vertical">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="50dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:layout_width="0dp"
+                            android:layout_height="match_parent"
+                            android:layout_weight="1"
+                            android:gravity="center_vertical"
+                            android:paddingEnd="13dp"
+                            android:paddingStart="13dp"
+                            android:text="明早打卡可平分"
+                            android:textColor="#ffffffff"
+                            android:textSize="14sp" />
+
+                        <TextView
+                            android:id="@+id/sign_card_tip"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:paddingEnd="16dp"
+                            android:paddingStart="16dp"
+                            android:text="活动说明"
+                            android:textColor="#ffffffff"
+                            android:textSize="11sp" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:id="@+id/sign_card_total_bonus"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="6432元"
+                        android:textColor="#fff6ff00"
+                        android:textSize="28sp" />
+
+                    <TextView
+                        android:id="@+id/sign_card_total_people"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="当前参与人数6324人"
+                        android:textColor="#ffffffff"
+                        android:textSize="13sp" />
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/sign_card_users"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="18dp"
+                        android:layout_marginStart="18dp"
+                        android:layout_marginTop="24dp" />
+                </LinearLayout>
 
                 <TextView
-                    android:id="@+id/sign_card_tip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:id="@+id/sign_card_join"
+                    android:layout_width="160dp"
+                    android:layout_height="54dp"
+                    android:layout_centerHorizontal="true"
+                    android:layout_alignParentBottom="true"
+                    android:background="@drawable/selector_button_daka"
+                    android:enabled="false"
                     android:gravity="center"
-                    android:paddingEnd="16dp"
-                    android:paddingStart="16dp"
-                    android:text="活动说明"
-                    android:textColor="#ffffffff"
-                    android:textSize="11sp" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/sign_card_total_bonus"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="6432元"
-                android:textColor="#fff6ff00"
-                android:textSize="28sp" />
-
-            <TextView
-                android:id="@+id/sign_card_total_people"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="当前参与人数6324人"
-                android:textColor="#ffffffff"
-                android:textSize="13sp" />
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/sign_card_users"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="18dp"
-                android:layout_marginStart="18dp"
-                android:layout_marginTop="24dp" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="76dp" />
+                    android:paddingBottom="6dp"
+                    android:text="@string/loading"
+                    android:textColor="@color/white"
+                    android:textSize="16sp" />
+            </RelativeLayout>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
+                android:layout_marginTop="10dp"
                 android:text="今日战况"
                 android:textColor="#ff333333"
                 android:textSize="14sp" />
@@ -189,19 +210,5 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
         </LinearLayout>
-
-        <TextView
-            android:id="@+id/sign_card_join"
-            android:layout_width="160dp"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="260dp"
-            android:background="@drawable/selector_button_daka"
-            android:gravity="center"
-            android:enabled="false"
-            android:paddingBottom="6dp"
-            android:text="@string/loading"
-            android:textColor="@color/white"
-            android:textSize="16sp" />
-    </RelativeLayout>
-</android.support.v4.widget.NestedScrollView>
+    </android.support.v4.widget.NestedScrollView>
+</LinearLayout>

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

@@ -13,18 +13,19 @@
             android:id="@+id/ask_share_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:padding="@dimen/content_padding_15"
             android:text="邀请好友"
             android:textColor="#ff333333"
-            android:textSize="14sp"
-            android:padding="@dimen/content_padding_15"/>
+            android:textSize="14sp" />
+
         <android.support.v7.widget.RecyclerView
             android:id="@+id/ask_share_list"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_below="@+id/ask_share_title"
-            android:layout_marginTop="20dp"
-            android:layout_marginStart="@dimen/content_padding_15"
+            android:layout_centerVertical="true"
             android:layout_marginBottom="35dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_marginTop="20dp" />
     </RelativeLayout>
 
 </FrameLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_horizontal"
     android:orientation="vertical">