From 24220e7f838c48b2848d533a1545872209e9c17c Mon Sep 17 00:00:00 2001
From: squallzhjch <zhangjingchao@navinfo.com>
Date: Wed, 22 Mar 2023 09:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=B7=A5=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../java/com/navinfo/omqs/model/LoginUser.kt  |  6 ++
 .../java/com/navinfo/omqs/ui/BaseActivity.kt  | 13 +++
 .../java/com/navinfo/omqs/ui/LoginActivity.kt |  5 +-
 .../navinfo/omqs/ui/PermissionsActivity.kt    |  2 +-
 app/src/main/res/layout/activity_login.xml    | 97 +++++++++++++++++--
 gradle.properties                             |  1 +
 7 files changed, 116 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/java/com/navinfo/omqs/model/LoginUser.kt
 create mode 100644 app/src/main/java/com/navinfo/omqs/ui/BaseActivity.kt

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7720dc64..0df27bc1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,7 @@
         android:theme="@style/Theme.OMQualityInspection"
         tools:targetApi="31">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.LoginActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.OMQualityInspection">
diff --git a/app/src/main/java/com/navinfo/omqs/model/LoginUser.kt b/app/src/main/java/com/navinfo/omqs/model/LoginUser.kt
new file mode 100644
index 00000000..77c0aceb
--- /dev/null
+++ b/app/src/main/java/com/navinfo/omqs/model/LoginUser.kt
@@ -0,0 +1,6 @@
+package com.navinfo.omqs.model
+
+data class LoginUser(
+    var username: String = "",
+    var password: String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/omqs/ui/BaseActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/BaseActivity.kt
new file mode 100644
index 00000000..55054de6
--- /dev/null
+++ b/app/src/main/java/com/navinfo/omqs/ui/BaseActivity.kt
@@ -0,0 +1,13 @@
+package com.navinfo.omqs.ui
+
+import android.content.pm.ActivityInfo
+import android.os.Bundle
+import android.os.PersistableBundle
+import androidx.appcompat.app.AppCompatActivity
+
+open class BaseActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
+        super.onCreate(savedInstanceState, persistentState)
+        requestedOrientation =  ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE//横屏
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/omqs/ui/LoginActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/LoginActivity.kt
index 6b18b820..3d218d17 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/LoginActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/LoginActivity.kt
@@ -3,6 +3,8 @@ package com.navinfo.omqs.ui
 import android.os.Bundle
 import android.os.PersistableBundle
 import androidx.activity.viewModels
+import androidx.databinding.DataBindingUtil
+import com.navinfo.omqs.R
 import com.navinfo.omqs.databinding.ActivityLoginBinding
 
 class LoginActivity : PermissionsActivity() {
@@ -12,7 +14,8 @@ class LoginActivity : PermissionsActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
         super.onCreate(savedInstanceState, persistentState)
-        binding = ActivityLoginBinding.inflate(layoutInflater)
+        binding = DataBindingUtil.inflate(layoutInflater, R.layout.activity_login, null, false)
+        binding.lifecycleOwner = this
         setContentView(binding.root)
     }
 
diff --git a/app/src/main/java/com/navinfo/omqs/ui/PermissionsActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/PermissionsActivity.kt
index 77508544..64984e27 100644
--- a/app/src/main/java/com/navinfo/omqs/ui/PermissionsActivity.kt
+++ b/app/src/main/java/com/navinfo/omqs/ui/PermissionsActivity.kt
@@ -11,7 +11,7 @@ import com.hjq.permissions.XXPermissions
 /**
  * 权限申请Activity
  */
-abstract class PermissionsActivity : AppCompatActivity() {
+abstract class PermissionsActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
         super.onCreate(savedInstanceState, persistentState)
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index a074df1d..7d771415 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,9 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context=".ui.LoginActivity">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <data>
+        <variable
+            name="loginUser"
+            type="com.navinfo.omqs.model.LoginUser" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context="com.navinfo.volvo.ui.fragments.login.LoginFragment">
+
+        <ImageView
+            android:id="@+id/login_fragment_logo"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/ic_launcher"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.2"
+            app:roundPercent="0.2" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/login_fragment_user_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:scrollbarAlwaysDrawHorizontalTrack="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.4">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/login_username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@{loginUser.username}"
+                android:hint="请输入用户名" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            app:layout_constraintTop_toBottomOf="@id/login_fragment_user_layout">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/login_password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword"
+                android:text="@{loginUser.password}"
+                android:hint="请输入密码" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/login_fragment_register_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:text="注册"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintHorizontal_chainStyle="spread"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@id/login_fragment_login_button"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.7" />
+
+        <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+            android:id="@+id/login_fragment_login_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:text="登录"
+            app:layout_constraintBaseline_toBaselineOf="@id/login_fragment_register_button"
+            app:layout_constraintLeft_toRightOf="@id/login_fragment_register_button"
+            app:layout_constraintRight_toRightOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d2ea1cc9..2d78f1af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,6 +15,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # 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
+android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the