diff --git a/app/src/main/java/com/xjjk/healthyclients/data/api/CommonApi.kt b/app/src/main/java/com/xjjk/healthyclients/data/api/CommonApi.kt index d465a6c..50524b9 100644 --- a/app/src/main/java/com/xjjk/healthyclients/data/api/CommonApi.kt +++ b/app/src/main/java/com/xjjk/healthyclients/data/api/CommonApi.kt @@ -103,6 +103,11 @@ interface CommonApi { */ @POST("/sys/mLogin") fun mLogin(@Body any: LoginBean): Call + /** + * 安眼统一认证 + */ + @POST("/sys/mLoginAnYan") + fun mLoginAnYan(@Body any: LoginBean): Call /** * 首页系统功能介绍弹窗-选择多少天不在提示 */ diff --git a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt index cca10dd..a1405c7 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt +++ b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt @@ -18,7 +18,7 @@ object UrlConfig { //2025年10月23日 14:37 冯普说改为之前的地址,给油田部署的正式地址还没有启用 - val baseUrlType: BaseUrlType = BaseUrlType.TEST + val baseUrlType: BaseUrlType = BaseUrlType.PRODUCT var testDeviceList = mutableListOf("7e8e7e49a26340b1","bb2d17cc138d109f")//测试设备列表 荣耀 oppo vivo var isTestDevice: Boolean = false diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt index f35345c..e4fe0f5 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/LoginActivity.kt @@ -1,5 +1,6 @@ package com.xjjk.healthyclients.ui.activity +import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -30,7 +31,7 @@ import com.xjjk.healthyclients.base.BaseVMBActivity import com.xjjk.healthyclients.bean.LoginBean import com.xjjk.healthyclients.bean.LoginResponseBean import com.xjjk.healthyclients.data.api.CommonApi -import com.xjjk.healthyclients.databinding.ActivityLoginBinding +import com.xjjk.healthyclients.databinding.ActivityLoginNewBinding import com.xjjk.healthyclients.retrofit.RetrofitManager import com.xjjk.healthyclients.retrofit.UrlConfig import com.xjjk.healthyclients.superfuntion.loginIm @@ -48,7 +49,7 @@ import retrofit2.Callback import retrofit2.Response -class LoginActivity : BaseVMBActivity(R.layout.activity_login) { +class LoginActivity : BaseVMBActivity(R.layout.activity_login_new) { var mApi = RetrofitManager.getRetrofits().create(CommonApi::class.java) var isRead=false @@ -59,6 +60,9 @@ class LoginActivity : BaseVMBActivity(R.la var mLastTime = 0L var mHits = LongArray(mCount) var isAdminEnable=false + var loginType = 1 + + override fun initView(savedInstanceState: Bundle?) { CommonUtils.logoutClearData() initAgreement() @@ -135,8 +139,8 @@ class LoginActivity : BaseVMBActivity(R.la override fun bindEvent() { mBinding?.apply { addClickViews( - loginSubmit,loginIvReadState,loginAgreementRoot,loginRetrievePassword,testBtn,ivIconImg, - tvDebug,tvProd,tvTest + loginSubmit,loginIvReadState,loginAgreementRoot,loginRetrievePassword,testBtn, + tvDebug,tvProd,tvTest,tvLoginHealthy,tvLoginPlatform ) } mTextViewDialog?.let { @@ -224,11 +228,11 @@ class LoginActivity : BaseVMBActivity(R.la } } } - R.id.iv_icon_img->{ - if (isAdminEnable) { - mBinding.testBtn.visibility = View.VISIBLE - } - } +// R.id.iv_icon_img->{ +// if (isAdminEnable) { +// mBinding.testBtn.visibility = View.VISIBLE +// } +// } R.id.tv_debug->{ DataStoreManager.saveCurrentConfig(1) @@ -244,6 +248,23 @@ class LoginActivity : BaseVMBActivity(R.la DataStoreManager.saveCurrentConfig(3) System.exit(0); } + R.id.tv_login_platform -> { + loginType = 1 + mBinding.tvLoginPlatform.setBackgroundResource(R.mipmap.ic_login_platform_bg_green) + mBinding.tvLoginPlatform.setTextColor(Color.parseColor("#FFFFFF")) + mBinding.tvLoginHealthy.setBackgroundResource(R.mipmap.ic_login_healthy_bg) + mBinding.tvLoginHealthy.setTextColor(Color.parseColor("#21BEBD")) + + } + + R.id.tv_login_healthy -> { + loginType = 2 + mBinding.tvLoginPlatform.setBackgroundResource(R.mipmap.ic_login_platform_bg) + mBinding.tvLoginPlatform.setTextColor(Color.parseColor("#21BEBD")) + mBinding.tvLoginHealthy.setBackgroundResource(R.mipmap.ic_login_healthy_bg_green) + mBinding.tvLoginHealthy.setTextColor(Color.parseColor("#FFFFFF")) + + } // R.id.login_iv_eye -> { // mBinding?.let { // var selection=it.loginEtUserPassword.selectionEnd @@ -269,7 +290,7 @@ class LoginActivity : BaseVMBActivity(R.la } private fun initAgreement() { // var text="已阅读并同意《用户协议》、《隐私政策》和《相关法律说明》" - var text="已阅读并同意《用户协议》、《隐私政策》" + var text="已阅读并同意《用户协议》和《隐私政策》" var span= SpannableString(text) span.setSpan(object : ClickableSpan() { @@ -285,7 +306,7 @@ class LoginActivity : BaseVMBActivity(R.la mContext?.let{ span.setSpan(NoUnderlineSpan(),6 , 12, Spanned.SPAN_MARK_MARK) span.setSpan( - ForegroundColorSpan(it.resources.getColor(R.color.link_blue_color)),6, 12, Spanned.SPAN_INCLUSIVE_EXCLUSIVE) + ForegroundColorSpan(it.resources.getColor(R.color.theme_color)),6, 12, Spanned.SPAN_INCLUSIVE_EXCLUSIVE) } span.setSpan(object : ClickableSpan() { @@ -302,7 +323,7 @@ class LoginActivity : BaseVMBActivity(R.la mContext?.let{ span.setSpan(NoUnderlineSpan(),13 , 19, Spanned.SPAN_MARK_MARK) span.setSpan( - ForegroundColorSpan(it.resources.getColor(R.color.link_blue_color)),13, 19, Spanned.SPAN_INCLUSIVE_EXCLUSIVE) + ForegroundColorSpan(it.resources.getColor(R.color.theme_color)),13, 19, Spanned.SPAN_INCLUSIVE_EXCLUSIVE) } // span.setSpan(object : ClickableSpan() { // @@ -345,8 +366,13 @@ class LoginActivity : BaseVMBActivity(R.la bean.username=name bean.password=RSACipherStrategy().encrypt(ConstantUtils.mRSAKey,password) // bean.password=password - var login=mApi.mLogin(bean) - login.enqueue(object : Callback{ + var login: Call?=null + if (loginType == 1) { + login = mApi.mLoginAnYan(bean) + } else if (loginType == 2) { + login = mApi.mLogin(bean) + } + login!!.enqueue(object : Callback{ override fun onResponse(call: Call, response: Response) { dialog?.dismiss() try { diff --git a/app/src/main/java/com/xjjk/healthyclients/view/CustomPasswordView.kt b/app/src/main/java/com/xjjk/healthyclients/view/CustomPasswordView.kt index 5217032..ab51d22 100644 --- a/app/src/main/java/com/xjjk/healthyclients/view/CustomPasswordView.kt +++ b/app/src/main/java/com/xjjk/healthyclients/view/CustomPasswordView.kt @@ -8,12 +8,12 @@ import android.view.LayoutInflater import android.widget.RelativeLayout import androidx.databinding.DataBindingUtil import com.xjjk.healthyclients.R -import com.xjjk.healthyclients.databinding.CustomPasswordViewBinding +import com.xjjk.healthyclients.databinding.CustomPasswordViewNewBinding class CustomPasswordView : RelativeLayout { var mContext:Context?=null - lateinit var mBinding: CustomPasswordViewBinding + lateinit var mBinding: CustomPasswordViewNewBinding constructor(context: Context?,attrs : AttributeSet?): super(context, attrs,0){ mContext=context // if(isInEditMode){ @@ -21,7 +21,7 @@ class CustomPasswordView : RelativeLayout { // }else{ mBinding = DataBindingUtil.inflate( LayoutInflater.from(context), - R.layout.custom_password_view, this,true) + R.layout.custom_password_view_new, this,true) // } mBinding.loginEtUserPassword.setTransformationMethod(PasswordTransformationMethod.getInstance()) mBinding.loginIvEye.setOnClickListener { diff --git a/app/src/main/res/drawable/ic_icon_bg_new.png b/app/src/main/res/drawable/ic_icon_bg_new.png new file mode 100644 index 0000000..30c5763 Binary files /dev/null and b/app/src/main/res/drawable/ic_icon_bg_new.png differ diff --git a/app/src/main/res/layout/activity_login_new.xml b/app/src/main/res/layout/activity_login_new.xml new file mode 100644 index 0000000..20d46cb --- /dev/null +++ b/app/src/main/res/layout/activity_login_new.xml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_password_view_new.xml b/app/src/main/res/layout/custom_password_view_new.xml new file mode 100644 index 0000000..0773ab8 --- /dev/null +++ b/app/src/main/res/layout/custom_password_view_new.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-xhdpi/ic_login_password.png b/app/src/main/res/mipmap-xhdpi/ic_login_password.png new file mode 100644 index 0000000..b8d2a28 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_login_password.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_login_phone.png b/app/src/main/res/mipmap-xhdpi/ic_login_phone.png new file mode 100644 index 0000000..db297b2 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_login_phone.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_healthy_bg.png b/app/src/main/res/mipmap-xxhdpi/ic_login_healthy_bg.png new file mode 100644 index 0000000..22a3de7 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_login_healthy_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_healthy_bg_green.png b/app/src/main/res/mipmap-xxhdpi/ic_login_healthy_bg_green.png new file mode 100644 index 0000000..8c6e01e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_login_healthy_bg_green.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_platform_bg.png b/app/src/main/res/mipmap-xxhdpi/ic_login_platform_bg.png new file mode 100644 index 0000000..161bd5a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_login_platform_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_login_platform_bg_green.png b/app/src/main/res/mipmap-xxhdpi/ic_login_platform_bg_green.png new file mode 100644 index 0000000..0b78b3a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_login_platform_bg_green.png differ diff --git a/config.gradle b/config.gradle index dd0409a..ad3f918 100644 --- a/config.gradle +++ b/config.gradle @@ -2,8 +2,8 @@ ext { minSdkVersion = 26 targetSdkVersion = 32 compileSdkVersion = 33 - versionCode = 102 - versionName = "1.0.2" + versionCode = 10003 + versionName = "1.00.03" //Dependencies junitVersion = "4.12" lifecycleVersion = "2.6.0-alpha01"