diff --git a/app/build.gradle b/app/build.gradle index dbd7b68..b3d9698 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ HONOR_APP_ID : "104442055", // OPPO 相关应用参数 - OPPO_APP_KEY : "", - OPPO_APP_SECRET: "", + OPPO_APP_KEY : "82c1582fc7a8491ba460a9cdfb5c25c6", + OPPO_APP_SECRET: "b04e226ffee048078e646b8a08482770", // VIVO 相关应用参数 VIVO_APP_ID : "", @@ -161,8 +161,9 @@ implementation 'com.huawei.hms:push:6.11.0.300' implementation 'com.getui.opt:honor:3.6.0' // 荣耀 implementation 'com.hihonor.mcs:push:7.0.61.303' - -// implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'commons-codec:commons-codec:1.6' + implementation 'com.android.support:support-annotations:28.0.0' // implementation 'com.assist-v3:vivo:3.1.2' // vivo // implementation 'com.getui.opt:xmp:3.3.1' // 小米 diff --git a/app/build.gradle b/app/build.gradle index dbd7b68..b3d9698 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ HONOR_APP_ID : "104442055", // OPPO 相关应用参数 - OPPO_APP_KEY : "", - OPPO_APP_SECRET: "", + OPPO_APP_KEY : "82c1582fc7a8491ba460a9cdfb5c25c6", + OPPO_APP_SECRET: "b04e226ffee048078e646b8a08482770", // VIVO 相关应用参数 VIVO_APP_ID : "", @@ -161,8 +161,9 @@ implementation 'com.huawei.hms:push:6.11.0.300' implementation 'com.getui.opt:honor:3.6.0' // 荣耀 implementation 'com.hihonor.mcs:push:7.0.61.303' - -// implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'commons-codec:commons-codec:1.6' + implementation 'com.android.support:support-annotations:28.0.0' // implementation 'com.assist-v3:vivo:3.1.2' // vivo // implementation 'com.getui.opt:xmp:3.3.1' // 小米 diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 33d0346..e4bb0e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,8 +1,6 @@ package com.casic.app.smartwell.view -import android.content.Context import android.os.Bundle -import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter @@ -16,7 +14,6 @@ import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel -import com.casic.app.smartwell.widgets.ChangeServerDialog import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar @@ -24,7 +21,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.readAssetsFile import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.coroutines.Dispatchers @@ -32,7 +28,6 @@ class LoginActivity : KotlinBaseActivity() { - private val context: Context = this@LoginActivity private val gson by lazy { Gson() } private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel @@ -120,34 +115,6 @@ } override fun initEvent() { - //修改IP和端口 - binding.changeServerLayout.setOnClickListener { - ChangeServerDialog.Builder() - .setContext(this) - .setOnDialogButtonClickListener(object : - ChangeServerDialog.OnDialogButtonClickListener { - override fun onConfirmClick(address: String, port: String) { - /** - * 例如：http://60.208.121.150:5001 - * */ - val newServerConfig = "http://$address:$port" - SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig - ) - object : CountDownTimer(2000, 1000) { - override fun onTick(millisUntilFinished: Long) { - "修改完成，请重新打开应用".show(context) - } - - override fun onFinish() { - ActivityStackManager.finishAllActivity() - } - }.start() - } - }) - .build().show() - } - binding.loginButton.setOnClickListener { val account = binding.userNameView.text.toString().trim() val userPassword = binding.userPasswordView.text.toString().trim() diff --git a/app/build.gradle b/app/build.gradle index dbd7b68..b3d9698 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ HONOR_APP_ID : "104442055", // OPPO 相关应用参数 - OPPO_APP_KEY : "", - OPPO_APP_SECRET: "", + OPPO_APP_KEY : "82c1582fc7a8491ba460a9cdfb5c25c6", + OPPO_APP_SECRET: "b04e226ffee048078e646b8a08482770", // VIVO 相关应用参数 VIVO_APP_ID : "", @@ -161,8 +161,9 @@ implementation 'com.huawei.hms:push:6.11.0.300' implementation 'com.getui.opt:honor:3.6.0' // 荣耀 implementation 'com.hihonor.mcs:push:7.0.61.303' - -// implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'commons-codec:commons-codec:1.6' + implementation 'com.android.support:support-annotations:28.0.0' // implementation 'com.assist-v3:vivo:3.1.2' // vivo // implementation 'com.getui.opt:xmp:3.3.1' // 小米 diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 33d0346..e4bb0e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,8 +1,6 @@ package com.casic.app.smartwell.view -import android.content.Context import android.os.Bundle -import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter @@ -16,7 +14,6 @@ import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel -import com.casic.app.smartwell.widgets.ChangeServerDialog import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar @@ -24,7 +21,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.readAssetsFile import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.coroutines.Dispatchers @@ -32,7 +28,6 @@ class LoginActivity : KotlinBaseActivity() { - private val context: Context = this@LoginActivity private val gson by lazy { Gson() } private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel @@ -120,34 +115,6 @@ } override fun initEvent() { - //修改IP和端口 - binding.changeServerLayout.setOnClickListener { - ChangeServerDialog.Builder() - .setContext(this) - .setOnDialogButtonClickListener(object : - ChangeServerDialog.OnDialogButtonClickListener { - override fun onConfirmClick(address: String, port: String) { - /** - * 例如：http://60.208.121.150:5001 - * */ - val newServerConfig = "http://$address:$port" - SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig - ) - object : CountDownTimer(2000, 1000) { - override fun onTick(millisUntilFinished: Long) { - "修改完成，请重新打开应用".show(context) - } - - override fun onFinish() { - ActivityStackManager.finishAllActivity() - } - }.start() - } - }) - .build().show() - } - binding.loginButton.setOnClickListener { val account = binding.userNameView.text.toString().trim() val userPassword = binding.userPasswordView.text.toString().trim() diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 419dbc1..cc586eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -35,7 +35,7 @@ //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) NaviSetting.updatePrivacyAgree(this, true) - this.navigatePageTo() + navigatePageTo() finish() } diff --git a/app/build.gradle b/app/build.gradle index dbd7b68..b3d9698 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ HONOR_APP_ID : "104442055", // OPPO 相关应用参数 - OPPO_APP_KEY : "", - OPPO_APP_SECRET: "", + OPPO_APP_KEY : "82c1582fc7a8491ba460a9cdfb5c25c6", + OPPO_APP_SECRET: "b04e226ffee048078e646b8a08482770", // VIVO 相关应用参数 VIVO_APP_ID : "", @@ -161,8 +161,9 @@ implementation 'com.huawei.hms:push:6.11.0.300' implementation 'com.getui.opt:honor:3.6.0' // 荣耀 implementation 'com.hihonor.mcs:push:7.0.61.303' - -// implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'commons-codec:commons-codec:1.6' + implementation 'com.android.support:support-annotations:28.0.0' // implementation 'com.assist-v3:vivo:3.1.2' // vivo // implementation 'com.getui.opt:xmp:3.3.1' // 小米 diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 33d0346..e4bb0e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,8 +1,6 @@ package com.casic.app.smartwell.view -import android.content.Context import android.os.Bundle -import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter @@ -16,7 +14,6 @@ import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel -import com.casic.app.smartwell.widgets.ChangeServerDialog import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar @@ -24,7 +21,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.readAssetsFile import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.coroutines.Dispatchers @@ -32,7 +28,6 @@ class LoginActivity : KotlinBaseActivity() { - private val context: Context = this@LoginActivity private val gson by lazy { Gson() } private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel @@ -120,34 +115,6 @@ } override fun initEvent() { - //修改IP和端口 - binding.changeServerLayout.setOnClickListener { - ChangeServerDialog.Builder() - .setContext(this) - .setOnDialogButtonClickListener(object : - ChangeServerDialog.OnDialogButtonClickListener { - override fun onConfirmClick(address: String, port: String) { - /** - * 例如：http://60.208.121.150:5001 - * */ - val newServerConfig = "http://$address:$port" - SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig - ) - object : CountDownTimer(2000, 1000) { - override fun onTick(millisUntilFinished: Long) { - "修改完成，请重新打开应用".show(context) - } - - override fun onFinish() { - ActivityStackManager.finishAllActivity() - } - }.start() - } - }) - .build().show() - } - binding.loginButton.setOnClickListener { val account = binding.userNameView.text.toString().trim() val userPassword = binding.userPasswordView.text.toString().trim() diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 419dbc1..cc586eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -35,7 +35,7 @@ //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) NaviSetting.updatePrivacyAgree(this, true) - this.navigatePageTo() + navigatePageTo() finish() } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/ChangeServerDialog.kt b/app/src/main/java/com/casic/app/smartwell/widgets/ChangeServerDialog.kt deleted file mode 100644 index ea68d9a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/widgets/ChangeServerDialog.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.casic.app.smartwell.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import com.casic.app.smartwell.R -import com.casic.app.smartwell.databinding.DialogServerIpBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class ChangeServerDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val ctx: Context = builder.context - private val listener: OnDialogButtonClickListener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): ChangeServerDialog { - return ChangeServerDialog(this) - } - } - - private val binding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCancelable(true) - setCanceledOnTouchOutside(true) - - binding.confirmButton.setOnClickListener(View.OnClickListener { - val address = binding.addressView.text.toString() - val port = binding.portNumberView.text.toString() - if (address.isBlank()) { - "请输入服务器地址".show(ctx) - return@OnClickListener - } - if (port.isBlank()) { - "请输入服务器端口".show(ctx) - return@OnClickListener - } - listener.onConfirmClick(address, port) - dismiss() - }) - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(address: String, port: String) - } -} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index dbd7b68..b3d9698 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ HONOR_APP_ID : "104442055", // OPPO 相关应用参数 - OPPO_APP_KEY : "", - OPPO_APP_SECRET: "", + OPPO_APP_KEY : "82c1582fc7a8491ba460a9cdfb5c25c6", + OPPO_APP_SECRET: "b04e226ffee048078e646b8a08482770", // VIVO 相关应用参数 VIVO_APP_ID : "", @@ -161,8 +161,9 @@ implementation 'com.huawei.hms:push:6.11.0.300' implementation 'com.getui.opt:honor:3.6.0' // 荣耀 implementation 'com.hihonor.mcs:push:7.0.61.303' - -// implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'com.assist-v3:oppo:3.4.0' // oppo + implementation 'commons-codec:commons-codec:1.6' + implementation 'com.android.support:support-annotations:28.0.0' // implementation 'com.assist-v3:vivo:3.1.2' // vivo // implementation 'com.getui.opt:xmp:3.3.1' // 小米 diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 33d0346..e4bb0e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -1,8 +1,6 @@ package com.casic.app.smartwell.view -import android.content.Context import android.os.Bundle -import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import com.amap.api.maps.CoordinateConverter @@ -16,7 +14,6 @@ import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel -import com.casic.app.smartwell.widgets.ChangeServerDialog import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.gyf.immersionbar.ImmersionBar @@ -24,7 +21,6 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.readAssetsFile import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.ActivityStackManager import com.pengxh.kt.lite.utils.LoadingDialogHub import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.coroutines.Dispatchers @@ -32,7 +28,6 @@ class LoginActivity : KotlinBaseActivity() { - private val context: Context = this@LoginActivity private val gson by lazy { Gson() } private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel @@ -120,34 +115,6 @@ } override fun initEvent() { - //修改IP和端口 - binding.changeServerLayout.setOnClickListener { - ChangeServerDialog.Builder() - .setContext(this) - .setOnDialogButtonClickListener(object : - ChangeServerDialog.OnDialogButtonClickListener { - override fun onConfirmClick(address: String, port: String) { - /** - * 例如：http://60.208.121.150:5001 - * */ - val newServerConfig = "http://$address:$port" - SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig - ) - object : CountDownTimer(2000, 1000) { - override fun onTick(millisUntilFinished: Long) { - "修改完成，请重新打开应用".show(context) - } - - override fun onFinish() { - ActivityStackManager.finishAllActivity() - } - }.start() - } - }) - .build().show() - } - binding.loginButton.setOnClickListener { val account = binding.userNameView.text.toString().trim() val userPassword = binding.userPasswordView.text.toString().trim() diff --git a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt index 419dbc1..cc586eb 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/PermissionActivity.kt @@ -35,7 +35,7 @@ //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) NaviSetting.updatePrivacyAgree(this, true) - this.navigatePageTo() + navigatePageTo() finish() } diff --git a/app/src/main/java/com/casic/app/smartwell/widgets/ChangeServerDialog.kt b/app/src/main/java/com/casic/app/smartwell/widgets/ChangeServerDialog.kt deleted file mode 100644 index ea68d9a..0000000 --- a/app/src/main/java/com/casic/app/smartwell/widgets/ChangeServerDialog.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.casic.app.smartwell.widgets - -import android.app.Dialog -import android.content.Context -import android.os.Bundle -import android.view.View -import com.casic.app.smartwell.R -import com.casic.app.smartwell.databinding.DialogServerIpBinding -import com.pengxh.kt.lite.extensions.binding -import com.pengxh.kt.lite.extensions.initDialogLayoutParams -import com.pengxh.kt.lite.extensions.show - -class ChangeServerDialog private constructor(builder: Builder) : Dialog( - builder.context, R.style.UserDefinedDialogStyle -) { - private val ctx: Context = builder.context - private val listener: OnDialogButtonClickListener = builder.listener - - class Builder { - lateinit var context: Context - lateinit var listener: OnDialogButtonClickListener - - fun setContext(context: Context): Builder { - this.context = context - return this - } - - fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { - this.listener = listener - return this - } - - fun build(): ChangeServerDialog { - return ChangeServerDialog(this) - } - } - - private val binding by binding() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - this.initDialogLayoutParams(0.85f) - setCancelable(true) - setCanceledOnTouchOutside(true) - - binding.confirmButton.setOnClickListener(View.OnClickListener { - val address = binding.addressView.text.toString() - val port = binding.portNumberView.text.toString() - if (address.isBlank()) { - "请输入服务器地址".show(ctx) - return@OnClickListener - } - if (port.isBlank()) { - "请输入服务器端口".show(ctx) - return@OnClickListener - } - listener.onConfirmClick(address, port) - dismiss() - }) - } - - interface OnDialogButtonClickListener { - fun onConfirmClick(address: String, port: String) - } -} \ 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 5ba7506..6fa5ee4 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,17 +10,17 @@ android:layout_above="@id/userNameLayout"> + android:src="@mipmap/ic_launcher" /> - - - - - - -