Bladeren bron

ncse量表开发

hurixing 1 jaar geleden
bovenliggende
commit
7ce49f5403

+ 2 - 2
baselib/build.gradle

@@ -37,7 +37,7 @@ android {
             buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"4463350aea\""
-            buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-large-api-dev\""
+            buildConfigField "String", "API_URL", "\"https://yaorong.yaorongmedical.com/hcp-large-api\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 
@@ -48,7 +48,7 @@ android {
             buildConfigField "String", "TENCENT_LICENCEKEY", "\"0258811f9d756fea82c9a2d2cbd439bd\""
             buildConfigField "Boolean", "SINGLE_MODULE", "${singleModule}"
             buildConfigField "String", "BUGLY_APPID", "\"9012406761\""
-            buildConfigField "String", "API_URL", "\"https://www.yingyangfly.com/hcp-large-api-uat\""
+            buildConfigField "String", "API_URL", "\"https://yaorong.yaorongmedical.com/hcp-large-api\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

+ 4 - 1
baselib/src/main/java/com/yingyangfly/baselib/dialog/BindingPhoneDialog.kt

@@ -3,6 +3,7 @@ package com.yingyangfly.baselib.dialog
 import android.content.Context
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.TextUtils
@@ -89,7 +90,9 @@ class BindingPhoneDialog : DialogFragment() {
         } else {
             Build.SERIAL
         }
-
+        if (("unknown").equals(snCode)){
+            snCode = Settings.Secure.getString(User.context.getContentResolver(), Settings.Secure.ANDROID_ID);
+        }
     }
 
     private fun initListener() {

+ 5 - 0
evaluation/src/main/java/com/yingyangfly/evaluation/hospital/HospitalActivity.kt

@@ -2,6 +2,7 @@ package com.yingyangfly.evaluation.hospital
 
 import android.annotation.SuppressLint
 import android.os.Build
+import android.provider.Settings
 import android.text.TextUtils
 import android.view.MotionEvent
 import android.view.View
@@ -24,6 +25,7 @@ import com.yingyangfly.baselib.utils.JumpUtil
 import com.yingyangfly.baselib.utils.LiveEventBusUtil
 import com.yingyangfly.baselib.utils.RxBusCodes
 import com.yingyangfly.baselib.utils.User
+import com.yingyangfly.baselib.utils.User.context
 import com.yingyangfly.evaluation.R
 import com.yingyangfly.evaluation.databinding.ActivityHospitalBinding
 import com.youth.banner.indicator.RectangleIndicator
@@ -208,6 +210,9 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
             } else {
                 Build.SERIAL
             }
+            if (("unknown").equals(snCode)){
+                snCode = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+            }
             binding.tvSnCode.text = "终端号:$snCode"
             if (TextUtils.isEmpty(snCode).not()) {
                 getSlideShowList()