316044749 7 роки тому
батько
коміт
7bdda4f0a2

+ 6 - 0
app/src/main/java/com/ynstkz/shitu/android/activity/LoginActivity.java

@@ -1,7 +1,10 @@
 package com.ynstkz.shitu.android.activity;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.view.View;
 
 import com.ynstkz.shitu.android.R;
 import com.ynstkz.shitu.android.base.TitleBarActivity;
@@ -17,6 +20,9 @@ public class LoginActivity extends TitleBarActivity{
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil.setTransparent(this);
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+            setStatusBarColor(this, View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+        }
     }
 
     @Override

+ 19 - 0
app/src/main/java/com/ynstkz/shitu/android/base/BaseActivity.java

@@ -1,9 +1,13 @@
 package com.ynstkz.shitu.android.base;
 
+import android.annotation.TargetApi;
+import android.app.Activity;
 import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.view.View;
 
 import com.common.library.base.LibBaseActivity;
 import com.muddzdev.styleabletoastlibrary.StyleableToast;
@@ -18,6 +22,7 @@ public class BaseActivity extends LibBaseActivity{
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setStatusBarColor(this);
     }
 
     protected void showToast(String content){
@@ -32,4 +37,18 @@ public class BaseActivity extends LibBaseActivity{
     protected boolean isLogin(){
         return SharedPreferencesUtils.isLogin();
     }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    public static void setStatusBarColor(Activity activity) {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+            activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_VISIBLE);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
+    public static void setStatusBarColor(Activity activity, int flag) {
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){
+            activity.getWindow().getDecorView().setSystemUiVisibility(flag);
+        }
+    }
 }

BIN
app/src/main/res/drawable-xxhdpi/login_cancel_icon.png


BIN
app/src/main/res/drawable-xxhdpi/logo.png


+ 5 - 0
app/src/main/res/drawable/color_cursor.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <size android:width="2dp" />
+    <solid android:color="@color/main_color"  />
+</shape>

BIN
app/src/main/res/drawable/qq_icon.png


+ 19 - 0
app/src/main/res/drawable/shape_default_btn_bg.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- 填充的颜色 -->
+
+    <solid android:color="@color/main_color" />
+
+    <!-- 设置边框宽度 -->
+    <!--<stroke android:width="1dp" android:color="#999999"/>-->
+
+    <!-- 四个角的弧度 -->
+    <corners
+        android:bottomLeftRadius="50dp"
+        android:bottomRightRadius="50dp"
+        android:topLeftRadius="50dp"
+        android:topRightRadius="50dp" />
+    <!-- padding:TextView里面的文字与TextView边界的间隔 -->
+
+</shape>

+ 22 - 0
app/src/main/res/drawable/shapre_default_edit_bg.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- 设置边框宽度 -->
+    <stroke android:width="1dp" android:color="#F0F0F0"/>
+
+    <!-- 四个角的弧度 -->
+    <corners
+        android:bottomLeftRadius="50dp"
+        android:bottomRightRadius="50dp"
+        android:topLeftRadius="50dp"
+        android:topRightRadius="50dp" />
+    <!-- padding:TextView里面的文字与TextView边界的间隔 -->
+
+    <padding
+        android:bottom="5dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="5dp" />
+    <!-- <size android:width="100dp" android:height="45dp"/> -->
+
+</shape>

BIN
app/src/main/res/drawable/weibo_icon.png


BIN
app/src/main/res/drawable/weixin_icon.png


+ 194 - 4
app/src/main/res/layout/activity_login.xml

@@ -1,6 +1,196 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+<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">
 
-</LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingLeft="@dimen/company_15dp"
+        android:paddingTop="@dimen/company_15dp"
+        android:paddingRight="@dimen/company_15dp">
+
+
+        <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>
+
+        <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_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: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_20dp"
+            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">
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:layout_width="@dimen/company_60dp"
+                    android:layout_height="@dimen/company_60dp"
+                    android:background="@drawable/weixin_icon"
+                    android:layout_centerInParent="true"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:layout_width="@dimen/company_60dp"
+                    android:layout_height="@dimen/company_60dp"
+                    android:background="@drawable/qq_icon"
+                    android:layout_centerInParent="true"/>
+
+            </RelativeLayout>
+
+            <RelativeLayout
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content">
+
+                <ImageView
+                    android:layout_width="@dimen/company_60dp"
+                    android:layout_height="@dimen/company_60dp"
+                    android:background="@drawable/weibo_icon"
+                    android:layout_centerInParent="true"/>
+
+            </RelativeLayout>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</RelativeLayout>

+ 2 - 1
app/src/main/res/values/dimens.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="titlebar_height">50dp</dimen>
-    <dimen name="lab_size">30dp</dimen>
+    <dimen name="lab_size">25dp</dimen>
+    <dimen name="default_padding">15dp</dimen>
 </resources>