diff --git a/app/build.gradle b/app/build.gradle
index 3d348bc..d06bb2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,4 +122,6 @@
implementation 'top.zibin:Luban:1.1.8'
//高德导航、定位、地图三合一
implementation 'com.amap.api:navi-3dmap:latest.integration'
+ //生成二维码
+ implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2'
}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3d348bc..d06bb2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,4 +122,6 @@
implementation 'top.zibin:Luban:1.1.8'
//高德导航、定位、地图三合一
implementation 'com.amap.api:navi-3dmap:latest.integration'
+ //生成二维码
+ implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0950ef9..41f40ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,9 +32,11 @@
-
+
+
-
+
+
() {
@@ -20,14 +16,7 @@
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())
+ navigatePageTo()
}
binding.startCheckButton.setOnClickListener {
diff --git a/app/build.gradle b/app/build.gradle
index 3d348bc..d06bb2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,4 +122,6 @@
implementation 'top.zibin:Luban:1.1.8'
//高德导航、定位、地图三合一
implementation 'com.amap.api:navi-3dmap:latest.integration'
+ //生成二维码
+ implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0950ef9..41f40ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,9 +32,11 @@
-
+
+
() {
@@ -20,14 +16,7 @@
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())
+ navigatePageTo()
}
binding.startCheckButton.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
new file mode 100644
index 0000000..9a55a59
--- /dev/null
+++ b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
@@ -0,0 +1,43 @@
+package com.casic.br.app.view
+
+import android.os.Bundle
+import cn.bertsir.zbar.utils.QRUtils
+import com.casic.br.app.R
+import com.casic.br.app.databinding.ActivityQrCodeBinding
+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.toJson
+import com.pengxh.kt.lite.utils.SaveKeyValues
+
+
+class QrCodeActivity : KotlinBaseActivity() {
+ override fun initEvent() {
+ binding.leftBackView.setOnClickListener { finish() }
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ 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
+
+ val codeValue = map.toJson()
+ val qrCode = QRUtils.getInstance().createQRCode(codeValue)
+ binding.imageView.setImageBitmap(qrCode)
+ }
+
+ override fun initViewBinding(): ActivityQrCodeBinding {
+ return ActivityQrCodeBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ binding.rootView.initImmersionBar(this, true, R.color.white)
+ }
+}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3d348bc..d06bb2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,4 +122,6 @@
implementation 'top.zibin:Luban:1.1.8'
//高德导航、定位、地图三合一
implementation 'com.amap.api:navi-3dmap:latest.integration'
+ //生成二维码
+ implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0950ef9..41f40ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,9 +32,11 @@
-
+
+
() {
@@ -20,14 +16,7 @@
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())
+ navigatePageTo()
}
binding.startCheckButton.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
new file mode 100644
index 0000000..9a55a59
--- /dev/null
+++ b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
@@ -0,0 +1,43 @@
+package com.casic.br.app.view
+
+import android.os.Bundle
+import cn.bertsir.zbar.utils.QRUtils
+import com.casic.br.app.R
+import com.casic.br.app.databinding.ActivityQrCodeBinding
+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.toJson
+import com.pengxh.kt.lite.utils.SaveKeyValues
+
+
+class QrCodeActivity : KotlinBaseActivity() {
+ override fun initEvent() {
+ binding.leftBackView.setOnClickListener { finish() }
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ 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
+
+ val codeValue = map.toJson()
+ val qrCode = QRUtils.getInstance().createQRCode(codeValue)
+ binding.imageView.setImageBitmap(qrCode)
+ }
+
+ override fun initViewBinding(): ActivityQrCodeBinding {
+ return ActivityQrCodeBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ binding.rootView.initImmersionBar(this, true, R.color.white)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index fe2dd30..ece8881 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -3,14 +3,14 @@
-
-
+
-
-
+
diff --git a/app/build.gradle b/app/build.gradle
index 3d348bc..d06bb2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,4 +122,6 @@
implementation 'top.zibin:Luban:1.1.8'
//高德导航、定位、地图三合一
implementation 'com.amap.api:navi-3dmap:latest.integration'
+ //生成二维码
+ implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0950ef9..41f40ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,9 +32,11 @@
-
+
+
() {
@@ -20,14 +16,7 @@
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())
+ navigatePageTo()
}
binding.startCheckButton.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
new file mode 100644
index 0000000..9a55a59
--- /dev/null
+++ b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
@@ -0,0 +1,43 @@
+package com.casic.br.app.view
+
+import android.os.Bundle
+import cn.bertsir.zbar.utils.QRUtils
+import com.casic.br.app.R
+import com.casic.br.app.databinding.ActivityQrCodeBinding
+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.toJson
+import com.pengxh.kt.lite.utils.SaveKeyValues
+
+
+class QrCodeActivity : KotlinBaseActivity() {
+ override fun initEvent() {
+ binding.leftBackView.setOnClickListener { finish() }
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ 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
+
+ val codeValue = map.toJson()
+ val qrCode = QRUtils.getInstance().createQRCode(codeValue)
+ binding.imageView.setImageBitmap(qrCode)
+ }
+
+ override fun initViewBinding(): ActivityQrCodeBinding {
+ return ActivityQrCodeBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ binding.rootView.initImmersionBar(this, true, R.color.white)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index fe2dd30..ece8881 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -3,14 +3,14 @@
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/activity_qr_code.xml b/app/src/main/res/layout/activity_qr_code.xml
new file mode 100644
index 0000000..84d7f19
--- /dev/null
+++ b/app/src/main/res/layout/activity_qr_code.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 3d348bc..d06bb2e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -122,4 +122,6 @@
implementation 'top.zibin:Luban:1.1.8'
//高德导航、定位、地图三合一
implementation 'com.amap.api:navi-3dmap:latest.integration'
+ //生成二维码
+ implementation 'cn.bertsir.zbarLibary:zbarlibary:1.4.2'
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0950ef9..41f40ba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,9 +32,11 @@
-
+
+
() {
@@ -20,14 +16,7 @@
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())
+ navigatePageTo()
}
binding.startCheckButton.setOnClickListener {
diff --git a/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
new file mode 100644
index 0000000..9a55a59
--- /dev/null
+++ b/app/src/main/java/com/casic/br/app/view/QrCodeActivity.kt
@@ -0,0 +1,43 @@
+package com.casic.br.app.view
+
+import android.os.Bundle
+import cn.bertsir.zbar.utils.QRUtils
+import com.casic.br.app.R
+import com.casic.br.app.databinding.ActivityQrCodeBinding
+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.toJson
+import com.pengxh.kt.lite.utils.SaveKeyValues
+
+
+class QrCodeActivity : KotlinBaseActivity() {
+ override fun initEvent() {
+ binding.leftBackView.setOnClickListener { finish() }
+ }
+
+ override fun initOnCreate(savedInstanceState: Bundle?) {
+ 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
+
+ val codeValue = map.toJson()
+ val qrCode = QRUtils.getInstance().createQRCode(codeValue)
+ binding.imageView.setImageBitmap(qrCode)
+ }
+
+ override fun initViewBinding(): ActivityQrCodeBinding {
+ return ActivityQrCodeBinding.inflate(layoutInflater)
+ }
+
+ override fun observeRequestState() {
+
+ }
+
+ override fun setupTopBarLayout() {
+ binding.rootView.initImmersionBar(this, true, R.color.white)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_login_selector.xml b/app/src/main/res/drawable/button_login_selector.xml
index fe2dd30..ece8881 100644
--- a/app/src/main/res/drawable/button_login_selector.xml
+++ b/app/src/main/res/drawable/button_login_selector.xml
@@ -3,14 +3,14 @@
-
-
+
-
-
+
diff --git a/app/src/main/res/layout/activity_qr_code.xml b/app/src/main/res/layout/activity_qr_code.xml
new file mode 100644
index 0000000..84d7f19
--- /dev/null
+++ b/app/src/main/res/layout/activity_qr_code.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 98bed16..831abc7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,7 +15,11 @@
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
+# Automatically convert third-party libraries to use AndroidX
+android.enableJetifier=true
\ No newline at end of file