add 适配网络框架

CommonLib/Common/src/main/java/com/yidian/common/http/HttpParamsUtils.kt

@@ -12,15 +12,15 @@ class HttpParamsUtils{
             val networkType = NetWorkUtils.getNetWorkType(YdBaseApplication.context)
             val timeStamp = System.currentTimeMillis()
             val queryParamsMap = HashMap<String, String>()
-            queryParamsMap["appid"] = AppConfig.appid
-            queryParamsMap["cv"] = AppConfig.cv
-            queryParamsMap["version"] = AppConfig.version
-            queryParamsMap["distribution"] = AppConfig.distribution
-            queryParamsMap["net_type"] = networkType
-            queryParamsMap["platform"] = AppConfig.platform
-            queryParamsMap["equipment_id"] = getEquipmentId()
-            queryParamsMap["request_id"] = getRequestId(timeStamp)
-            queryParamsMap["sign_string"] = getSignString(timeStamp)
+//            queryParamsMap["appid"] = AppConfig.appid
+//            queryParamsMap["cv"] = AppConfig.cv
+//            queryParamsMap["version"] = AppConfig.version
+//            queryParamsMap["distribution"] = AppConfig.distribution
+//            queryParamsMap["net_type"] = networkType
+//            queryParamsMap["platform"] = AppConfig.platform
+//            queryParamsMap["equipment_id"] = getEquipmentId()
+//            queryParamsMap["request_id"] = getRequestId(timeStamp)
+//            queryParamsMap["sign_string"] = getSignString(timeStamp)
             return queryParamsMap
         }
 

CommonLib/Common/src/main/java/com/yidian/common/http/URLs.kt

@@ -6,7 +6,7 @@ class URLs {
     companion object{
         val BASE_URL: String
 
-        private const val BASE_URL_DEBUG = "http://metro-test.go2yd.com"
+        private const val BASE_URL_DEBUG = "http://merchant.test.yidian-inc.com"
         private const val BASE_URL_PRO = "http://metro.go2yd.com"
 
         init {
@@ -42,5 +42,6 @@ class URLs {
         const val collectList = "/user/collect/list"
         const val subscribeAuthorList = "/user/subscribe/list"
         const val pushTokenAndroid = "/push/token/android"
+        const val authPersonalGetToken = "/auth/personal/get_token"
     }
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/ApiService.kt

@@ -22,6 +22,23 @@ import org.json.JSONObject
 class ApiService {
     companion object {
 
+        //获取活体检测接口
+        fun authPersonalGetToken(apiCallback: AuthPersonalGetTokenCallback, requestParams: HashMap<String, String>) {
+            val paramsMap = HttpParamsUtils.getParamsMap()
+            ServiceFactory.getInstance().createService(CommonService::class.java)
+                .authPersonalGetToken(paramsMap, requestParams)
+                .compose(TransformUtil.defaultSchedulers())
+                .subscribe(object : HttpResultSubscriber<Any?>() {
+                    override fun onSuccess(result: HttpResult<Any?>?) {
+                        apiCallback.getTokenSuccess(result)
+                    }
+
+                    override fun onFailer(result: HttpResult<Any?>?) {
+
+                    }
+                })
+        }
+
         //游客登录接口
         fun guestLogin(apiCallback: IGuestLoginCallback, requestParams: GuestLoginBean.Request) {
             val paramsMap = HttpParamsUtils.getParamsMap()
@@ -468,5 +485,7 @@ class ApiService {
                     }
                 })
         }
+
+
     }
 }

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/CommonService.kt

@@ -101,4 +101,7 @@ interface CommonService {
     @POST(URLs.pushTokenAndroid)
     fun pushTokenAndroid(@QueryMap commonParams: Map<String, String>, @Body requestParams: PushTokenAndroidBean.Request): Observable<HttpResult<Any?>>
 
+    @GET(URLs.authPersonalGetToken)
+    fun authPersonalGetToken(@QueryMap commonParams: Map<String, String>, @QueryMap requestParams: Map<String, String>): Observable<HttpResult<Any?>>
+
 }
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/http/httpbean/AuthPersonalGetTokenCallback.kt

+package com.yidian.shenghuoquan.newscontent.http.httpbean
+
+import com.yidian.common.http.HttpResult
+
+interface AuthPersonalGetTokenCallback {
+    fun getTokenSuccess(t: HttpResult<Any?>?)
+}
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/alive/AliveTestActivity.kt

@@ -2,10 +2,12 @@ package com.yidian.shenghuoquan.newscontent.ui.alive
 
 import android.os.Bundle
 import android.util.Log
-import android.widget.Toast
 import com.yidian.common.AppConfig
 import com.yidian.common.base.BaseActivity
+import com.yidian.common.http.HttpResult
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityAliveLayoutBinding
+import com.yidian.shenghuoquan.newscontent.http.ApiService
+import com.yidian.shenghuoquan.newscontent.http.httpbean.AuthPersonalGetTokenCallback
 
 /**
  * Author: sym
@@ -38,7 +40,17 @@ class AliveTestActivity : BaseActivity<ActivityAliveLayoutBinding>() {
 
     private fun setOnListener() {
         viewBind.btActionYy.setOnClickListener {
-            Toast.makeText(this, "click", Toast.LENGTH_SHORT).show()
+            val requestMap = HashMap<String, String>()
+            requestMap["id_card"] = "13010519881211121X"
+            requestMap["name"] = "宋永孟"
+            ApiService.authPersonalGetToken(authPersonalGetTokenCallback, requestMap)
         }
     }
+
+    private val authPersonalGetTokenCallback = object : AuthPersonalGetTokenCallback {
+        override fun getTokenSuccess(t: HttpResult<Any?>?) {
+            Log.d("song_test", t.toString())
+        }
+
+    }
 }
\ No newline at end of file