Merge branch 'dev' into feature/audio_xj

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -13,7 +13,6 @@ import android.util.Log
 import com.alibaba.android.arouter.launcher.ARouter
 import com.tbruyelle.rxpermissions2.RxPermissions
 import com.umeng.analytics.MobclickAgent
-import com.umeng.commonsdk.framework.UMModuleRegister.getAppContext
 import com.ydl.audioim.YDLavManager
 import com.ydl.component.music.MusicPlayActivity
 import com.ydl.component.mvp.DemoContract
@@ -137,7 +136,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
 
 
     override fun reLoadData() {
-        mPresenter?.loadUsers()
+        mPresenter.loadHome()
     }
 
 

config.gradle

@@ -44,10 +44,10 @@ ext {
             //第三步 若干
 
             "m-confide"       : "0.0.29",
-            "m-consultant"    : "0.0.42",
-            "m-course"        : "0.0.29",
+            "m-consultant"    : "0.0.44",
+            "m-course"        : "0.0.30",
             "m-fm"            : "0.0.21",
-            "m-muse"          : "0.0.18",
+            "m-muse"          : "0.0.19",
             "m-tests"         : "0.0.12",
             "m-user"          : "0.0.34",
 
@@ -251,7 +251,7 @@ ext {
             "ydl-utils"                    : "com.ydl:ydl-utils:${ydlCompileVersion["ydl-utils"]}",
 
             //flutter功能组件升级===>发布ydl-flutter组件===>引用flutter相关的业务模块
-            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.15@aar",
+            "ydl-flutter"                  : "com.ydl:ydl-flutter:0.0.16@aar",
 
             //基础组件 <<--- 先发这个，发完改这里的版本号
             "ydl-platform"                 : "com.ydl:ydl-platform:${ydlCompileVersion["ydl-platform"]}@aar",

m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt

@@ -44,7 +44,7 @@ class ConsultAssistantDialogUtils private constructor() {
                 }
             }
             "doctor_list" -> {
-                if (ConsultantIn.getUserImpl().getUserInfo()?.user_type == 1) {
+                if (!ConsultantIn.isLogin() || (ConsultantIn.getUserImpl().getUserInfo()?.user_type == 1 && ConsultantIn.isLogin())) {
                     shouldShowDialog(activity, origin, fromActivity = fromActivity)
                 }
             }

m-course/src/main/java/com/yidianling/course/courseNew/courseList/CourseListContainerActivity.kt

@@ -139,7 +139,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
             filter_layout.setTextColor(
                 ContextCompat.getColor(
                     this@CourseListContainerActivity,
-                    R.color.course_color_1DA1F2
+                    R.color.main_theme
                 )
             )
         } else {
@@ -233,7 +233,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                         classify_layout.setTextColor(
                             ContextCompat.getColor(
                                 this@CourseListContainerActivity,
-                                R.color.course_color_1DA1F2
+                                R.color.main_theme
                             )
                         )
                     } else {
@@ -330,7 +330,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     classify_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {
@@ -352,7 +352,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
             classify_layout.setTextColor(
                 ContextCompat.getColor(
                     this@CourseListContainerActivity,
-                    R.color.course_color_1DA1F2
+                    R.color.main_theme
                 )
             )
             classify_layout.setCompoundDrawablesWithIntrinsicBounds(
@@ -399,7 +399,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     filter_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {
@@ -421,7 +421,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
             filter_layout.setTextColor(
                 ContextCompat.getColor(
                     this@CourseListContainerActivity,
-                    R.color.course_color_1DA1F2
+                    R.color.main_theme
                 )
             )
             filter_layout.setCompoundDrawablesWithIntrinsicBounds(
@@ -642,7 +642,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     classify_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {
@@ -689,7 +689,7 @@ class CourseListContainerActivity : BaseActivity(), PtrHandler, LoadMoreHandler
                     filter_layout.setTextColor(
                         ContextCompat.getColor(
                             this@CourseListContainerActivity,
-                            R.color.course_color_1DA1F2
+                            R.color.main_theme
                         )
                     )
                 } else {

ydl-net/src/main/java/com/ydl/ydlnet/builder/config/OkHttpConfig.java

@@ -2,6 +2,7 @@ package com.ydl.ydlnet.builder.config;
 
 import android.content.Context;
 import android.text.TextUtils;
+
 import com.ydl.ydlnet.builder.cookie.CookieJarImpl;
 import com.ydl.ydlnet.builder.cookie.store.CookieStore;
 import com.ydl.ydlnet.builder.factory.ApiFactory;
@@ -9,19 +10,22 @@ import com.ydl.ydlnet.builder.http.SSLUtils;
 import com.ydl.ydlnet.builder.interceptor.HeaderInterceptor;
 import com.ydl.ydlnet.builder.interceptor.NetCacheInterceptor;
 import com.ydl.ydlnet.builder.interceptor.NoNetCacheInterceptor;
+import com.ydl.ydlnet.builder.interceptor.log.RequestHandler;
 import com.ydl.ydlnet.builder.interceptor.log.RequestLogInterceptor;
 import com.ydl.ydlnet.builder.manage.HttpUrlManager;
 import com.ydl.ydlnet.client.interfaces.BuildHeadersListener;
-import okhttp3.Cache;
-import okhttp3.Interceptor;
-import okhttp3.OkHttpClient;
 
-import javax.net.ssl.HostnameVerifier;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+import javax.net.ssl.HostnameVerifier;
+
+import okhttp3.Cache;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+
 /**
  * Created by haorui on 2019-09-02 .
  * Des: 统一OkHttp配置信息
@@ -80,6 +84,7 @@ public class OkHttpConfig {
         private InputStream bksFile;
         private String password;
         private InputStream[] certificates;
+        private RequestHandler requestHandler;
         private Interceptor[] interceptors;
         private Interceptor[] netInterceptors;
         private BuildHeadersListener buildHeadersListener;
@@ -99,6 +104,11 @@ public class OkHttpConfig {
             return this;
         }
 
+        public Builder setRequestHandler(RequestHandler requestHandler) {
+            this.requestHandler= requestHandler;
+            return this;
+        }
+
         public Builder setCache(boolean isCache) {
             this.isCache = isCache;
             return this;
@@ -210,9 +220,7 @@ public class OkHttpConfig {
          * 配置开发环境
          */
         private void setDebugConfig() {
-            if (isDebug) {
-                okHttpClientBuilder.addInterceptor(new RequestLogInterceptor());
-            }
+            okHttpClientBuilder.addInterceptor(new RequestLogInterceptor(isDebug,requestHandler));
         }
 
 

ydl-net/src/main/java/com/ydl/ydlnet/builder/interceptor/log/RequestHandler.java

+package com.ydl.ydlnet.builder.interceptor.log;
+
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+
+/**
+ * Created by haorui on 2019-11-26 .
+ * Des:
+ */
+public interface RequestHandler {
+    Response onHttpResultResponse(String httpResult, Interceptor.Chain chain, Response response);
+
+    Request onHttpRequestBefore(Interceptor.Chain chain, Request request);
+
+    RequestHandler EMPTY = new RequestHandler() {
+        @Override
+        public Response onHttpResultResponse(String httpResult, Interceptor.Chain chain, Response response) {
+            //不管是否处理,都必须将response返回出去
+            return response;
+        }
+
+        @Override
+        public Request onHttpRequestBefore(Interceptor.Chain chain, Request request) {
+            //不管是否处理,都必须将request返回出去
+            return request;
+        }
+    };
+
+}

ydl-net/src/main/java/com/ydl/ydlnet/builder/interceptor/log/RequestLogInterceptor.java

 package com.ydl.ydlnet.builder.interceptor.log;
 
 import android.support.annotation.Nullable;
+
 import com.ydl.ydlnet.utils.CharacterHandler;
 import com.ydl.ydlnet.utils.NetLogUtils;
 import com.ydl.ydlnet.utils.UrlEncoderUtils;
 import com.ydl.ydlnet.utils.ZipHelper;
-import okhttp3.*;
-import okio.Buffer;
-import okio.BufferedSource;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -15,14 +13,27 @@ import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+
+import okhttp3.Interceptor;
+import okhttp3.MediaType;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
 /**
  * Created by haorui on 2019-09-01 .
  * Des: 解析框架中的网络请求和响应结果并打印
  */
 public class RequestLogInterceptor implements Interceptor {
     private DefaultFormatPrinter mPrinter = new DefaultFormatPrinter();
+    private boolean mIsDebug ;
+    private RequestHandler mRequestHandler;
 
-    public RequestLogInterceptor() {
+    public RequestLogInterceptor(boolean isDebug, RequestHandler requestHandler) {
+        this.mIsDebug = isDebug;
+        this.mRequestHandler = requestHandler;
     }
 
     @Override
@@ -36,6 +47,8 @@ public class RequestLogInterceptor implements Interceptor {
             mPrinter.printFileRequest(request);
         }
 
+        if (mRequestHandler != null)
+            request = mRequestHandler.onHttpRequestBefore(chain, request);
 
         long t1 =System.nanoTime() ;
         Response originalResponse;
@@ -55,6 +68,10 @@ public class RequestLogInterceptor implements Interceptor {
             bodyString = printResult(request, originalResponse);
         }
 
+        if (mRequestHandler != null)
+            mRequestHandler.onHttpResultResponse(bodyString, chain, originalResponse);
+
+        if(mIsDebug) {
             final List<String> segmentList = request.url().encodedPathSegments();
             final String header = originalResponse.headers().toString();
             final int code = originalResponse.code();
@@ -69,6 +86,7 @@ public class RequestLogInterceptor implements Interceptor {
                 mPrinter.printFileResponse(TimeUnit.NANOSECONDS.toMillis(t2 - t1),
                         isSuccessful, code, header, segmentList, message, url);
             }
+        }
 
         return originalResponse;
     }

ydl-platform/build.gradle

@@ -83,7 +83,8 @@ dependencies {
 
     api rootProject.ext.dependencies["ydl-utils"]
     api rootProject.ext.dependencies["ydl-js"]
-    api rootProject.ext.dependencies["ydl-net"]
+//    api rootProject.ext.dependencies["ydl-net"]
+    api project(':ydl-net')
     api rootProject.ext.dependencies["ydl-js"]
     api rootProject.ext.dependencies["ptr-lib-release"]
     api(rootProject.ext.dependencies["ydl-device"]) {

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/GlobalConfig.kt

@@ -91,6 +91,7 @@ class GlobalConfig private constructor(var builder: Builder) {
             }
 
             apiFactory.setOkClient(okHttpClient)
+            HttpConfig.getInstance().initAuth()
         }
     }
 

ydl-platform/src/main/java/com/ydl/ydlcommon/base/config/HttpConfig.kt

 package com.ydl.ydlcommon.base.config
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.text.TextUtils
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import com.ydl.ydlcommon.base.BaseApp
+import com.ydl.ydlcommon.bean.AuthBean
 import com.ydl.ydlcommon.data.PlatformDataManager
+import com.ydl.ydlcommon.data.http.BaseAPIResponse
 import com.ydl.ydlcommon.data.http.EncryptUtils
+import com.ydl.ydlcommon.data.http.GsonProvider
+import com.ydl.ydlcommon.data.http.RxUtils
+import com.ydl.ydlcommon.data.http.api.ApiRequestUtil
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlnet.builder.config.OkHttpConfig
+import com.ydl.ydlnet.builder.interceptor.log.RequestHandler
+import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxAppTool
 import com.yidianling.common.tools.RxDeviceTool
-import okhttp3.FormBody
-import okhttp3.Interceptor
-import okhttp3.MultipartBody
-import okhttp3.OkHttpClient
+import com.yidianling.common.tools.ToastUtil
+import okhttp3.*
 import okio.Buffer
 import okio.BufferedSink
 import java.util.*
@@ -32,7 +38,10 @@ class HttpConfig {
         //====================应用默认配置====================
 
         private const val AUTHORIZATION_NAME = "Authorization"
+        private const val AUTHORIZATION_JAVA_NAME = "AuthorizationJava"
         private const val SESSION_KEY = "dc59cf294f37d237c1f06240568ffe21"
+        private var DYNAMIC_SESSION_KEY :String= "dc59cf294f37d237c1f06240568ffe21"
+
         private const val YDL = "Ydl"
         private const val UID = "uid"
         private const val FFROM = "ffrom"
@@ -43,6 +52,8 @@ class HttpConfig {
         private const val TOKEN = "accessToken"
         private val OS_TYPE = "osType"// 1.ios 2.android
         private val APP_NAME = "appName"//用于标识 是哪个应用 yidianling:用户版 xinlizixun：心理咨询 haoshi：情感壹点灵 zhuanjia：专家版
+        //验证签名失败
+        private val AUTH_INEFFECTIVE_CODE = "-201"
 
         //====================网络环境====================
 
@@ -75,6 +86,7 @@ class HttpConfig {
 
         return builder
             .setInterceptor(commonParams(),requestHead(appFrom))
+            .setRequestHandler(getRequestHandler())
             .setReadTimeout(15)
             .setWriteTimeout(15)
             .setConnectTimeout(15)
@@ -82,6 +94,35 @@ class HttpConfig {
             .build()
     }
 
+    private fun getRequestHandler():RequestHandler{
+        return object :RequestHandler{
+           override fun onHttpResultResponse(
+               httpResult: String,
+               chain: Interceptor.Chain,
+               response: Response
+           ): Response {
+               val gson = GsonProvider.getGson()
+               val resultData= gson.fromJson(httpResult, BaseAPIResponse::class.java)
+               when (resultData.code) {
+                   AUTH_INEFFECTIVE_CODE -> {
+                        //签证签名失败
+                        ToastUtil.toastShort(resultData.msg)
+                       //更新动态密钥
+                       if (resultData.data!=null){
+                           var authBean = gson.fromJson<AuthBean>(gson.toJson(resultData.data),AuthBean::class.java)
+                           DYNAMIC_SESSION_KEY = authBean?.appKey.toString()
+                       }
+                   }
+               }
+               return response
+           }
+
+           override fun onHttpRequestBefore(chain: Interceptor.Chain?, request: Request): Request {
+               return request
+           }
+
+       }
+    }
 
     // 添加公共参数
     private fun commonParams(): Interceptor {
@@ -202,6 +243,7 @@ class HttpConfig {
                     }
                 }
             }
+
             params.sortWith(Comparator { o1, o2 ->
                 val res = o1.name.compareTo(o2.name)
                 when {
@@ -214,14 +256,14 @@ class HttpConfig {
                 if (index != 0) paramsString.append("&")
                 paramsString.append("${param.name}=${param.value}")
             }
-            paramsString.append(SESSION_KEY)
-            val head = "$YDL ${EncryptUtils.encryptMD5ToString(
-                paramsString.toString()
-            )}"
+
+            val oldAuth = getOldAuth(paramsString)
+            val newAuth = getNewAuth(paramsString)
 
             val builder = it.request()
                 .newBuilder()
-                .header(AUTHORIZATION_NAME, head)
+                .header(AUTHORIZATION_NAME, oldAuth)
+                .header(AUTHORIZATION_JAVA_NAME, newAuth )
                 .addHeader("Connection", "close")
                 .addHeader(FFROM, PlatformDataManager.getRam().getChannelName())
                 .addHeader(IS_FROM_APP, "1")
@@ -243,6 +285,18 @@ class HttpConfig {
         }
     }
 
+    private fun getOldAuth(paramsString: StringBuilder): String {
+        paramsString.append(SESSION_KEY)
+        return "$YDL ${EncryptUtils.encryptMD5ToString(
+            paramsString.toString()
+        )}"
+    }
+
+    private fun getNewAuth(paramsString: StringBuilder): String {
+        //md5({静态秘钥} + {参数} + md5{动态秘钥(明文)}
+        return "$YDL ${EncryptUtils.encryptMD5ToString(SESSION_KEY+ paramsString.toString()+EncryptUtils.encryptMD5ToString(DYNAMIC_SESSION_KEY))}"
+    }
+
     //初始化网络环境
     fun initEnv(c: Context, env: String) {
         var appEnv = env
@@ -271,6 +325,20 @@ class HttpConfig {
         SERVER_COUPON_URL = properties.getProperty("javacouponurl.$appEnv")
     }
 
+    @SuppressLint("CheckResult")
+    fun initAuth(){
+        ApiRequestUtil.getDynamicToken()
+            .compose(RxUtils.applySchedulers())
+            .compose(RxUtils.resultJavaData())
+            .subscribe({
+                if (!TextUtils.isEmpty(it.appKey)){
+                    DYNAMIC_SESSION_KEY = it?.appKey.toString()
+                }
+            }) {
+                LogUtil.i("HttpConfig", it.toString())
+            }
+    }
+
     private object Holder {
         val INSTANCE = HttpConfig()
     }

ydl-platform/src/main/java/com/ydl/ydlcommon/bean/AuthBean.kt

+package com.ydl.ydlcommon.bean
+
+/**
+ * Created by haorui on 2019-11-26.
+ * Des:
+ */
+class AuthBean {
+
+    /**
+     * id : 1
+     * appId : android_zhuzhan
+     * appKey : 123456
+     * version : 4.0.00
+     */
+
+    var id: Int = 0
+    var appId: String? = null
+    var appKey: String? = null
+    var version: String? = null
+}

ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/api/ApiRequestUtil.java

 package com.ydl.ydlcommon.data.http.api;
 
 import com.google.gson.Gson;
+import com.ydl.ydlcommon.bean.AuthBean;
 import com.ydl.ydlcommon.bean.MustUP;
 import com.ydl.ydlcommon.data.http.BaseAPIResponse;
 import com.ydl.ydlcommon.data.http.BaseResponse;
@@ -8,12 +9,13 @@ import com.ydl.ydlcommon.data.http.FormatText;
 import com.ydl.ydlcommon.data.http.params.ActionDataBean;
 import com.ydl.ydlcommon.utils.NetworkParamsUtils;
 import com.ydl.ydlnet.YDLHttpUtils;
+
+import java.util.List;
+
 import io.reactivex.Observable;
 import okhttp3.MediaType;
 import okhttp3.RequestBody;
 
-import java.util.List;
-
 /**
  * 模块请求工具类
  * Created by hgw on 2018/1/23.
@@ -39,4 +41,12 @@ public class ApiRequestUtil {
         RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), new Gson().toJson(actionDataParams));
         return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).actionDataCount(body);
     }
+
+    /**
+     * 获取动态密钥
+     * @return
+     */
+    public static Observable<BaseAPIResponse<AuthBean>> getDynamicToken() {
+        return YDLHttpUtils.Companion.obtainApi(NetApiStore.class).getDynamicToken();
+    }
 }

ydl-platform/src/main/java/com/ydl/ydlcommon/data/http/api/NetApiStore.java

 package com.ydl.ydlcommon.data.http.api;
 
+import com.ydl.ydlcommon.bean.AuthBean;
 import com.ydl.ydlcommon.bean.MustUP;
 import com.ydl.ydlcommon.data.http.BaseAPIResponse;
 import com.ydl.ydlcommon.data.http.BaseResponse;
-import io.reactivex.Observable;
-import okhttp3.RequestBody;
-import retrofit2.http.*;
 
 import java.util.Map;
 
+import io.reactivex.Observable;
+import okhttp3.RequestBody;
+import retrofit2.http.Body;
+import retrofit2.http.FieldMap;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.Headers;
+import retrofit2.http.POST;
+
 import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN;
 import static com.ydl.ydlcommon.base.config.AppConfigKt.YDL_DOMAIN_JAVA;
 
@@ -32,4 +38,8 @@ interface NetApiStore {
     @POST("data/bigdata/maidian/writeMaiDianData")
     Observable<BaseAPIResponse<String>> actionDataCount(@Body RequestBody body);
 
+    @Headers(YDL_DOMAIN+ YDL_DOMAIN_JAVA)
+    @POST("risk/key/info")
+    Observable<BaseAPIResponse<AuthBean>> getDynamicToken();
+
 }