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"> 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 @@ - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + \ 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