diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7ad0e25..eb558f8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -61,11 +61,11 @@ android:name=".MyApplication" android:allowBackup="false" android:allowNativeHeapPointerTagging="false" - android:icon="@drawable/ic_icon" + android:icon="@drawable/ic_icon2" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="false" - android:roundIcon="@drawable/ic_icon" + android:roundIcon="@drawable/ic_icon2" android:supportsRtl="true" android:taskAffinity="com.xjjk.healthyclients" android:theme="@style/Theme.HearthyClients" diff --git a/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt index a078a75..19a2059 100644 --- a/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt +++ b/app/src/main/java/com/xjjk/healthyclients/bean/emergency/LocationResourceBean.kt @@ -20,7 +20,7 @@ data class LocationResourceBean( val level_dictText: String = "", val longitude: Double = 0.0, val memo: Any = "", - val mobile: String = "", + val mobile: String? = "", val managePhone: String = "", val name: String = "", val province: String = "", diff --git a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt index 089c43d..497291e 100644 --- a/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt +++ b/app/src/main/java/com/xjjk/healthyclients/fragment/EmergencyFragment.kt @@ -372,14 +372,14 @@ class EmergencyFragment : it.fragmentEmergencyHospitalTag.text = bean?.level_dictText } it.fragmentEmergencyHospitalName.text = bean?.name - if (bean?.managePhone == null) { + if (bean?.mobile == null) { it.fragmentEmergencyPhone.visibility = View.GONE it.fragmentEmergencyHospitalLandline.visibility = View.GONE } else { it.fragmentEmergencyPhone.visibility = View.VISIBLE it.fragmentEmergencyHospitalLandline.visibility = View.VISIBLE } - it.fragmentEmergencyHospitalLandline.text = bean?.managePhone + it.fragmentEmergencyHospitalLandline.text = bean?.mobile it.fragmentEmergencyHospitalAddress.text = bean?.address it.fragmentEmergencyCardNavigation.visibility = View.VISIBLE } 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 a1405c7..86fcd3c 100644 --- a/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt +++ b/app/src/main/java/com/xjjk/healthyclients/retrofit/UrlConfig.kt @@ -15,7 +15,7 @@ object UrlConfig { private const val TEST_H5_ADDRESS_REMOTE = "https://xjconsole.mcrm.vip:8888" // 测试环境 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 冯普说改为之前的地址,给油田部署的正式地址还没有启用 + //2025年10月23日 14:37 冯普说改为阿里云的地址,给油田部署的正式地址还没有启用 val baseUrlType: BaseUrlType = BaseUrlType.PRODUCT diff --git a/app/src/main/java/com/xjjk/healthyclients/utils/LocationManager.kt b/app/src/main/java/com/xjjk/healthyclients/utils/LocationManager.kt index 4a92c28..8ea3b98 100644 --- a/app/src/main/java/com/xjjk/healthyclients/utils/LocationManager.kt +++ b/app/src/main/java/com/xjjk/healthyclients/utils/LocationManager.kt @@ -66,7 +66,7 @@ class LocationManager( // bean.address = aMapLocation.address // bean.locationDetail = locationDetail // locationCallBack!!.onLocationInfo(bean) - println("定位${aMapLocation.latitude}--${aMapLocation.longitude}") + Logger.i("定位${aMapLocation.latitude}--${aMapLocation.longitude}") ConstantUtils.mCurrentLat=aMapLocation.latitude ConstantUtils.mCurrentLon=aMapLocation.longitude //保存经纬度到本地文件(长链接没有连接时) diff --git a/app/src/main/res/drawable/ic_icon2.png b/app/src/main/res/drawable/ic_icon2.png new file mode 100644 index 0000000..7a4e6ab Binary files /dev/null and b/app/src/main/res/drawable/ic_icon2.png differ diff --git a/config.gradle b/config.gradle index ad3f918..23d91ad 100644 --- a/config.gradle +++ b/config.gradle @@ -2,8 +2,8 @@ ext { minSdkVersion = 26 targetSdkVersion = 32 compileSdkVersion = 33 - versionCode = 10003 - versionName = "1.00.03" + versionCode = 10004 + versionName = "1.00.04" //Dependencies junitVersion = "4.12" lifecycleVersion = "2.6.0-alpha01"