diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_off.xml b/app/src/main/res/drawable/ic_off.xml index 8abff5c..e0dc884 100644 --- a/app/src/main/res/drawable/ic_off.xml +++ b/app/src/main/res/drawable/ic_off.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M267.31,162.43l48.94,69.93a341.33,341.33 0,1 0,391.51 0l48.94,-69.93A426.15,426.15 0,0 1,938.67 512c0,235.65 -191.02,426.67 -426.67,426.67S85.33,747.65 85.33,512a426.15,426.15 0,0 1,181.97 -349.57zM469.33,512V85.33h85.33v426.67h-85.33z" /> diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_off.xml b/app/src/main/res/drawable/ic_off.xml index 8abff5c..e0dc884 100644 --- a/app/src/main/res/drawable/ic_off.xml +++ b/app/src/main/res/drawable/ic_off.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M267.31,162.43l48.94,69.93a341.33,341.33 0,1 0,391.51 0l48.94,-69.93A426.15,426.15 0,0 1,938.67 512c0,235.65 -191.02,426.67 -426.67,426.67S85.33,747.65 85.33,512a426.15,426.15 0,0 1,181.97 -349.57zM469.33,512V85.33h85.33v426.67h-85.33z" /> diff --git a/app/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_phone.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_phone.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_off.xml b/app/src/main/res/drawable/ic_off.xml index 8abff5c..e0dc884 100644 --- a/app/src/main/res/drawable/ic_off.xml +++ b/app/src/main/res/drawable/ic_off.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M267.31,162.43l48.94,69.93a341.33,341.33 0,1 0,391.51 0l48.94,-69.93A426.15,426.15 0,0 1,938.67 512c0,235.65 -191.02,426.67 -426.67,426.67S85.33,747.65 85.33,512a426.15,426.15 0,0 1,181.97 -349.57zM469.33,512V85.33h85.33v426.67h-85.33z" /> diff --git a/app/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_phone.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_phone.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 7068a2d..6592f51 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M233.09,189.14A425,425 0,0 1,512 85.33c235.65,0 426.67,191.02 426.67,426.67 0,91.14 -28.59,175.62 -77.23,244.91L725.33,512h128A341.33,341.33 0,0 0,275.63 265.73l-42.54,-76.59zM790.91,834.86A425,425 0,0 1,512 938.67C276.35,938.67 85.33,747.65 85.33,512c0,-91.14 28.59,-175.62 77.23,-244.91L298.67,512L170.67,512a341.33,341.33 0,0 0,577.71 246.27l42.54,76.59z" /> diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_off.xml b/app/src/main/res/drawable/ic_off.xml index 8abff5c..e0dc884 100644 --- a/app/src/main/res/drawable/ic_off.xml +++ b/app/src/main/res/drawable/ic_off.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M267.31,162.43l48.94,69.93a341.33,341.33 0,1 0,391.51 0l48.94,-69.93A426.15,426.15 0,0 1,938.67 512c0,235.65 -191.02,426.67 -426.67,426.67S85.33,747.65 85.33,512a426.15,426.15 0,0 1,181.97 -349.57zM469.33,512V85.33h85.33v426.67h-85.33z" /> diff --git a/app/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_phone.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_phone.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 7068a2d..6592f51 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M233.09,189.14A425,425 0,0 1,512 85.33c235.65,0 426.67,191.02 426.67,426.67 0,91.14 -28.59,175.62 -77.23,244.91L725.33,512h128A341.33,341.33 0,0 0,275.63 265.73l-42.54,-76.59zM790.91,834.86A425,425 0,0 1,512 938.67C276.35,938.67 85.33,747.65 85.33,512c0,-91.14 28.59,-175.62 77.23,-244.91L298.67,512L170.67,512a341.33,341.33 0,0 0,577.71 246.27l42.54,76.59z" /> diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 5104008..e24734c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,76 +3,32 @@ - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_off.xml b/app/src/main/res/drawable/ic_off.xml index 8abff5c..e0dc884 100644 --- a/app/src/main/res/drawable/ic_off.xml +++ b/app/src/main/res/drawable/ic_off.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M267.31,162.43l48.94,69.93a341.33,341.33 0,1 0,391.51 0l48.94,-69.93A426.15,426.15 0,0 1,938.67 512c0,235.65 -191.02,426.67 -426.67,426.67S85.33,747.65 85.33,512a426.15,426.15 0,0 1,181.97 -349.57zM469.33,512V85.33h85.33v426.67h-85.33z" /> diff --git a/app/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_phone.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_phone.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 7068a2d..6592f51 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M233.09,189.14A425,425 0,0 1,512 85.33c235.65,0 426.67,191.02 426.67,426.67 0,91.14 -28.59,175.62 -77.23,244.91L725.33,512h128A341.33,341.33 0,0 0,275.63 265.73l-42.54,-76.59zM790.91,834.86A425,425 0,0 1,512 938.67C276.35,938.67 85.33,747.65 85.33,512c0,-91.14 28.59,-175.62 77.23,-244.91L298.67,512L170.67,512a341.33,341.33 0,0 0,577.71 246.27l42.54,76.59z" /> diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index 72d8d1f..7ed532b 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -83,7 +83,7 @@ + android:src="@drawable/ic_bluetooth" /> - + diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..5df8bf2 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0813da8..dd50c60 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,13 +11,16 @@ + - + diff --git a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt index 7b51273..d0e8904 100644 --- a/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt +++ b/app/src/main/java/com/casic/birmm/inspect/extensions/ByteArray.kt @@ -5,13 +5,11 @@ /** * ByteArray扩展方法 */ - -//ByteArray转16进制 fun ByteArray.toHexString(hasSpace: Boolean = true) = this.joinToString("") { - (it.toInt() and 0xFF).toString(16).padStart( - 2, - '0' - ).toUpperCase(Locale.ROOT) + if (hasSpace) " " else "" + (it.toInt() and 0xFF) + .toString(16) + .padStart(2, '0') + .uppercase(Locale.ROOT) + if (hasSpace) " " else "" } //ByteArray转设备编号 diff --git a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt index ea5f1e2..47d675f 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/PermissionActivity.kt @@ -1,44 +1,29 @@ package com.casic.birmm.inspect.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.casic.birmm.inspect.R import com.casic.birmm.inspect.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { this.navigatePageTo() finish() diff --git a/app/src/main/res/drawable/ic_bluetooth.xml b/app/src/main/res/drawable/ic_bluetooth.xml new file mode 100644 index 0000000..dd4e36f --- /dev/null +++ b/app/src/main/res/drawable/ic_bluetooth.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_bluetooth_empty.xml b/app/src/main/res/drawable/ic_bluetooth_empty.xml deleted file mode 100644 index 717ff9c..0000000 --- a/app/src/main/res/drawable/ic_bluetooth_empty.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_off.xml b/app/src/main/res/drawable/ic_off.xml index 8abff5c..e0dc884 100644 --- a/app/src/main/res/drawable/ic_off.xml +++ b/app/src/main/res/drawable/ic_off.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M267.31,162.43l48.94,69.93a341.33,341.33 0,1 0,391.51 0l48.94,-69.93A426.15,426.15 0,0 1,938.67 512c0,235.65 -191.02,426.67 -426.67,426.67S85.33,747.65 85.33,512a426.15,426.15 0,0 1,181.97 -349.57zM469.33,512V85.33h85.33v426.67h-85.33z" /> diff --git a/app/src/main/res/drawable/ic_phone.xml b/app/src/main/res/drawable/ic_phone.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_phone.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 7068a2d..6592f51 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -4,6 +4,6 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="@color/mainTextColor" + android:pathData="M233.09,189.14A425,425 0,0 1,512 85.33c235.65,0 426.67,191.02 426.67,426.67 0,91.14 -28.59,175.62 -77.23,244.91L725.33,512h128A341.33,341.33 0,0 0,275.63 265.73l-42.54,-76.59zM790.91,834.86A425,425 0,0 1,512 938.67C276.35,938.67 85.33,747.65 85.33,512c0,-91.14 28.59,-175.62 77.23,-244.91L298.67,512L170.67,512a341.33,341.33 0,0 0,577.71 246.27l42.54,76.59z" /> diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index 72d8d1f..7ed532b 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -83,7 +83,7 @@ + android:src="@drawable/ic_bluetooth" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -