Merge remote-tracking branch 'origin/4.2.40(复联迁移)' into 4.2.40(复联迁移)

# Conflicts:
#	config.gradle

config.gradle

@@ -33,10 +33,10 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.40.05",
+            "ydl-platform"    : "0.0.40.06",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.45",
+            "ydl-webview"     : "0.0.38.46",
             "ydl-media"       : "0.0.21.9",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.37",
@@ -115,10 +115,10 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.40.05",
+            "ydl-platform"    : "0.0.40.06",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.45",
+            "ydl-webview"     : "0.0.38.46",
             "ydl-media"       : "0.0.21.9",
             "ydl-pay"         : "0.0.18.19",
             "m-audioim"       : "0.0.49.29.37",

ydl-platform/src/main/res/values/arrays.xml

@@ -5,11 +5,14 @@
         <item>https://testh2.yidianling.com/experts/</item>
         <item>https://h2.yidianling.com/experts/</item>
         <item>https://h2.yidianling.com/zx/experts/</item>
+        <item>https://h2.yidianling.com/jy/experts/</item>
         <item>https://testh2.yidianling.com/zx/experts/</item>
-        <item>https://testnewm.ydl.com/zx/experts/</item>
         <item>https://testnewm.ydl.com/experts/</item>
+        <item>https://testnewm.ydl.com/zx/experts/</item>
+        <item>https://testnewm.ydl.com/jy/experts/</item>
         <item>https://m.ydl.com/experts/</item>
         <item>https://m.ydl.com/zx/experts/</item>
+        <item>https://m.ydl.com/jy/experts/</item>
         <item>http://192.168.40.16/zx/experts/</item>
 
         <item>https://m.ydl.com/course/Detail/v2/</item>

ydl-webview/src/main/java/com/ydl/webview/NewH5Activity.java

@@ -689,6 +689,9 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
             @Override
             public void onReceivedTitle(WebView view, String title) {
                 super.onReceivedTitle(view, title);
+                if (TextUtils.isEmpty(h5Params.getTitle())){
+                    tb_title.setTitle(title);
+                }
                 wv_content.setTitle(title);
                 if ("我的订单".equals(title)) {
                     safeTipView.setVisibility(View.VISIBLE);