|
@@ -102,11 +102,9 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
|
|
}.start()
|
|
}.start()
|
|
val macAddr = NetHelper.getInstance().macAddress
|
|
val macAddr = NetHelper.getInstance().macAddress
|
|
val ipAddr = NetHelper.getInstance().localIP
|
|
val ipAddr = NetHelper.getInstance().localIP
|
|
- val server = UrlManager.build()
|
|
|
|
- var serverIp = ""
|
|
|
|
- if (server.buyer.length > 14) {
|
|
|
|
- serverIp = server.buyer.substring(7, 14)
|
|
|
|
- }
|
|
|
|
|
|
+ val buildUrl = UrlManager.build()
|
|
|
|
+ val serverIp = buildUrl.buyer.substringAfterLast("//").substringBefore(":")
|
|
|
|
+
|
|
tv_local_ip.text = "本机IP: " + ipAddr + ", server: " + serverIp
|
|
tv_local_ip.text = "本机IP: " + ipAddr + ", server: " + serverIp
|
|
tv_local_mac.text = "本机MAC: " + macAddr
|
|
tv_local_mac.text = "本机MAC: " + macAddr
|
|
tv_app_version.text = "APP版本: V" + BuildConfig.VERSION_NAME
|
|
tv_app_version.text = "APP版本: V" + BuildConfig.VERSION_NAME
|