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 bb969ac..4c75158 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt +++ b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt @@ -5,14 +5,22 @@ import com.xjjk.healthyclients.utils.UrlH5RouteUtils import okhttp3.HttpUrl.Companion.toHttpUrl object UrlConfig { + + /** + * 公司内部地址 + * 接口: http://api-xj.tri.dt.io/ + * 后台: http://console-xj.tri.dt.io/ + */ + + // private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://192.168.1.23/" // 开发环境 - private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://cqyt.dev.yg.dt.io/" // 开发环境 - private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://xjgateway.mcrm.vip:8888" // 测试环境 + private const val DEBUG_DEFAULT_IP_ADDRESS_REMOTE = "http://api-xj.tri.dt.io/" // 开发环境 + private const val TEST_DEFAULT_IP_ADDRESS_REMOTE = "https://api-xj.tri.icdat.cn" // 测试环境 // private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api.xjygjk.com" // 正式环境 private const val PRODUCT_DEFAULT_IP_ADDRESS_REMOTE = "https://api-jkglpt.iosp.ydpt.tech" // 正式环境 - private const val DEBUG_H5_ADDRESS_REMOTE = "http://cms.dev.yg.dt.io" // 开发环境 - private const val TEST_H5_ADDRESS_REMOTE = "https://xjconsole.mcrm.vip:8888" // 测试环境 + private const val DEBUG_H5_ADDRESS_REMOTE = "http://console-xj.tri.dt.io" // 开发环境 + private const val TEST_H5_ADDRESS_REMOTE = "https://console-xj.tri.icdat.cn" // 测试环境 // private const val PRODUCT_H5_ADDRESS_REMOTE = "https://console.xjygjk.com" // 正式环境 private const val PRODUCT_H5_ADDRESS_REMOTE = "https://console-jkglpt.iosp.ydpt.tech" // 正式环境 //2025年10月23日 14:37 冯普说改为阿里云的地址,给油田部署的正式地址还没有启用 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 5d21781..b7de2c1 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 @@ -192,8 +192,8 @@ class LoginActivity : BaseVMBActivity(R showToast("请输入密码") } else if (!isRead) { showToast("请先阅读相关协议并勾选") - } else if ((passwordLength < 12 || passwordLength > 32)&&loginType==2) { - mTextViewDialog?.show() +// } else if ((passwordLength < 12 || passwordLength > 32)&&loginType==2) { +// mTextViewDialog?.show() } else { login( mBinding.loginEtUserName.text.toString().trim(),