diff --git a/app/src/main/java/com/casic/br/app/view/MainActivity.kt b/app/src/main/java/com/casic/br/app/view/MainActivity.kt index 9dc1a12..d39359b 100644 --- a/app/src/main/java/com/casic/br/app/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/MainActivity.kt @@ -1,19 +1,35 @@ package com.casic.br.app.view import android.os.Bundle +import android.util.Log import android.view.KeyEvent import com.casic.br.app.R import com.casic.br.app.databinding.ActivityMainBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.utils.LocaleConstant import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.SaveKeyValues class MainActivity : KotlinBaseActivity() { + private val kTag = "MainActivity" private var clickTime: Long = 0 override fun initEvent() { + binding.qrcodeView.setOnClickListener { + val userName = SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String + val password = SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String + + val map = HashMap() + map["userName"] = userName + map["password"] = password + + Log.d(kTag, map.toJson()) + } + binding.startCheckButton.setOnClickListener { navigatePageTo() } @@ -40,7 +56,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.rootView.initImmersionBar(this, true, R.color.white) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/java/com/casic/br/app/view/MainActivity.kt b/app/src/main/java/com/casic/br/app/view/MainActivity.kt index 9dc1a12..d39359b 100644 --- a/app/src/main/java/com/casic/br/app/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/MainActivity.kt @@ -1,19 +1,35 @@ package com.casic.br.app.view import android.os.Bundle +import android.util.Log import android.view.KeyEvent import com.casic.br.app.R import com.casic.br.app.databinding.ActivityMainBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.utils.LocaleConstant import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.SaveKeyValues class MainActivity : KotlinBaseActivity() { + private val kTag = "MainActivity" private var clickTime: Long = 0 override fun initEvent() { + binding.qrcodeView.setOnClickListener { + val userName = SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String + val password = SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String + + val map = HashMap() + map["userName"] = userName + map["password"] = password + + Log.d(kTag, map.toJson()) + } + binding.startCheckButton.setOnClickListener { navigatePageTo() } @@ -40,7 +56,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.rootView.initImmersionBar(this, true, R.color.white) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml index 65c8a32..731982b 100644 --- a/app/src/main/res/drawable/button_main_selector.xml +++ b/app/src/main/res/drawable/button_main_selector.xml @@ -3,15 +3,14 @@ - - - + + - + diff --git a/app/src/main/java/com/casic/br/app/view/MainActivity.kt b/app/src/main/java/com/casic/br/app/view/MainActivity.kt index 9dc1a12..d39359b 100644 --- a/app/src/main/java/com/casic/br/app/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/MainActivity.kt @@ -1,19 +1,35 @@ package com.casic.br.app.view import android.os.Bundle +import android.util.Log import android.view.KeyEvent import com.casic.br.app.R import com.casic.br.app.databinding.ActivityMainBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.utils.LocaleConstant import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.SaveKeyValues class MainActivity : KotlinBaseActivity() { + private val kTag = "MainActivity" private var clickTime: Long = 0 override fun initEvent() { + binding.qrcodeView.setOnClickListener { + val userName = SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String + val password = SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String + + val map = HashMap() + map["userName"] = userName + map["password"] = password + + Log.d(kTag, map.toJson()) + } + binding.startCheckButton.setOnClickListener { navigatePageTo() } @@ -40,7 +56,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.rootView.initImmersionBar(this, true, R.color.white) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml index 65c8a32..731982b 100644 --- a/app/src/main/res/drawable/button_main_selector.xml +++ b/app/src/main/res/drawable/button_main_selector.xml @@ -3,15 +3,14 @@ - - - + + - + diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml new file mode 100644 index 0000000..2a70cc6 --- /dev/null +++ b/app/src/main/res/drawable/ic_qr_code.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/java/com/casic/br/app/view/MainActivity.kt b/app/src/main/java/com/casic/br/app/view/MainActivity.kt index 9dc1a12..d39359b 100644 --- a/app/src/main/java/com/casic/br/app/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/MainActivity.kt @@ -1,19 +1,35 @@ package com.casic.br.app.view import android.os.Bundle +import android.util.Log import android.view.KeyEvent import com.casic.br.app.R import com.casic.br.app.databinding.ActivityMainBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.utils.LocaleConstant import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.extensions.toJson +import com.pengxh.kt.lite.utils.SaveKeyValues class MainActivity : KotlinBaseActivity() { + private val kTag = "MainActivity" private var clickTime: Long = 0 override fun initEvent() { + binding.qrcodeView.setOnClickListener { + val userName = SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String + val password = SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String + + val map = HashMap() + map["userName"] = userName + map["password"] = password + + Log.d(kTag, map.toJson()) + } + binding.startCheckButton.setOnClickListener { navigatePageTo() } @@ -40,7 +56,7 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) + binding.rootView.initImmersionBar(this, true, R.color.white) } override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean { diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml index 65c8a32..731982b 100644 --- a/app/src/main/res/drawable/button_main_selector.xml +++ b/app/src/main/res/drawable/button_main_selector.xml @@ -3,15 +3,14 @@ - - - + + - + diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml new file mode 100644 index 0000000..2a70cc6 --- /dev/null +++ b/app/src/main/res/drawable/ic_qr_code.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 66e3408..255def5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,58 +1,112 @@ - - + android:background="@mipmap/login" + android:orientation="vertical"> -