Skip to content

S
ShenghuoquanBusiness
Commit fd712ce7 authored by zhenghongbin's avatar zhenghongbin
Browse files
Options

add 登录页面部分UI

parent f37b326e
Show whitespace changes
Inline Side-by-side
Showing with 127 additions and 81 deletions
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt
View file @ fd712ce7
...@@ -6,11 +6,13 @@ import android.os.Bundle ...@@ -6,11 +6,13 @@ import android.os.Bundle
import com.orhanobut.hawk.Hawk import com.orhanobut.hawk.Hawk
import com.tbruyelle.rxpermissions3.RxPermissions import com.tbruyelle.rxpermissions3.RxPermissions
import com.yidian.common.HawkConfig import com.yidian.common.HawkConfig
import com.yidian.common.XRouterPathConstants
import com.yidian.common.XRouterPathConstants.Companion.FLASH import com.yidian.common.XRouterPathConstants.Companion.FLASH
import com.yidian.common.base.BaseActivity import com.yidian.common.base.BaseActivity
import com.yidian.shenghuoquan.newscontent.R import com.yidian.shenghuoquan.newscontent.R
import com.yidian.shenghuoquan.newscontent.databinding.ActivityFlashBinding import com.yidian.shenghuoquan.newscontent.databinding.ActivityFlashBinding
import com.yidian.utils.ToastUtil import com.yidian.utils.ToastUtil
import com.yidian.xpage.XPageManager
class FlashActivity: BaseActivity<ActivityFlashBinding>() { class FlashActivity: BaseActivity<ActivityFlashBinding>() {
...@@ -40,8 +42,8 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() { ...@@ -40,8 +42,8 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() {
val isAgree = Hawk.get<Boolean>(HawkConfig.ProtocolIsAgree, false) val isAgree = Hawk.get<Boolean>(HawkConfig.ProtocolIsAgree, false)
if(isAgree){ if(isAgree){
viewBind.clRoot.postDelayed({ viewBind.clRoot.postDelayed({
// XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, paramsMap) XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
startActivity(Intent(this@FlashActivity, TempListActivity::class.java)) // startActivity(Intent(this@FlashActivity, TempListActivity::class.java))
}, 2000) }, 2000)
} }
} }
...@@ -54,8 +56,8 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() { ...@@ -54,8 +56,8 @@ class FlashActivity: BaseActivity<ActivityFlashBinding>() {
) )
.subscribe { .subscribe {
if (it) { if (it) {
XPageManager.push(XRouterPathConstants.LOGIN_LIFE_CIRCLE, null)
startActivity(Intent(this@FlashActivity, TempListActivity::class.java)) // startActivity(Intent(this@FlashActivity, TempListActivity::class.java))
finish() finish()
} else { } else {
ToastUtil.showToast(this, "请在设置里同意读取存储卡权限") ToastUtil.showToast(this, "请在设置里同意读取存储卡权限")
......
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/LoginLifeCircleActivity.kt
View file @ fd712ce7
...@@ -32,17 +32,17 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() { ...@@ -32,17 +32,17 @@ class LoginLifeCircleActivity : BaseActivity<ActivityLoginBinding>() {
} }
private fun initView() { private fun initView() {
mCountDownTimerUtils = CountDownTimerUtils(viewBind.getBtn, 60000, 1000) // mCountDownTimerUtils = CountDownTimerUtils(viewBind.getBtn, 60000, 1000)
} }
private fun setOnListener() { private fun setOnListener() {
viewBind.getBtn.setOnClickListener { // viewBind.getBtn.setOnClickListener {
mCountDownTimerUtils.start() // mCountDownTimerUtils.start()
} // }
viewBind.loginBtn.setOnClickListener { // viewBind.loginBtn.setOnClickListener {
// startActivity(Intent(this@LoginLifeCircleActivity, IDCardTestActivity::class.java)) // startActivity(Intent(this@LoginLifeCircleActivity, IDCardTestActivity::class.java))
startActivity(Intent(this@LoginLifeCircleActivity, AliveTestActivity::class.java)) // startActivity(Intent(this@LoginLifeCircleActivity, AliveTestActivity::class.java))
} // }
} }
} }
\ No newline at end of file
Components/newscontent/src/main/res/layout/activity_login.xml
View file @ fd712ce7
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
...@@ -8,105 +9,147 @@ ...@@ -8,105 +9,147 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="130dp" android:layout_marginTop="99dp"
android:text="加入生活圈升级为生活号" /> android:textSize="28sp"
android:textColor="#333333"
<TextView android:text="欢迎入驻生活圈商家版"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="30dp"
android:text="为你提供更多更优的服务"
android:textSize="24sp" />
<LinearLayout <LinearLayout
android:layout_width="260dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp"
android:layout_gravity="center" android:layout_marginTop="10dp"
android:layout_marginTop="60dp" android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="手机号" android:textSize="16sp"
android:textSize="18sp" /> android:textColor="#333333"
android:layout_gravity="center_vertical"
android:text="手机号"/>
<EditText <EditText
android:id="@+id/phone_number_edit" android:id="@+id/et_mobileNo"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginStart="40dp" android:layout_marginStart="17dp"
android:gravity="center_vertical"
android:background="@null" android:background="@null"
android:inputType="number" android:inputType="number"
android:text="13888888888" android:textColor="#333333"
android:textColor="#555555" android:textSize="16sp"
android:textSize="18sp"></EditText> tools:ignore="TextFields"
android:hint="请输入"/>
</LinearLayout> </LinearLayout>
<View <View
android:layout_width="260dp" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="2dp"
android:layout_gravity="center" android:layout_marginStart="40dp"
android:layout_marginTop="15dp" android:layout_marginEnd="40dp"
android:background="#989998" /> android:background="#f2f2f2"/>
<LinearLayout <RelativeLayout
android:layout_width="260dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="60dp"
android:layout_gravity="center" android:layout_marginStart="40dp"
android:layout_marginTop="60dp" android:layout_marginEnd="40dp">
android:orientation="horizontal">
<TextView <TextView
android:id="@+id/tv_codeShow"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="验证码" android:textSize="16sp"
android:textSize="18sp" /> android:textColor="#333333"
android:layout_centerVertical="true"
android:text="验证码"/>
<EditText <TextView
android:id="@+id/number_edit" android:id="@+id/tv_getCode"
android:layout_width="wrap_content" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="40dp" android:textSize="14sp"
android:textColor="#1852f1"
android:gravity="end"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:text="获取验证码"/>
<EditText
android:id="@+id/et_code"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_toEndOf="@id/tv_codeShow"
android:layout_toStartOf="@id/tv_getCode"
android:layout_marginStart="17dp"
android:layout_marginEnd="20dp"
android:gravity="center_vertical"
android:background="@null" android:background="@null"
android:text="3f9k" android:inputType="number"
android:textColor="#555555" android:maxLength="6"
android:textSize="18sp" /> android:textColor="#333333"
android:textSize="16sp"
tools:ignore="TextFields"
android:hint="请输入"/>
</RelativeLayout>
<View <View
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="2dp"
android:layout_weight="1" /> android:layout_marginStart="40dp"
android:layout_marginEnd="40dp"
android:background="#f2f2f2"/>
<TextView <TextView
android:id="@+id/get_btn" android:id="@+id/btn_login"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="44dp"
android:text="获取验证码" /> android:layout_marginStart="40dp"
</LinearLayout> android:layout_marginEnd="40dp"
android:layout_marginTop="20dp"
android:gravity="center"
android:textSize="18sp"
android:textColor="@color/white"
android:text="登 录" />
<View <LinearLayout
android:layout_width="260dp" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="16dp"
android:layout_gravity="center" android:layout_marginTop="20dp"
android:layout_marginTop="15dp" android:gravity="center"
android:background="#989998" /> android:orientation="horizontal">
<CheckBox
android:layout_width="25dp"
android:layout_height="25dp" />
<Button <TextView
android:id="@+id/login_btn" android:layout_width="wrap_content"
android:layout_width="200dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginStart="8dp"
android:layout_marginTop="50dp" android:textSize="14sp"
android:text="登录" /> android:textColor="#999999"
android:text="我同意"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:textColor="#1852f1"
android:text="《用户协议》"/>
<TextView <TextView
android:layout_width="290dp" android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="150dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="未注册生活圈的手机号，登录时将自动注册，且代表你已经同意《用户协议》《隐私政策》"/> android:textSize="14sp"
android:textColor="#1852f1"
android:text="《隐私政策》"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
config/config.gradle
View file @ fd712ce7
...@@ -30,6 +30,7 @@ ext.dependencies = [ ...@@ -30,6 +30,7 @@ ext.dependencies = [
'id.zelory:compressor:3.0.0', 'id.zelory:compressor:3.0.0',
'com.yidian.ftcomponents:ftdevicefinger:0.0.7', 'com.yidian.ftcomponents:ftdevicefinger:0.0.7',
'com.yidian.pmcomponents:appupdate:0.0.7', 'com.yidian.pmcomponents:appupdate:0.0.7',
'com.yidian.xpage:xpagenative:0.0.1',
'com.umeng.umsdk:common:9.3.8', 'com.umeng.umsdk:common:9.3.8',
'com.umeng.umsdk:asms:1.2.2', 'com.umeng.umsdk:asms:1.2.2',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment