diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcdda23..d924cf9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:usesCleartextTraffic="true"> @@ -54,7 +54,6 @@ - diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcdda23..d924cf9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:usesCleartextTraffic="true"> @@ -54,7 +54,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 4805456..74937bb 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,7 +2,7 @@ import android.content.Context import android.content.Intent -import android.net.Uri +import androidx.core.net.toUri import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.OnImageCompressListener import com.casic.xz.meterage.fragment.HomePageFragment @@ -145,7 +145,7 @@ } else { //跳转系统自带浏览器，后续操作用户自行决定 val url = this.combineFilePath() - val uri = Uri.parse(url) + val uri = url.toUri() val intent = Intent(Intent.ACTION_VIEW, uri) context.startActivity(intent) } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcdda23..d924cf9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:usesCleartextTraffic="true"> @@ -54,7 +54,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 4805456..74937bb 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,7 +2,7 @@ import android.content.Context import android.content.Intent -import android.net.Uri +import androidx.core.net.toUri import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.OnImageCompressListener import com.casic.xz.meterage.fragment.HomePageFragment @@ -145,7 +145,7 @@ } else { //跳转系统自带浏览器，后续操作用户自行决定 val url = this.combineFilePath() - val uri = Uri.parse(url) + val uri = url.toUri() val intent = Intent(Intent.ACTION_VIEW, uri) context.startActivity(intent) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index 69b7061..fa3b01d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -17,8 +17,10 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog import com.pengxh.kt.lite.utils.SaveKeyValues +import pub.devrel.easypermissions.EasyPermissions -class LoginActivity : ApplicationBaseActivity() { +class LoginActivity : ApplicationBaseActivity(), + EasyPermissions.PermissionCallbacks { private var context = this private lateinit var authenticateViewModel: AuthenticateViewModel @@ -27,11 +29,16 @@ private lateinit var userPassword: String override fun initOnCreate(savedInstanceState: Bundle?) { + EasyPermissions.requestPermissions( + this, resources.getString(R.string.app_name) + "需要获取必要权限", + LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS + ) + ActivityStackManager.addActivity(this) - binding. userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - binding. passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - binding. checkBoxView.isChecked = + binding.userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + binding.passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) + binding.checkBoxView.isChecked = SaveKeyValues.getValue(LocaleConstant.PRIVACY_CHECK_BOX, false) as Boolean authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] @@ -85,7 +92,7 @@ } } - binding. checkBoxView.setOnCheckedChangeListener { _, isChecked -> + binding.checkBoxView.setOnCheckedChangeListener { _, isChecked -> SaveKeyValues.putValue(LocaleConstant.PRIVACY_CHECK_BOX, isChecked) } @@ -110,4 +117,19 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, true, R.color.white) } + + override fun onRequestPermissionsResult( + requestCode: Int, permissions: Array, grantResults: IntArray + ) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) + } + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + + } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + + } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcdda23..d924cf9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:usesCleartextTraffic="true"> @@ -54,7 +54,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 4805456..74937bb 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,7 +2,7 @@ import android.content.Context import android.content.Intent -import android.net.Uri +import androidx.core.net.toUri import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.OnImageCompressListener import com.casic.xz.meterage.fragment.HomePageFragment @@ -145,7 +145,7 @@ } else { //跳转系统自带浏览器，后续操作用户自行决定 val url = this.combineFilePath() - val uri = Uri.parse(url) + val uri = url.toUri() val intent = Intent(Intent.ACTION_VIEW, uri) context.startActivity(intent) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index 69b7061..fa3b01d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -17,8 +17,10 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog import com.pengxh.kt.lite.utils.SaveKeyValues +import pub.devrel.easypermissions.EasyPermissions -class LoginActivity : ApplicationBaseActivity() { +class LoginActivity : ApplicationBaseActivity(), + EasyPermissions.PermissionCallbacks { private var context = this private lateinit var authenticateViewModel: AuthenticateViewModel @@ -27,11 +29,16 @@ private lateinit var userPassword: String override fun initOnCreate(savedInstanceState: Bundle?) { + EasyPermissions.requestPermissions( + this, resources.getString(R.string.app_name) + "需要获取必要权限", + LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS + ) + ActivityStackManager.addActivity(this) - binding. userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - binding. passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - binding. checkBoxView.isChecked = + binding.userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + binding.passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) + binding.checkBoxView.isChecked = SaveKeyValues.getValue(LocaleConstant.PRIVACY_CHECK_BOX, false) as Boolean authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] @@ -85,7 +92,7 @@ } } - binding. checkBoxView.setOnCheckedChangeListener { _, isChecked -> + binding.checkBoxView.setOnCheckedChangeListener { _, isChecked -> SaveKeyValues.putValue(LocaleConstant.PRIVACY_CHECK_BOX, isChecked) } @@ -110,4 +117,19 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, true, R.color.white) } + + override fun onRequestPermissionsResult( + requestCode: Int, permissions: Array, grantResults: IntArray + ) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) + } + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + + } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt deleted file mode 100644 index 02fa202..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.xz.meterage.view - -import android.os.Bundle -import android.os.CountDownTimer -import com.casic.xz.meterage.R -import com.casic.xz.meterage.base.ApplicationBaseActivity -import com.casic.xz.meterage.databinding.ActivityPermissionBinding -import com.casic.xz.meterage.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.SaveKeyValues -import pub.devrel.easypermissions.EasyPermissions - -class PermissionActivity : ApplicationBaseActivity(), EasyPermissions.PermissionCallbacks { - - private val isFirstEnter = SaveKeyValues.getValue("isFirstEnter", true) as Boolean - private val countDownTimer = object : CountDownTimer(2000, 500) { - override fun onFinish() { - navigatePageTo() - finish() - } - - override fun onTick(millisUntilFinished: Long) { - - } - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - EasyPermissions.requestPermissions( - this, resources.getString(R.string.app_name) + "需要获取必要权限", - LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS - ) - } - - override fun initEvent() { - - } - - override fun initViewBinding(): ActivityPermissionBinding { - return ActivityPermissionBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - } - - override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray - ) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults) - EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) - } - - override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { - if (isFirstEnter) { - SaveKeyValues.putValue("isFirstEnter", false) - navigatePageTo() - finish() - } else { - countDownTimer.start() - } - } - - override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { - - } - - override fun onDestroy() { - super.onDestroy() - countDownTimer.cancel() - } -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcdda23..d924cf9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:usesCleartextTraffic="true"> @@ -54,7 +54,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 4805456..74937bb 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,7 +2,7 @@ import android.content.Context import android.content.Intent -import android.net.Uri +import androidx.core.net.toUri import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.OnImageCompressListener import com.casic.xz.meterage.fragment.HomePageFragment @@ -145,7 +145,7 @@ } else { //跳转系统自带浏览器，后续操作用户自行决定 val url = this.combineFilePath() - val uri = Uri.parse(url) + val uri = url.toUri() val intent = Intent(Intent.ACTION_VIEW, uri) context.startActivity(intent) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index 69b7061..fa3b01d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -17,8 +17,10 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog import com.pengxh.kt.lite.utils.SaveKeyValues +import pub.devrel.easypermissions.EasyPermissions -class LoginActivity : ApplicationBaseActivity() { +class LoginActivity : ApplicationBaseActivity(), + EasyPermissions.PermissionCallbacks { private var context = this private lateinit var authenticateViewModel: AuthenticateViewModel @@ -27,11 +29,16 @@ private lateinit var userPassword: String override fun initOnCreate(savedInstanceState: Bundle?) { + EasyPermissions.requestPermissions( + this, resources.getString(R.string.app_name) + "需要获取必要权限", + LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS + ) + ActivityStackManager.addActivity(this) - binding. userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - binding. passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - binding. checkBoxView.isChecked = + binding.userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + binding.passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) + binding.checkBoxView.isChecked = SaveKeyValues.getValue(LocaleConstant.PRIVACY_CHECK_BOX, false) as Boolean authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] @@ -85,7 +92,7 @@ } } - binding. checkBoxView.setOnCheckedChangeListener { _, isChecked -> + binding.checkBoxView.setOnCheckedChangeListener { _, isChecked -> SaveKeyValues.putValue(LocaleConstant.PRIVACY_CHECK_BOX, isChecked) } @@ -110,4 +117,19 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, true, R.color.white) } + + override fun onRequestPermissionsResult( + requestCode: Int, permissions: Array, grantResults: IntArray + ) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) + } + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + + } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt deleted file mode 100644 index 02fa202..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.xz.meterage.view - -import android.os.Bundle -import android.os.CountDownTimer -import com.casic.xz.meterage.R -import com.casic.xz.meterage.base.ApplicationBaseActivity -import com.casic.xz.meterage.databinding.ActivityPermissionBinding -import com.casic.xz.meterage.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.SaveKeyValues -import pub.devrel.easypermissions.EasyPermissions - -class PermissionActivity : ApplicationBaseActivity(), EasyPermissions.PermissionCallbacks { - - private val isFirstEnter = SaveKeyValues.getValue("isFirstEnter", true) as Boolean - private val countDownTimer = object : CountDownTimer(2000, 500) { - override fun onFinish() { - navigatePageTo() - finish() - } - - override fun onTick(millisUntilFinished: Long) { - - } - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - EasyPermissions.requestPermissions( - this, resources.getString(R.string.app_name) + "需要获取必要权限", - LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS - ) - } - - override fun initEvent() { - - } - - override fun initViewBinding(): ActivityPermissionBinding { - return ActivityPermissionBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - } - - override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray - ) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults) - EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) - } - - override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { - if (isFirstEnter) { - SaveKeyValues.putValue("isFirstEnter", false) - navigatePageTo() - finish() - } else { - countDownTimer.start() - } - } - - override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { - - } - - override fun onDestroy() { - super.onDestroy() - countDownTimer.cancel() - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 6dea7b3..93e652d 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:paddingVertical="@dimen/dp_7" + android:paddingVertical="@dimen/dp_25" android:text="@string/app_name" android:textColor="@color/themeColor" android:textSize="@dimen/sp_22" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fcdda23..d924cf9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:usesCleartextTraffic="true"> @@ -54,7 +54,6 @@ - diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 4805456..74937bb 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,7 +2,7 @@ import android.content.Context import android.content.Intent -import android.net.Uri +import androidx.core.net.toUri import com.casic.xz.meterage.base.ApplicationBaseActivity import com.casic.xz.meterage.callback.OnImageCompressListener import com.casic.xz.meterage.fragment.HomePageFragment @@ -145,7 +145,7 @@ } else { //跳转系统自带浏览器，后续操作用户自行决定 val url = this.combineFilePath() - val uri = Uri.parse(url) + val uri = url.toUri() val intent = Intent(Intent.ACTION_VIEW, uri) context.startActivity(intent) } diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index 69b7061..fa3b01d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -17,8 +17,10 @@ import com.pengxh.kt.lite.utils.LoadState import com.pengxh.kt.lite.utils.LoadingDialog import com.pengxh.kt.lite.utils.SaveKeyValues +import pub.devrel.easypermissions.EasyPermissions -class LoginActivity : ApplicationBaseActivity() { +class LoginActivity : ApplicationBaseActivity(), + EasyPermissions.PermissionCallbacks { private var context = this private lateinit var authenticateViewModel: AuthenticateViewModel @@ -27,11 +29,16 @@ private lateinit var userPassword: String override fun initOnCreate(savedInstanceState: Bundle?) { + EasyPermissions.requestPermissions( + this, resources.getString(R.string.app_name) + "需要获取必要权限", + LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS + ) + ActivityStackManager.addActivity(this) - binding. userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - binding. passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - binding. checkBoxView.isChecked = + binding.userPhoneView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + binding.passwordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) + binding.checkBoxView.isChecked = SaveKeyValues.getValue(LocaleConstant.PRIVACY_CHECK_BOX, false) as Boolean authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] @@ -85,7 +92,7 @@ } } - binding. checkBoxView.setOnCheckedChangeListener { _, isChecked -> + binding.checkBoxView.setOnCheckedChangeListener { _, isChecked -> SaveKeyValues.putValue(LocaleConstant.PRIVACY_CHECK_BOX, isChecked) } @@ -110,4 +117,19 @@ override fun setupTopBarLayout() { binding.rootView.initImmersionBar(this, true, R.color.white) } + + override fun onRequestPermissionsResult( + requestCode: Int, permissions: Array, grantResults: IntArray + ) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) + } + + override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { + + } + + override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { + + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt deleted file mode 100644 index 02fa202..0000000 --- a/app/src/main/java/com/casic/xz/meterage/view/PermissionActivity.kt +++ /dev/null @@ -1,78 +0,0 @@ -package com.casic.xz.meterage.view - -import android.os.Bundle -import android.os.CountDownTimer -import com.casic.xz.meterage.R -import com.casic.xz.meterage.base.ApplicationBaseActivity -import com.casic.xz.meterage.databinding.ActivityPermissionBinding -import com.casic.xz.meterage.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.SaveKeyValues -import pub.devrel.easypermissions.EasyPermissions - -class PermissionActivity : ApplicationBaseActivity(), EasyPermissions.PermissionCallbacks { - - private val isFirstEnter = SaveKeyValues.getValue("isFirstEnter", true) as Boolean - private val countDownTimer = object : CountDownTimer(2000, 500) { - override fun onFinish() { - navigatePageTo() - finish() - } - - override fun onTick(millisUntilFinished: Long) { - - } - } - - override fun initOnCreate(savedInstanceState: Bundle?) { - EasyPermissions.requestPermissions( - this, resources.getString(R.string.app_name) + "需要获取必要权限", - LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS - ) - } - - override fun initEvent() { - - } - - override fun initViewBinding(): ActivityPermissionBinding { - return ActivityPermissionBinding.inflate(layoutInflater) - } - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - } - - override fun onRequestPermissionsResult( - requestCode: Int, - permissions: Array, - grantResults: IntArray - ) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults) - EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this) - } - - override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { - if (isFirstEnter) { - SaveKeyValues.putValue("isFirstEnter", false) - navigatePageTo() - finish() - } else { - countDownTimer.start() - } - } - - override fun onPermissionsDenied(requestCode: Int, perms: MutableList) { - - } - - override fun onDestroy() { - super.onDestroy() - countDownTimer.cancel() - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 6dea7b3..93e652d 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:paddingVertical="@dimen/dp_7" + android:paddingVertical="@dimen/dp_25" android:text="@string/app_name" android:textColor="@color/themeColor" android:textSize="@dimen/sp_22" /> diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml deleted file mode 100644 index 78f76b9..0000000 --- a/app/src/main/res/layout/activity_permission.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - \ No newline at end of file