Explorar el Código

1.登录接口添加设备序列号吗

王鹏鹏 hace 2 años
padre
commit
025b2d936a

+ 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", "\"http://192.168.0.128:7112\""
+            buildConfigField "String", "API_URL", "\"http://60.205.201.7:7112\""
             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", "\"http://192.168.0.128:7112\""
+            buildConfigField "String", "API_URL", "\"http://60.205.201.7:7112\""
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

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

@@ -1,6 +1,7 @@
 package com.yingyangfly.baselib.dialog
 
 import android.content.Context
+import android.os.Build
 import android.os.Bundle
 import android.text.SpannableString
 import android.text.Spanned
@@ -38,6 +39,7 @@ class BindingPhoneDialog : DialogFragment() {
     private var btnBinding: AppCompatButton? = null
     private var rxTimer: RxTimer? = null
     private var mContent: Context? = null
+    private var snCode: String = ""
 
     var onDialogClickListener: ((bean: String) -> Unit)? = null
 
@@ -82,6 +84,11 @@ class BindingPhoneDialog : DialogFragment() {
 
     private fun init() {
         rxTimer = RxTimer()
+        snCode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            Build.getSerial()
+        } else {
+            Build.SERIAL
+        }
 
     }
 
@@ -146,7 +153,7 @@ class BindingPhoneDialog : DialogFragment() {
      */
     private fun login() {
         BaselibServiceFactory.getService()
-            .largeLoginMsg(editPhone?.text.toString().trim(), editCode?.text.toString().trim())
+            .largeLoginMsg(editPhone?.text.toString().trim(), editCode?.text.toString().trim(), snCode)
             .subscribeOn(Schedulers.io()).compose(MyRxScheduler.ioMain(mContent!!, true))
             .subscribe(object : BaseObserver<String>() {
                 override fun onSuccess(t: String?) {

+ 2 - 1
baselib/src/main/java/com/yingyangfly/baselib/net/BaselibApiService.kt

@@ -66,7 +66,8 @@ interface BaselibApiService {
     @POST("large-screen/loginMsg")
     fun largeLoginMsg(
         @Query("mobile") mobile: String,
-        @Query("checkCode") checkCode: String
+        @Query("checkCode") checkCode: String,
+        @Query("sn") sn: String
     ): Observable<XBaseEntity<String>>
 
 }

+ 1 - 8
evaluation/src/main/java/com/yingyangfly/evaluation/hospital/HospitalActivity.kt

@@ -26,6 +26,7 @@ import com.yingyangfly.baselib.utils.User
 import com.yingyangfly.evaluation.R
 import com.yingyangfly.evaluation.databinding.ActivityHospitalBinding
 import com.youth.banner.indicator.RectangleIndicator
+import java.lang.reflect.Method
 
 
 /**
@@ -50,19 +51,11 @@ class HospitalActivity : BaseTvMVVMActivity<ActivityHospitalBinding, HospitalVie
     @SuppressLint("SetTextI18n")
     override fun initViews() {
         voicePlayer = VoicePlayer.getInstance(mContext)
-        initPermission()
         adapterGuide = GuidePageAdapter(imageList, mContext)
         binding.guide.addBannerLifecycleObserver(this)?.setAdapter(adapterGuide)?.indicator =
             RectangleIndicator(mContext)
     }
 
-    /**
-     * 获取权限
-     */
-    private fun initPermission() {
-
-    }
-
     @SuppressLint("ClickableViewAccessibility")
     override fun initListener() {
         binding {