Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2

zhujie

9 天以前 acb5be78c07b8499d0a38515b05a4982207c1c9a

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

@@ -43,7 +43,6 @@
            android:layout_height="wrap_content"
            android:background="@null"
            android:hint="请输入手机号"
            android:text="17712345678"
            android:inputType="phone"
            android:maxLength="11"
            android:textSize="16sp"
@@ -67,7 +66,7 @@
                android:layout_weight="1"
                android:background="@null"
                android:hint="请输入验证码"
                android:text="888888"
                android:text=""
                android:inputType="number"
                android:maxLength="6"
                android:textSize="16sp"
@@ -86,6 +85,30 @@
            android:layout_width="match_parent"
            android:layout_height="1dp"
            android:background="#EEEEEE" />
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
            android:layout_marginTop="16dp">

            <EditText
                android:id="@+id/etInvite"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@null"
                android:hint="邀请码(选填)"
                android:inputType="textVisiblePassword"
                android:maxLength="11"
                android:textSize="16sp"
                android:padding="12dp"/>


        </LinearLayout>

        <View
            android:layout_width="match_parent"
            android:layout_height="1dp"
            android:background="#EEEEEE" />
    </LinearLayout>

    <Button