64k error 提交

.idea/gradle.xml

@@ -5,12 +5,6 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
         <option name="resolveModulePerSourceSet" value="false" />
       </GradleProjectSettings>
     </option>

.idea/modules.xml

@@ -2,8 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://D:/Dlg/AndroidStudioProjects/small_sheep_android/SamllSheepPlugin.iml" filepath="D:/Dlg/AndroidStudioProjects/small_sheep_android/SamllSheepPlugin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/SamllSheepPlugin.iml" filepath="$PROJECT_DIR$/SamllSheepPlugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/small_sheep_android.iml" filepath="$PROJECT_DIR$/small_sheep_android.iml" />
     </modules>

app/build.gradle

@@ -18,6 +18,7 @@ android {
         jackOptions {
             enabled true
         }
+        multiDexEnabled true
     }
     compileOptions{
         sourceCompatibility org.gradle.api.JavaVersion.VERSION_1_8
@@ -80,11 +81,12 @@ dependencies {
     compile 'com.mylhyl:acp:1.1.7'
     compile 'cn.yipianfengye.android:zxing-library:2.2'
     compile 'com.github.huburt-Hu:NewbieGuide:v1.2.0'
+    compile 'com.android.support:multidex:1.0.1'
 
     //butterknife
     compile 'com.jakewharton:butterknife:+'
     annotationProcessor 'com.jakewharton:butterknife-compiler:+'
-    //dragger2
+    //dagger2
 //    compile 'com.google.dagger:dagger:+'
 //    compile 'com.google.dagger:dagger-compiler:+'
     provided 'org.glassfish:javax.annotation:+'

app/src/main/java/com/sheep/gamegroup/di/components/PhoneComponent.java

@@ -0,0 +1,16 @@
+package com.sheep.gamegroup.di.components;
+
+import com.sheep.gamegroup.di.modules.PhoneModule;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.view.activity.PhoneAct;
+
+import dagger.Component;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+@UserScope
+@Component(modules = PhoneModule.class, dependencies = NetComponent.class)
+public interface PhoneComponent {
+    void inject(PhoneAct phoneAct);
+}

app/src/main/java/com/sheep/gamegroup/di/modules/PhoneModule.java

@@ -0,0 +1,27 @@
+package com.sheep.gamegroup.di.modules;
+
+import com.sheep.gamegroup.di.components.NetComponent;
+import com.sheep.gamegroup.di.scopes.UserScope;
+import com.sheep.gamegroup.presenter.PhoneContract;
+
+import javax.inject.Inject;
+
+import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+@Module
+public class PhoneModule {
+    private PhoneContract.View view;
+
+    public PhoneModule(PhoneContract.View view) {
+        this.view = view;
+    }
+    @Provides
+    public PhoneContract.View provideView(){
+        return view;
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/PhoneContract.java

@@ -0,0 +1,16 @@
+package com.sheep.gamegroup.presenter;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+
+public interface PhoneContract {
+
+    interface Presenter{
+
+    }
+
+    interface View{
+
+    }
+}

app/src/main/java/com/sheep/gamegroup/presenter/PhonePresenter.java

@@ -0,0 +1,20 @@
+package com.sheep.gamegroup.presenter;
+
+import com.sheep.gamegroup.model.api.ApiService;
+
+import javax.inject.Inject;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+
+public class PhonePresenter implements PhoneContract.Presenter {
+    private PhoneContract.View view;
+    private ApiService apiService;
+
+    @Inject
+    public PhonePresenter(PhoneContract.View view, ApiService apiService) {
+        this.view = view;
+        this.apiService = apiService;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.sheep.gamegroup.util;
+
+import android.os.CountDownTimer;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+
+public abstract class SelfCountDownTimer extends CountDownTimer{
+    private static final int FULL_SECOND = 60;
+    private int countTime = FULL_SECOND;
+    /**
+     * @param millisInFuture    The number of millis in the future from the call
+     *                          to {@link #start()} until the countdown is done and {@link #onFinish()}
+     *                          is called.
+     * @param countDownInterval The interval along the way to receive
+     *                          {@link #onTick(long)} callbacks.
+     */
+    public SelfCountDownTimer(long millisInFuture, long countDownInterval) {
+        super(millisInFuture, countDownInterval);
+    }
+
+    public void reset(){
+        this.cancel();
+        countTime = FULL_SECOND;
+
+    }
+
+    @Override
+    public void onTick(long millisUntilFinished) {
+        countTime--;
+        onTimerTick(millisUntilFinished, countTime);
+    }
+
+    @Override
+    public void onFinish() {
+        onTimerFinish();
+    }
+
+    public abstract void onTimerRest();
+    public abstract void onTimerTick(long millisUntilFinished, int counTime);
+    public abstract void onTimerFinish();
+}

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

@@ -0,0 +1,102 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.support.v7.widget.AppCompatEditText;
+import android.view.View;
+import android.widget.TextView;
+
+import com.sheep.gamegroup.di.components.DaggerPhoneComponent;
+import com.sheep.gamegroup.di.modules.PhoneModule;
+import com.sheep.gamegroup.presenter.PhoneContract;
+import com.sheep.gamegroup.util.SelfCountDownTimer;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseActivity;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+/**
+ * Created by ljy on 2018/3/15.
+ */
+
+public class PhoneAct extends BaseActivity implements PhoneContract.View {
+    Activity activity;
+    @BindView(R.id.phone_et_account)
+    AppCompatEditText phoneEtAccount;
+    @BindView(R.id.phone_et_code)
+    AppCompatEditText phoneEtCode;
+    @BindView(R.id.phone_btn_code)
+    TextView phoneBtnCode;
+    @BindView(R.id.phone_sure_tv)
+    TextView phoneSureTv;
+
+    private SelfCountDownTimer selfCountDownTimer;
+    private boolean canGetCaptchaPhone = true;
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.bind_phone_number_act_layout;
+    }
+
+    @Override
+    public void initView() {
+        activity = this;
+        DaggerPhoneComponent.builder()
+                .netComponent(SheepApp.get(this).getNetComponent())
+                .phoneModule(new PhoneModule(this))
+                .build()
+        .inject(this);
+    }
+
+    @Override
+    public void initListener() {
+        selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000) {
+            @Override
+            public void onTimerRest() {
+                canGetCaptchaPhone = true;
+                phoneBtnCode.setText(getString(R.string.get_captcha));
+            }
+
+            @Override
+            public void onTimerTick(long millisUntilFinished, int counTime) {
+                String textStr = counTime + " s";
+                phoneBtnCode.setText(textStr);
+            }
+
+            @Override
+            public void onTimerFinish() {
+                canGetCaptchaPhone = true;
+                phoneBtnCode.setText(getString(R.string.get_captcha)+1);
+            }
+        };
+    }
+
+    @Override
+    public void initData() {
+
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
+
+    @OnClick({R.id.phone_et_account, R.id.phone_et_code, R.id.phone_btn_code, R.id.phone_sure_tv})
+    public void onViewClicked(View view) {
+        switch (view.getId()) {
+            case R.id.phone_et_account:
+                break;
+            case R.id.phone_et_code:
+                break;
+            case R.id.phone_btn_code:
+                break;
+            case R.id.phone_sure_tv:
+                break;
+        }
+    }
+}

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -3,6 +3,7 @@ package com.sheep.jiuyan.samllsheep;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
+import android.support.multidex.MultiDex;
 import android.util.DisplayMetrics;
 
 import com.liulishuo.filedownloader.FileDownloader;
@@ -119,4 +120,9 @@ public class SheepApp extends BaseApplication {
         return mSheepApp;
     }
 
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        MultiDex.install(this);
+    }
 }

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@color/blue_start"
+        android:angle="-90"
+        android:centerY="50%"
+        android:centerX="50%"
+        android:endColor="@color/blue_end"/>
+
+    <corners
+        android:radius="@dimen/radius_100"/>
+
+</shape>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <gradient
+        android:startColor="@color/green_start"
+        android:angle="-90"
+        android:centerX="-50%"
+        android:centerY="50%"
+        android:endColor="@color/green_end"/>
+
+    <corners
+        android:radius="@dimen/radius_100"/>
+
+</shape>

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

@@ -3,12 +3,11 @@
     android:shape="rectangle">
 
     <gradient
-        android:startColor="@color/white"
+        android:startColor="@color/yellow_start"
         android:angle="-90"
         android:centerY="50%"
-        android:centerColor="@color/txt_bg_yellow"
         android:centerX="50%"
-        android:endColor="@color/black"/>
+        android:endColor="@color/yellow_end"/>
     <corners
-        android:radius="100dp"/>
+        android:radius="@dimen/radius_15"/>
 </shape>

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

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

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

@@ -4,6 +4,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <include
+        layout="@layout/title"/>
+
     <ImageView
         android:id="@+id/phone_iv"
         android:layout_width="wrap_content"
@@ -71,7 +74,7 @@
                 android:layout_marginLeft="@dimen/content_padding"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="获取验证码"
+                android:text="@string/get_captcha"
                 android:textColor="@color/txt_bule"
                 />
 

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

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

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

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/bg_gray">
+
+    <include
+        layout="@layout/title"/>
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent">
+        <android.support.v7.widget.RecyclerView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:scrollbars="none"
+            android:background="@color/bg_gray"
+            android:layout_margin="@dimen/content_padding_10">
+
+        </android.support.v7.widget.RecyclerView>
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,70 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/sp_rectangle_bg_white_radius"
+    android:padding="@dimen/content_padding_15">
+
+    <TextView
+        android:id="@+id/state_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="正常挂机"
+        style="@style/txt_style_15"
+        tools:layout_editor_absoluteY="0dp"
+        tools:layout_editor_absoluteX="0dp" />
+    <TextView
+        android:id="@+id/weixin_number_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="微信号"
+        style="@style/nomal_txt_style"
+        app:layout_constraintTop_toBottomOf="@+id/state_name_tv"
+        tools:layout_editor_absoluteX="15dp"
+        android:layout_marginTop="@dimen/content_padding_10" />
+    <TextView
+        android:id="@+id/weixin_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="xiaomianyang"
+        style="@style/hint_txt_style"
+        app:layout_constraintTop_toBottomOf="@+id/weixin_number_tv"
+        app:layout_editor_absoluteX="@dimen/content_padding_15"
+        android:layout_marginTop="@dimen/content_padding_10"
+        tools:layout_editor_absoluteX="15dp" />
+    <TextView
+        android:id="@+id/yuan_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/nomal_txt_style"
+        android:textSize="@dimen/text_size_2"
+        android:textColor="@color/txt_red_ff4a5f"
+        android:text="元"
+        app:layout_constraintBaseline_toBaselineOf="@+id/weixin_name_tv"
+        app:layout_constraintRight_toRightOf="parent"
+        />
+
+    <TextView
+        android:id="@+id/earnings_name_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/nomal_txt_style"
+        android:text="收益"
+        android:layout_marginRight="@dimen/content_padding"
+        app:layout_constraintBaseline_toBaselineOf="@+id/weixin_number_tv"
+        app:layout_constraintEnd_toStartOf="@id/yuan_tv"/>
+    <TextView
+        android:id="@+id/earnings_money_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        style="@style/nomal_txt_style"
+        android:textSize="@dimen/text_size_20"
+        android:textColor="@color/txt_red_ff4a5f"
+        android:text="0.63"
+        app:layout_constraintBaseline_toBaselineOf="@+id/weixin_name_tv"
+        app:layout_constraintStart_toStartOf="@id/earnings_name_tv"/>
+
+
+</android.support.constraint.ConstraintLayout>

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

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

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

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

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

@@ -2,25 +2,31 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    style="@style/login_layout"
-    android:background="@android:color/holo_blue_bright">
+    >
 
-    <TextView
-        android:id="@+id/weixin_login_tv"
+    <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="微信登录"
-        style="@style/login_btn"
-        android:layout_above="@+id/tel_login_tv"
-        android:focusedByDefault="true"/>
-    <TextView
-        android:id="@+id/tel_login_tv"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="手机号登录"
-        android:layout_alignParentBottom="true"
-        style="@style/login_btn"
-        android:layout_marginBottom="100dp"
-        android:layout_marginTop="15dp"/>
+        android:layout_height="match_parent"
+        android:background="@mipmap/login_bg_img"
+        style="@style/login_layout"
+        android:layout_marginTop="@dimen/content_padding_80">
+        <TextView
+            android:id="@+id/weixin_login_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="微信登录"
+            style="@style/login_btn"
+            android:layout_above="@+id/tel_login_tv"
+            android:focusedByDefault="true"/>
+        <TextView
+            android:id="@+id/tel_login_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="手机号登录"
+            android:layout_alignParentBottom="true"
+            style="@style/login_btn"
+            android:layout_marginBottom="100dp"
+            android:layout_marginTop="15dp"/>
+    </RelativeLayout>
 
 </RelativeLayout>

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

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/bg_gray">
+
+    <include
+        layout="@layout/title"/>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/sp_rectangle_bg_white_radius"
+        android:layout_margin="@dimen/content_padding_15"
+        android:padding="@dimen/content_padding_20"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center">
+            <TextView
+                android:id="@+id/pre_name_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/content_padding_15"
+                android:text="姓名"
+                style="@style/nomal_txt_style"
+                android:layout_gravity="center"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:id="@+id/name_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="aaaaaaaaadddd"
+                android:background="@null"
+                android:layout_gravity="right"
+                android:gravity="right"/>
+
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/bg_gray"
+            android:layout_marginTop="@dimen/content_padding"
+            android:layout_marginBottom="@dimen/content_padding"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center">
+            <TextView
+                android:id="@+id/pre_sfz_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/content_padding_15"
+                android:text="身份证"
+                style="@style/nomal_txt_style"
+                android:layout_gravity="center"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:id="@+id/sfz_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="aaaaaaaaadddd"
+                android:background="@null"
+                android:layout_gravity="right"
+                android:gravity="right"/>
+
+        </LinearLayout>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/bg_gray"
+            android:layout_marginTop="@dimen/content_padding"
+            android:layout_marginBottom="@dimen/content_padding"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_gravity="center">
+            <TextView
+                android:id="@+id/pre_banknumber_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/content_padding_15"
+                android:text="银行卡"
+                style="@style/nomal_txt_style"
+                android:layout_gravity="center"/>
+            <android.support.v7.widget.AppCompatEditText
+                android:id="@+id/banknumber_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="aaaaaaaaadddd"
+                android:background="@null"
+                android:layout_gravity="right"
+                android:gravity="right"/>
+
+        </LinearLayout>
+    </LinearLayout>
+
+</LinearLayout>

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

@@ -0,0 +1,55 @@
+<?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="wrap_content"
+    android:background="@drawable/sp_rectangle_bg_white_radius"
+    android:padding="@dimen/content_padding_20"
+    android:layout_margin="@dimen/content_padding_10">
+
+    <RelativeLayout
+        android:id="@+id/name_date_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/name_tv"
+            style="@style/nomal_txt_style"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="完成试玩任务无敌大航海"/>
+
+        <TextView
+            android:id="@+id/date_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="2018/2/14 14:41"
+            android:layout_below="@+id/name_tv"
+            android:textSize="@dimen/text_size_3"
+            android:textColor="@color/txt_black_818181"
+            android:layout_marginTop="@dimen/content_padding_10"/>
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/price_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="+1.5元"
+        android:textColor="@color/txt_red"
+        android:textSize="@dimen/text_size_15"
+        android:layout_centerVertical="true"
+        android:layout_toRightOf="@+id/name_date_layout"
+        android:layout_marginLeft="@dimen/content_padding_10"/>
+
+    <TextView
+        android:id="@+id/state_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="提现成功"
+        android:textSize="@dimen/text_size_12"
+        android:textColor="@color/black_444444"
+        android:layout_toRightOf="@+id/price_tv"
+        android:layout_alignParentRight="true"
+        android:gravity="right"
+        android:layout_centerVertical="true"/>
+
+
+</RelativeLayout>

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

@@ -5,36 +5,120 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    android:background="@color/bg_gray"
-    android:padding="@dimen/content_padding_15">
+    android:background="@color/bg_gray">
+    <include
+        layout="@layout/title"/>
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/sp_rectangle_bg_white_radius"
-        android:padding="@dimen/content_padding_20">
+        android:padding="@dimen/content_padding_20"
+        android:layout_margin="@dimen/content_padding_15">
         <TextView
             android:id="@+id/withdrawal_wx_pre_notice_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="当前的提现绑定微信号为"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"/>
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:textColor="@color/txt_gray_929292"
+            android:textSize="@dimen/text_size_12" />
         <TextView
             android:id="@+id/weixin_name_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="微信帐号"
-            app:layout_constraintTop_toBottomOf="@id/withdrawal_wx_pre_notice_tv"
-            app:layout_constraintLeft_toLeftOf="@id/withdrawal_wx_pre_notice_tv"
-            android:layout_marginLeft="17dp"
-            android:layout_marginTop="6dp" />
+            app:layout_constraintTop_toBottomOf="@+id/withdrawal_wx_pre_notice_tv"
+            app:layout_constraintLeft_toLeftOf="@+id/withdrawal_wx_pre_notice_tv"
+            android:layout_marginLeft="36dp"
+            android:layout_marginTop="6dp"
+            android:textSize="@dimen/text_size_3"
+            android:textColor="@color/txt_black_404040"
+            android:layout_marginStart="36dp"/>
         <TextView
+            android:id="@+id/withdrawal_change_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="更换"
+            app:layout_constraintTop_toBottomOf="@+id/withdrawal_wx_pre_notice_tv"
             app:layout_constraintStart_toEndOf="@id/weixin_name_tv"
-            app:layout_constraintLeft_toLeftOf="@id/weixin_name_tv"/>
+            app:layout_constraintLeft_toLeftOf="@+id/weixin_name_tv"
+            android:layout_marginTop="6dp"
+            android:textSize="@dimen/text_size_12"
+            android:textColor="@color/txt_bule"
+            android:layout_marginStart="17dp"/>
+        <TextView
+            android:id="@+id/line_one"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/weixin_name_tv"
+            android:background="@color/txt_gray_929292"
+            android:layout_marginTop="17dp"/>
+
+        <TextView
+            android:id="@+id/withdrawal_wx_bank_notice_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="微信绑定银行卡的姓名"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:textColor="@color/txt_gray_929292"
+            android:textSize="@dimen/text_size_12"
+            app:layout_constraintTop_toBottomOf="@+id/line_one"
+            android:layout_marginTop="@dimen/content_padding_20"/>
+        <TextView
+            android:id="@+id/withdrawal_real_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text=""
+            android:hint="请输入真实姓名"
+            app:layout_constraintTop_toBottomOf="@+id/withdrawal_wx_bank_notice_tv"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:layout_marginTop="6dp"
+            android:textSize="@dimen/text_size_3"
+            android:textColor="@color/txt_black_404040"/>
+        <TextView
+            android:id="@+id/line_two"
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/withdrawal_real_name_tv"
+            android:background="@color/txt_gray_929292"
+            android:layout_marginTop="17dp"/>
+
+        <TextView
+            android:id="@+id/withdrawal_click_bindname_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="点我进行实名认证，以后提现都不用验证啦!"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            android:textColor="@color/txt_gray_929292"
+            android:textSize="@dimen/text_size_12"
+            app:layout_constraintTop_toBottomOf="@+id/line_two"
+            android:layout_marginTop="@dimen/content_padding_20"/>
+        <GridView
+            android:id="@+id/withdrawal_greidview"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/withdrawal_click_bindname_tv"
+            tools:layout_editor_absoluteX="8dp"
+            android:scrollbars="none"
+            android:numColumns="3"
+            android:layout_marginTop="@dimen/content_padding_20"
+            android:visibility="gone"/>
     </android.support.constraint.ConstraintLayout>
+    <TextView
+        android:id="@+id/withdrawal_sure"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/txt_big_btn_style"
+        android:text="确 定"
+        android:background="@drawable/sp_bg_gradient_rectqangle_yellow"/>
 
 </LinearLayout>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical">
+
+    <include layout="@layout/title" />
+
+    <ListView
+        android:id="@+id/withdrawal_listview"
+        android:layout_width="match_parent"
+        android:layout_height="240dp"
+        android:scrollbars="none"></ListView>
+</LinearLayout>

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

@@ -24,9 +24,8 @@
         android:id="@+id/withdrawal_bind_weixin_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        style="@style/txt_big_style"
+        style="@style/txt_big_btn_style"
         android:text="立即绑定"
         android:gravity="center"
-        android:layout_marginLeft="@dimen/content_padding_15"
         android:background="@drawable/sp_bg_gradient_rectqangle_yellow"/>
 </LinearLayout>

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

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/title"/>
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@mipmap/yellow_yang"
+        android:layout_gravity="center_horizontal"/>
+
+    <TextView
+        android:id="@+id/withdrawal_success_money_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="+1.5元"
+        android:textSize="@dimen/text_size_32"
+        android:textColor="@color/red_fd2d54"
+        android:layout_marginTop="@dimen/content_padding_20"/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="已领取任务奖励"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/content_padding_15"
+        android:textSize="@dimen/text_size_15"
+        android:textColor="@color/black_444444"/>
+
+    <TextView
+        android:id="@+id/withdrawal_success_sure_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="确 定"
+        android:layout_marginTop="@dimen/content_padding_15"
+        style="@style/txt_big_btn_style"/>
+
+</LinearLayout>

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

@@ -29,7 +29,9 @@
     <dimen name="text_size_9">50sp</dimen>
     <dimen name="text_size_12">12sp</dimen>
     <dimen name="text_size_15">15sp</dimen>
+    <dimen name="text_size_20">20sp</dimen>
     <dimen name="text_size_25">25sp</dimen>
+    <dimen name="text_size_32">32sp</dimen>
 
     <!--一般layout的高度-->
     <dimen name="layout_heigh_default">48dp</dimen>
@@ -69,6 +71,8 @@
     <dimen name="content_padding_10">10dp</dimen>
     <dimen name="content_padding_15">15dp</dimen>
     <dimen name="content_padding_20">20dp</dimen>
+    <dimen name="content_padding_40">40dp</dimen>
+    <dimen name="content_padding_80">80dp</dimen>
 
 
     <!--下面的tagid用于设置tag使用-->
@@ -81,5 +85,13 @@
     <item name="tagid7" type="id" />
     <item name="tagid8" type="id" />
 
+    <!--radius size-->
+        <dimen name="radius_100">100dp</dimen>
+        <dimen name="radius_25">25dp</dimen>
+        <dimen name="radius_15">15dp</dimen>
+        <dimen name="radius_5">5dp</dimen>
+
+    <dimen name="view_size_45">45dp</dimen>
+
 
 </resources>

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

@@ -9,5 +9,18 @@
     <color name="txt_red">#ff2d4b</color>
     <color name="txt_bule">#4889ff</color>
     <color name="bg_gray">#e3e1e1</color>
+    <color name="txt_black_404040">#404040</color>
+    <color name="txt_gray_929292">#929292</color>
+    <color name="red_fd2d54">#fd2d54</color>
+    <color name="txt_black_818181">#818181</color>
+    <color name="txt_black_9e9c9c">#9e9c9c</color>
+    <color name="txt_red_ff4a5f">#ff4a5f</color>
+
+    <color name="yellow_start">#f4c76c</color>
+    <color name="yellow_end">#fd9c11</color>
+    <color name="blue_start">#80d2fe</color>
+    <color name="blue_end">#1394e8</color>
+    <color name="green_start">#76eab8</color>
+    <color name="green_end">#02ca73</color>
 
 </resources>

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

@@ -11,6 +11,19 @@
         <item name="android:textSize">20dp</item>
     </style>
 
+    <style name="nomal_txt_style">
+        <item name="android:textSize">@dimen/text_size_3</item>
+        <item name="android:textColor">@color/black_444444</item>
+    </style>
+    <style name="txt_style_15">
+        <item name="android:textSize">@dimen/text_size_15</item>
+        <item name="android:textColor">@color/black_444444</item>
+    </style>
+    <style name="hint_txt_style">
+        <item name="android:textSize">@dimen/text_size_2</item>
+        <item name="android:textColor">@color/txt_black_9e9c9c</item>
+    </style>
+
     <style name="edt_style">
         <item name="android:textSize">14sp</item>
         <item name="android:paddingTop">6dp</item>
@@ -28,8 +41,19 @@
         <item name="android:background">@drawable/sp_bg_yellow</item>
     </style>
     <style name="txt_big_style">
+        <item name="android:minHeight">@dimen/view_size_45</item>
         <item name="android:text">无敌大航海</item>
-        <item name="android:textSize">@dimen/text_size_15</item>
+        <item name="android:textSize">@dimen/text_size_5</item>
+        <item name="android:textColor">@color/txt_black</item>
+        <item name="android:gravity">center</item>
+    </style>
+    <style name="txt_big_btn_style">
+        <item name="android:minHeight">@dimen/view_size_45</item>
+        <item name="android:text">无敌大航海</item>
+        <item name="android:textSize">@dimen/text_size_5</item>
         <item name="android:textColor">@color/txt_black</item>
+        <item name="android:gravity">center</item>
+        <item name="android:layout_margin">@dimen/content_padding_small</item>
+        <item name="android:background">@drawable/sp_bg_gradient_rectqangle_yellow</item>
     </style>
 </resources>

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

@@ -6,4 +6,5 @@
     <string name="done">安装</string>
     <string name="accessibility_service_description">开启观察权限</string>
     <string name="sprogress_string">当前进度%.1f%%</string>
+    <string name="get_captcha">获取验证码</string>
 </resources>