修改我的报名

app/src/main/java/com/ynstkz/shitu/android/activity/MineSignUpActivity.java

@@ -2,6 +2,7 @@ package com.ynstkz.shitu.android.activity;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -9,8 +10,13 @@ import android.widget.TextView;
 
 import com.common.library.okhttp.callback.Callback;
 import com.ynstkz.shitu.android.R;
+import com.ynstkz.shitu.android.adapter.MyPagerAdapter;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
 import com.ynstkz.shitu.android.data.RequestGroup;
+import com.ynstkz.shitu.android.fragment.MineSignUpItemFragment;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import butterknife.Bind;
 import okhttp3.Call;
@@ -23,10 +29,6 @@ import okhttp3.Response;
 
 public class MineSignUpActivity extends TitleBarActivity {
 
-    public static final String STATUS_PASS = "pass";
-    public static final String STATUS_WAIT = "wait";
-    public static final String STATUS_BACK = "back";
-
     @Bind(R.id.tv_title)
     TextView tvTitle;
     @Bind(R.id.view_title)
@@ -41,6 +43,8 @@ public class MineSignUpActivity extends TitleBarActivity {
     ViewPager vpContent;
 
     private int pageNumber;
+    private List<Fragment> fragmentList;
+    private int currentIndex;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -58,39 +62,33 @@ public class MineSignUpActivity extends TitleBarActivity {
 
     private void initView(){
         tvTitle.setText("我的报名");
+        fragmentList = new ArrayList<>();
+
+        MineSignUpItemFragment passFragment = new MineSignUpItemFragment();
+        passFragment.setStatus(MineSignUpItemFragment.STATUS_PASS);
+        fragmentList.add(passFragment);
+
+        MineSignUpItemFragment waitFragment = new MineSignUpItemFragment();
+        waitFragment.setStatus(MineSignUpItemFragment.STATUS_WAIT);
+        fragmentList.add(waitFragment);
+
+        MineSignUpItemFragment backFragment = new MineSignUpItemFragment();
+        backFragment.setStatus(MineSignUpItemFragment.STATUS_BACK);
+        fragmentList.add(backFragment);
+
+        MyPagerAdapter adapter = new MyPagerAdapter(fragmentList, getSupportFragmentManager());
+        vpContent.setAdapter(adapter);
+        currentIndex = 1;
+        vpContent.setCurrentItem(currentIndex);
     }
 
     private void initData(){
         pageNumber = 1;
-        getMineSignUp(pageNumber, STATUS_PASS);
     }
 
     private void setListener(){
 
     }
 
-    /**
-     * 我的报名
-     * @param pageNumber
-     * @param signUpStatus
-     */
-    private void getMineSignUp(int pageNumber, String signUpStatus){
 
-        RequestGroup.getMineSignup(pageNumber+"", signUpStatus, new Callback() {
-            @Override
-            public Object parseNetworkResponse(Response response, int id) throws Exception {
-                return null;
-            }
-
-            @Override
-            public void onError(Call call, Exception e, int id) {
-
-            }
-
-            @Override
-            public void onResponse(Object response, int id) {
-
-            }
-        });
-    }
 }

app/src/main/java/com/ynstkz/shitu/android/adapter/MyPagerAdapter.java

@@ -0,0 +1,36 @@
+package com.ynstkz.shitu.android.adapter;
+
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/3/13 10:55
+ */
+
+public class MyPagerAdapter extends FragmentPagerAdapter{
+
+    private List<Fragment> fragmentList;
+
+    public MyPagerAdapter(List<Fragment> fragmentList, FragmentManager fragmentManager) {
+        super(fragmentManager);
+        this.fragmentList = fragmentList;
+    }
+
+    @Override
+    public int getCount() {
+        return fragmentList.size();
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        return fragmentList.get(position);
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return "";
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/bean/MineSignUpBean.java

@@ -0,0 +1,154 @@
+package com.ynstkz.shitu.android.bean;
+
+import com.ynstkz.shitu.android.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 作者：fuchangle on 2018/3/13 11:12
+ */
+
+public class MineSignUpBean extends BaseBean{
+
+
+    private DataBean data;
+
+    public DataBean getData() {
+        return data;
+    }
+
+    public void setData(DataBean data) {
+        this.data = data;
+    }
+
+    public static class DataBean implements Serializable{
+
+        private int offset;
+        private int limit;
+        private int total;
+        private int size;
+        private int pages;
+        private int current;
+        private boolean searchCount;
+        private boolean openSort;
+        private boolean optimizeCount;
+        private String orderByField;
+        private Object condition;
+        private int offsetCurrent;
+        private boolean asc;
+        private List<OrgItemBean> records;
+
+        public int getOffset() {
+            return offset;
+        }
+
+        public void setOffset(int offset) {
+            this.offset = offset;
+        }
+
+        public int getLimit() {
+            return limit;
+        }
+
+        public void setLimit(int limit) {
+            this.limit = limit;
+        }
+
+        public int getTotal() {
+            return total;
+        }
+
+        public void setTotal(int total) {
+            this.total = total;
+        }
+
+        public int getSize() {
+            return size;
+        }
+
+        public void setSize(int size) {
+            this.size = size;
+        }
+
+        public int getPages() {
+            return pages;
+        }
+
+        public void setPages(int pages) {
+            this.pages = pages;
+        }
+
+        public int getCurrent() {
+            return current;
+        }
+
+        public void setCurrent(int current) {
+            this.current = current;
+        }
+
+        public boolean isSearchCount() {
+            return searchCount;
+        }
+
+        public void setSearchCount(boolean searchCount) {
+            this.searchCount = searchCount;
+        }
+
+        public boolean isOpenSort() {
+            return openSort;
+        }
+
+        public void setOpenSort(boolean openSort) {
+            this.openSort = openSort;
+        }
+
+        public boolean isOptimizeCount() {
+            return optimizeCount;
+        }
+
+        public void setOptimizeCount(boolean optimizeCount) {
+            this.optimizeCount = optimizeCount;
+        }
+
+        public String getOrderByField() {
+            return orderByField;
+        }
+
+        public void setOrderByField(String orderByField) {
+            this.orderByField = orderByField;
+        }
+
+        public Object getCondition() {
+            return condition;
+        }
+
+        public void setCondition(Object condition) {
+            this.condition = condition;
+        }
+
+        public int getOffsetCurrent() {
+            return offsetCurrent;
+        }
+
+        public void setOffsetCurrent(int offsetCurrent) {
+            this.offsetCurrent = offsetCurrent;
+        }
+
+        public boolean isAsc() {
+            return asc;
+        }
+
+        public void setAsc(boolean asc) {
+            this.asc = asc;
+        }
+
+        public List<OrgItemBean> getRecords() {
+            return records;
+        }
+
+        public void setRecords(List<OrgItemBean> records) {
+            this.records = records;
+        }
+    }
+}

app/src/main/java/com/ynstkz/shitu/android/fragment/MineSignUpItemFragment.java

@@ -6,19 +6,93 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.common.library.okhttp.callback.Callback;
+import com.common.library.pulltorefresh.PullToRefreshListView;
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.BaseFragment;
+import com.ynstkz.shitu.android.data.RequestGroup;
+
+import butterknife.Bind;
+import butterknife.ButterKnife;
+import okhttp3.Call;
+import okhttp3.Response;
 
 /**
  * 作者：fuchangle on 2018/3/2 17:32
  */
 
-public class MineSignUpItemFragment extends BaseFragment{
+public class MineSignUpItemFragment extends BaseFragment {
+
+    public static final String STATUS_PASS = "pass";
+    public static final String STATUS_WAIT = "wait";
+    public static final String STATUS_BACK = "back";
+
+    @Bind(R.id.pullToRefresh)
+    PullToRefreshListView pullToRefresh;
+
+    private String status;
+    private int pageNumber;
 
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fm_minesignup_item, null);
+        ButterKnife.bind(this, view);
+        initView();
+        initData();
+        setListener();
         return view;
     }
+
+    private void initView(){
+
+    }
+
+    private void initData(){
+        pageNumber = 1;
+        getMineSignUp(pageNumber, status);
+    }
+
+    private void setListener(){
+
+    }
+
+    /**
+     * 我的报名
+     * @param pageNumber
+     * @param signUpStatus
+     */
+    private void getMineSignUp(int pageNumber, String signUpStatus){
+
+        RequestGroup.getMineSignup(pageNumber+"", signUpStatus, new Callback() {
+            @Override
+            public Object parseNetworkResponse(Response response, int id) throws Exception {
+                return null;
+            }
+
+            @Override
+            public void onError(Call call, Exception e, int id) {
+
+            }
+
+            @Override
+            public void onResponse(Object response, int id) {
+
+            }
+        });
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        ButterKnife.unbind(this);
+    }
 }

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

@@ -2,195 +2,203 @@
 <RelativeLayout 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/white">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/default_content_margin"
-        android:paddingTop="@dimen/default_content_margin"
-        android:paddingRight="@dimen/default_content_margin">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/iv_cancel"
-                android:layout_width="@dimen/company_20dp"
-                android:layout_height="@dimen/company_20dp"
-                android:src="@drawable/login_cancel_icon" />
-
-            <TextView
-                android:id="@+id/tv_register"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="注册"
-                android:textColor="@color/main_color"
-                android:textSize="@dimen/company_18sp" />
-
-        </RelativeLayout>
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/company_30dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingLeft="@dimen/default_content_margin"
+            android:paddingRight="@dimen/default_content_margin"
+            android:paddingTop="@dimen/default_content_margin">
 
-            <ImageView
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:src="@drawable/logo" />
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/company_6dp"
-                android:text="仕  途  网"
-                android:textColor="@color/main_color"
-                android:textSize="@dimen/company_18sp"
-                android:textStyle="bold" />
+                <ImageView
+                    android:id="@+id/iv_cancel"
+                    android:layout_width="@dimen/company_20dp"
+                    android:layout_height="@dimen/company_20dp"
+                    android:src="@drawable/login_cancel_icon" />
+
+                <TextView
+                    android:id="@+id/tv_register"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="注册"
+                    android:textColor="@color/main_color"
+                    android:textSize="@dimen/company_18sp" />
 
-        </LinearLayout>
+            </RelativeLayout>
 
-        <TextView
-            android:id="@+id/tv_phone_code_login"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/company_20dp"
-            android:gravity="right"
-            android:text="手机验证码登录"
-            android:textColor="@color/main_color"
-            android:textSize="@dimen/company_14sp" />
-
-        <EditText
-            android:id="@+id/edit_username"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/company_50dp"
-            android:layout_marginTop="@dimen/company_10dp"
-            android:background="@drawable/shapre_default_edit_bg"
-            android:hint="请输入用户名称/手机号/邮箱"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/company_14sp" />
-
-        <EditText
-            android:id="@+id/edit_password"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/company_50dp"
-            android:layout_marginTop="@dimen/company_20dp"
-            android:background="@drawable/shapre_default_edit_bg"
-            android:hint="请输入登陆密码"
-            android:inputType="textPassword"
-            android:maxLines="1"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/company_14sp" />
-
-        <TextView
-            android:id="@+id/tv_forget_pw"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/company_10dp"
-            android:gravity="right"
-            android:text="忘记密码"
-            android:textColor="@color/main_color"
-            android:textSize="@dimen/company_14sp" />
-
-        <Button
-            android:id="@+id/btn_login"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/company_50dp"
-            android:layout_marginTop="@dimen/company_20dp"
-            android:background="@drawable/shape_default_btn_bg"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/company_16sp" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_30dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
 
-    </LinearLayout>
+                <ImageView
+                    android:layout_width="62dp"
+                    android:layout_height="62dp"
+                    android:src="@drawable/logo" />
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/company_6dp"
+                    android:text="仕  途  网"
+                    android:textColor="@color/main_color"
+                    android:textSize="@dimen/company_18sp"
+                    android:textStyle="bold" />
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/company_20dp"
-            android:layout_marginRight="@dimen/company_20dp">
+            </LinearLayout>
 
             <TextView
+                android:id="@+id/tv_phone_code_login"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/company_1dp"
-                android:layout_gravity="center_vertical"
-                android:background="@color/main_color" />
-
-            <TextView
-                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:background="@color/white"
-                android:padding="@dimen/company_10dp"
-                android:paddingRight="@dimen/company_10dp"
-                android:text="第三方账户登录"
-                android:textColor="@color/main_color" />
-
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/company_10dp"
-            android:layout_marginBottom="@dimen/company_25dp">
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content">
-
-                <ImageView
-                    android:layout_width="@dimen/company_50dp"
-                    android:layout_height="@dimen/company_50dp"
-                    android:background="@drawable/weixin_icon"
-                    android:layout_centerInParent="true"/>
-
-            </RelativeLayout>
-
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content">
+                android:layout_marginTop="@dimen/company_20dp"
+                android:gravity="right"
+                android:text="手机验证码登录"
+                android:textColor="@color/main_color"
+                android:textSize="@dimen/company_14sp" />
 
-                <ImageView
-                    android:layout_width="@dimen/company_50dp"
-                    android:layout_height="@dimen/company_50dp"
-                    android:background="@drawable/qq_icon"
-                    android:layout_centerInParent="true"/>
+            <EditText
+                android:id="@+id/edit_username"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/company_50dp"
+                android:layout_marginTop="@dimen/company_10dp"
+                android:background="@drawable/shapre_default_edit_bg"
+                android:hint="请输入用户名称/手机号/邮箱"
+                android:maxLines="1"
+                android:singleLine="true"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/company_14sp" />
+
+            <EditText
+                android:id="@+id/edit_password"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/company_50dp"
+                android:layout_marginTop="@dimen/company_20dp"
+                android:background="@drawable/shapre_default_edit_bg"
+                android:hint="请输入登陆密码"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/company_14sp" />
 
-            </RelativeLayout>
+            <TextView
+                android:id="@+id/tv_forget_pw"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_10dp"
+                android:gravity="right"
+                android:text="忘记密码"
+                android:textColor="@color/main_color"
+                android:textSize="@dimen/company_14sp" />
 
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content">
+            <Button
+                android:id="@+id/btn_login"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/company_50dp"
+                android:layout_marginTop="@dimen/company_20dp"
+                android:background="@drawable/shape_default_btn_bg"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/company_16sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginTop="@dimen/company_50dp">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/company_20dp"
+                    android:layout_marginRight="@dimen/company_20dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/company_1dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@color/main_color" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:background="@color/white"
+                        android:padding="@dimen/company_10dp"
+                        android:paddingRight="@dimen/company_10dp"
+                        android:text="第三方账户登录"
+                        android:textColor="@color/main_color" />
+
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/company_25dp"
+                    android:layout_marginTop="@dimen/company_10dp"
+                    android:orientation="horizontal">
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="@dimen/company_50dp"
+                            android:layout_height="@dimen/company_50dp"
+                            android:layout_centerInParent="true"
+                            android:background="@drawable/weixin_icon" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="@dimen/company_50dp"
+                            android:layout_height="@dimen/company_50dp"
+                            android:layout_centerInParent="true"
+                            android:background="@drawable/qq_icon" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="@dimen/company_50dp"
+                            android:layout_height="@dimen/company_50dp"
+                            android:layout_centerInParent="true"
+                            android:background="@drawable/weibo_icon" />
+
+                    </RelativeLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
 
-                <ImageView
-                    android:layout_width="@dimen/company_50dp"
-                    android:layout_height="@dimen/company_50dp"
-                    android:background="@drawable/weibo_icon"
-                    android:layout_centerInParent="true"/>
+        </LinearLayout>
 
-            </RelativeLayout>
 
-        </LinearLayout>
+    </ScrollView>
 
-    </LinearLayout>
 
 </RelativeLayout>

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

@@ -2,194 +2,200 @@
 <RelativeLayout 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/white">
+    android:background="@color/white"
+    android:orientation="vertical">
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/default_content_margin"
-        android:paddingTop="@dimen/default_content_margin"
-        android:paddingRight="@dimen/default_content_margin">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/iv_cancel"
-                android:layout_width="@dimen/company_20dp"
-                android:layout_height="@dimen/company_20dp"
-                android:src="@drawable/login_cancel_icon" />
-
-            <TextView
-                android:id="@+id/tv_register"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:text="注册"
-                android:textColor="@color/main_color"
-                android:textSize="@dimen/company_18sp" />
-
-        </RelativeLayout>
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/company_30dp"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="62dp"
-                android:layout_height="62dp"
-                android:src="@drawable/logo" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/company_6dp"
-                android:text="仕  途  网"
-                android:textColor="@color/main_color"
-                android:textSize="@dimen/company_18sp"
-                android:textStyle="bold" />
-
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_login"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/company_20dp"
-            android:gravity="right"
-            android:text="普通方式登录"
-            android:textColor="@color/main_color"
-            android:textSize="@dimen/company_14sp" />
-
-        <EditText
-            android:id="@+id/edit_username"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/company_50dp"
-            android:layout_marginTop="@dimen/company_10dp"
-            android:background="@drawable/shapre_default_edit_bg"
-            android:hint="请输入用户名称/手机号/邮箱"
-            android:maxLines="1"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/company_14sp" />
-
-        <EditText
-            android:id="@+id/edit_verification_code"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/company_50dp"
-            android:layout_marginTop="@dimen/company_20dp"
-            android:background="@drawable/shapre_default_edit_bg"
-            android:hint="请输入验证码"
-            android:inputType="textPassword"
-            android:maxLines="1"
-            android:textCursorDrawable="@null"
-            android:textSize="@dimen/company_14sp" />
-
-        <TextView
-            android:id="@+id/tv_forget_pw"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/company_10dp"
-            android:gravity="right"
-            android:text="忘记密码"
-            android:textColor="@color/main_color"
-            android:textSize="@dimen/company_14sp" />
-
-        <Button
-            android:id="@+id/btn_login"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/company_50dp"
-            android:layout_marginTop="@dimen/company_20dp"
-            android:background="@drawable/shape_default_btn_bg"
-            android:text="登录"
-            android:textColor="@color/white"
-            android:textSize="@dimen/company_16sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/company_20dp"
-            android:layout_marginRight="@dimen/company_20dp">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/company_1dp"
-                android:layout_gravity="center_vertical"
-                android:background="@color/main_color" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:background="@color/white"
-                android:padding="@dimen/company_10dp"
-                android:paddingRight="@dimen/company_10dp"
-                android:text="第三方账户登录"
-                android:textColor="@color/main_color" />
-
-        </FrameLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_marginTop="@dimen/company_10dp"
-            android:layout_marginBottom="@dimen/company_25dp">
+            android:orientation="vertical"
+            android:paddingLeft="@dimen/default_content_margin"
+            android:paddingRight="@dimen/default_content_margin"
+            android:paddingTop="@dimen/default_content_margin">
 
             <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <ImageView
-                    android:layout_width="@dimen/company_50dp"
-                    android:layout_height="@dimen/company_50dp"
-                    android:background="@drawable/weixin_icon"
-                    android:layout_centerInParent="true"/>
+                    android:id="@+id/iv_cancel"
+                    android:layout_width="@dimen/company_20dp"
+                    android:layout_height="@dimen/company_20dp"
+                    android:src="@drawable/login_cancel_icon" />
+
+                <TextView
+                    android:id="@+id/tv_register"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:text="注册"
+                    android:textColor="@color/main_color"
+                    android:textSize="@dimen/company_18sp" />
 
             </RelativeLayout>
 
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_30dp"
+                android:gravity="center_horizontal"
+                android:orientation="vertical">
 
                 <ImageView
-                    android:layout_width="@dimen/company_50dp"
-                    android:layout_height="@dimen/company_50dp"
-                    android:background="@drawable/qq_icon"
-                    android:layout_centerInParent="true"/>
+                    android:layout_width="62dp"
+                    android:layout_height="62dp"
+                    android:src="@drawable/logo" />
 
-            </RelativeLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/company_6dp"
+                    android:text="仕  途  网"
+                    android:textColor="@color/main_color"
+                    android:textSize="@dimen/company_18sp"
+                    android:textStyle="bold" />
 
-            <RelativeLayout
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content">
+            </LinearLayout>
 
-                <ImageView
-                    android:layout_width="@dimen/company_50dp"
-                    android:layout_height="@dimen/company_50dp"
-                    android:background="@drawable/weibo_icon"
-                    android:layout_centerInParent="true"/>
+            <TextView
+                android:id="@+id/tv_login"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_20dp"
+                android:gravity="right"
+                android:text="普通方式登录"
+                android:textColor="@color/main_color"
+                android:textSize="@dimen/company_14sp" />
 
-            </RelativeLayout>
+            <EditText
+                android:id="@+id/edit_username"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/company_50dp"
+                android:layout_marginTop="@dimen/company_10dp"
+                android:background="@drawable/shapre_default_edit_bg"
+                android:hint="请输入用户名称/手机号/邮箱"
+                android:maxLines="1"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/company_14sp" />
+
+            <EditText
+                android:id="@+id/edit_verification_code"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/company_50dp"
+                android:layout_marginTop="@dimen/company_20dp"
+                android:background="@drawable/shapre_default_edit_bg"
+                android:hint="请输入验证码"
+                android:inputType="textPassword"
+                android:maxLines="1"
+                android:textCursorDrawable="@null"
+                android:textSize="@dimen/company_14sp" />
+
+            <TextView
+                android:id="@+id/tv_forget_pw"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_10dp"
+                android:gravity="right"
+                android:text="忘记密码"
+                android:textColor="@color/main_color"
+                android:textSize="@dimen/company_14sp" />
+
+            <Button
+                android:id="@+id/btn_login"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/company_50dp"
+                android:layout_marginTop="@dimen/company_20dp"
+                android:background="@drawable/shape_default_btn_bg"
+                android:text="登录"
+                android:textColor="@color/white"
+                android:textSize="@dimen/company_16sp" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/company_50dp"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/company_20dp"
+                    android:layout_marginRight="@dimen/company_20dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/company_1dp"
+                        android:layout_gravity="center_vertical"
+                        android:background="@color/main_color" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:background="@color/white"
+                        android:padding="@dimen/company_10dp"
+                        android:paddingRight="@dimen/company_10dp"
+                        android:text="第三方账户登录"
+                        android:textColor="@color/main_color" />
+
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/company_25dp"
+                    android:layout_marginTop="@dimen/company_10dp"
+                    android:orientation="horizontal">
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="@dimen/company_50dp"
+                            android:layout_height="@dimen/company_50dp"
+                            android:layout_centerInParent="true"
+                            android:background="@drawable/weixin_icon" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="@dimen/company_50dp"
+                            android:layout_height="@dimen/company_50dp"
+                            android:layout_centerInParent="true"
+                            android:background="@drawable/qq_icon" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1">
+
+                        <ImageView
+                            android:layout_width="@dimen/company_50dp"
+                            android:layout_height="@dimen/company_50dp"
+                            android:layout_centerInParent="true"
+                            android:background="@drawable/weibo_icon" />
+
+                    </RelativeLayout>
+
+                </LinearLayout>
+
+            </LinearLayout>
 
         </LinearLayout>
 
-    </LinearLayout>
+    </ScrollView>
 
 </RelativeLayout>

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

@@ -3,4 +3,9 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.common.library.pulltorefresh.PullToRefreshListView
+        android:id="@+id/pullToRefresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
 </LinearLayout>