Merge remote-tracking branch 'origin/4.1.67' into 4.1.67

# Conflicts:
#	config.gradle

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -20,8 +20,8 @@ import java.util.List;
 public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
     //        public static String appEnv = YDLConstants.ENV_AUTO_TEST;
-    public static String appEnv = YDLConstants.ENV_TEST;
-//    public static String appEnv = YDLConstants.ENV_PROD;
+//    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_PROD;
 
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

config.gradle

@@ -11,7 +11,7 @@ ext {
             "m-user"          : "0.0.61.08",
             "m-home"          : "0.0.22.53",
             "m-im"            : "0.0.18.35",
-            "m-dynamic"       : "0.0.7.15",
+            "m-dynamic"       : "0.0.7.17",
             "m-article"       : "0.0.0.6",
 
             "m-muse"          : "0.0.28.20",
@@ -36,7 +36,7 @@ ext {
             "ydl-platform"    : "0.0.39.83",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.35",
+            "ydl-webview"     : "0.0.38.36",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.13",
             "m-audioim"       : "0.0.49.29.22",
@@ -92,9 +92,9 @@ ext {
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.04",
-            "m-home"          : "0.0.22.53",
+            "m-home"          : "0.0.22.54",
             "m-im"            : "0.0.18.34",
-            "m-dynamic"       : "0.0.7.16",
+            "m-dynamic"       : "0.0.7.17",
 
             "m-muse"          : "0.0.20.7",
             "m-tests"         : "0.0.24.9",
@@ -117,7 +117,7 @@ ext {
             "ydl-platform"    : "0.0.39.83",
 
             //第二步 若干
-            "ydl-webview"     : "0.0.38.35",
+            "ydl-webview"     : "0.0.38.36",
             "ydl-media"       : "0.0.21.6",
             "ydl-pay"         : "0.0.18.11",
             "m-audioim"       : "0.0.49.29.22",

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/TrendsListAdapter.java

@@ -250,7 +250,9 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
             holder.setVisibility(R.id.item_trend_title_tv, View.GONE);
         }
 
+        if (trend.comments!=null){
             showCommentsPart(holder, trend);
+        }
         LogUtil.d("head: " + trend.avatar + " pos：" + position);
         LogUtil.d("time: " + trend.timeStr + " source: " + trend.from);
         return holder.setHeadImageWithUrl(R.id.item_trend_user_head_iv, trend.avatar)       //头像

m-home/src/ydl/res/layout/home_button_banner_view.xml

@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/platform_color_FFFFFF"
             android:textSize="@dimen/platform_dp_12"
-            android:text="1W+师资"/>
+            android:text="2.2W+师资"/>
     </RelativeLayout>
 
     <RelativeLayout

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

@@ -1001,10 +1001,11 @@ public class NewH5Activity extends BaseActivity implements PtrHandler {
     }
 
     private void initShareMenu() {
-        tb_title.setRightIcon(getResources().getDrawable(R.drawable.web_common_share));
-        tb_title.setOnRightTextClick((view, isActive) -> {
-            share(null, null);
-        });
+        //暂时去掉分享按钮
+//        tb_title.setRightIcon(getResources().getDrawable(R.drawable.web_common_share));
+//        tb_title.setOnRightTextClick((view, isActive) -> {
+//            share(null, null);
+//        });
         LogUtil.d("setSeccessful");
     }