Merge remote-tracking branch 'origin/release' into feature/yk_release

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_TEST;
-//    public static String appEnv = YDLConstants.ENV_PROD;
+    //    public static String appEnv = YDLConstants.ENV_TEST;
+    public static String appEnv = YDLConstants.ENV_PROD;
 
     //    public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
     @Override

config.gradle

 ext {
-    dev_mode = false //组件发布的时候需要设置为false
-    ydl2PublishVersion = "0.2.1.9-SNAPSHOT"
+    dev_mode = false//组件发布的时候需要设置为false
+    ydl2PublishVersion = "0.2.0.17"
     ydlPublishVersion = [
             // -------------- 业务模块 --------------
             //第三步 若干
@@ -8,7 +8,7 @@ ext {
             "m-consultant"    : "0.0.60.78",
             "m-fm"            : "0.0.30.09",
             "m-user"          : "0.0.62.72",
-            "m-home"          : "0.0.24.08",
+            "m-home"          : "0.0.24.09",
             "m-im"            : "0.0.21.69",
             "m-dynamic"       : "0.0.7.80",
             "m-article"       : "0.0.0.11",

m-article/src/main/java/data/ArticleListBean.kt

@@ -35,7 +35,7 @@ data class ArticleListBean(
 //"url": "https://h2.yidianling.com/article/12516"
 data class ArticleBean(
     val id:Int,
-    val readNum:Int,
+    val readNum:String = "0",
     val title:String,
     val desc:String,
     val imgUrl:String,
@@ -48,7 +48,7 @@ data class ArticleBean(
     val mUrl:String,
     val createTime:String,
     val createTimeFormat:String,
-    val zanNum:Int,
+    val zanNum:String = "0",
     val categoryId:Int,
     val commentTotal:Int,
     val label:String,

m-confide/build.gradle

@@ -65,8 +65,9 @@ dependencies {
 //    注意此处的依赖方式：kotlin中使用和java中使用方式有不同
     kapt "com.alibaba:arouter-compiler:$arouter_compiler"
     implementation 'com.alibaba:fastjson:1.2.38'
-    implementation "com.ydl:jjdxm-ijkplayer:0.0.33"
-
+    implementation(rootProject.ext.dependencies["ydl-ijkplayer-jjdxm"]) {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
     api rootProject.ext.dependencies["ydl-user-router"]
     if (rootProject.ext.dev_mode){
         //开发时使用

m-confide/src/main/java/com/ydl/confide/home/event/ConfideHomeEventImpl.kt

@@ -133,15 +133,17 @@ class ConfideHomeEventImpl(context: Context, var confideHomeView: IConfideHomeCo
      * @param linkUrl 跳转地址
      */
     override fun consultantClick(doctorId: String?, confideId: String?, uid: String?,listenFree : Boolean?, expertUrl:String?) {
-        confideId?.let {
+        doctorId?.let { doctorId ->
+            confideId?.let {confideId ->
                 ConfideBottomSheetDialogFragment()
                     .showBottomSheetDialog(
                         mContext as FragmentActivity,
-                    HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(it),
-                    doctorId!!, uid = uid, listenFree = listenFree ?: false,expertUrl = expertUrl?:""
+                        HttpConfig.MH5_URL + ConfideRoute.h5ConfideIntro(confideId),
+                        doctorId, uid = uid, listenFree = listenFree ?: false,expertUrl = expertUrl?:""
                     )
             }
         }
+    }
 
 
     override fun videoShowClick(index: Int, data: List<ConfideHomeBodyBean>?) {

m-confide/src/main/java/com/ydl/confide/intro/ItemIntroHolder.kt

@@ -433,7 +433,7 @@ internal fun VideoViewModel.mapOf(bean: ConfideHomeBodyBean): VideoViewModel {
     avatar.set(bean.confidedIcon)
     linkedUrl.set(bean.linkUrl)
     val num = bean.confideNum?.replace("人", "") ?: "0"
-    count.set("倾诉人次 $num")
+    count.set("服务人次 $num")
     intro.set(bean.confideContent)
     title.set(bean.title)
     val sb = StringBuilder()

m-confide/src/main/res/layout/confide_recommend_view_new.xml

@@ -116,7 +116,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_12"
                 android:textColor="#69696A"
-                android:text="倾诉人次"
+                android:text="服务人次"
                  />
         </LinearLayout>
         <LinearLayout

m-consultant/build.gradle

@@ -46,7 +46,9 @@ dependencies {
     kapt 'com.alibaba:arouter-compiler:1.2.2'
     implementation rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
     api rootProject.ext.dependencies["ydl-user-router"]
-    implementation "com.ydl:jjdxm-ijkplayer:0.0.33"
+    implementation(rootProject.ext.dependencies["ydl-ijkplayer-jjdxm"]) {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
     if (rootProject.ext.dev_mode){
         //开发时使用
         implementation project(":api:user")

m-consultant/src/main/java/com/yidianling/consultant/HotSearchActivity.kt

@@ -113,14 +113,11 @@ class HotSearchActivity : BaseMvpActivity<IHotSearchContract.View, IHotSearchCon
                 // 搜索的关联词
                 var relatedWords = ""
                 var isRecommendWords = false
-                if (!lenovoResultSuccess){   // 如果每次输入内容后联想词结果还没返回结果则直接进行搜索
-                    if (etSearch.text.toString().isNullOrEmpty()) {
-                        doSearch(etSearch.hint.toString(), relatedWords, isRecommendWords)
-                    } else {
+                if (!lenovoResultSuccess && !etSearch.text.toString()
+                        .isNullOrEmpty()
+                ) {   // 如果每次输入内容后联想词结果还没返回结果则直接进行搜索
                     doSearch(etSearch.text.toString(), relatedWords, isRecommendWords)
-                    }
-
-                }else if (searchSuggestList.isNotEmpty() && searchSuggestList.size > 0) {
+                } else if (searchSuggestList.isNotEmpty() && searchSuggestList.size > 0) {
                     if (searchSuggestList[0].suggest_relations.size > 0) {
                         relatedWords = searchSuggestList[0].suggest_relations[0]
                         isRecommendWords = true

m-home/src/main/java/com/yidianling/home/model/bean/HomeArticleBean.kt

@@ -26,7 +26,7 @@ class HomeArticleBean : HomeItemBaseBean {
         /**
          * 收藏数
          */
-        var countOfFavorite: Int = 0
+        var countOfFavorite: String = "0"
         var createTime: String? = null
         var createTimeFormat: String? = null
         /**
@@ -55,7 +55,7 @@ class HomeArticleBean : HomeItemBaseBean {
         /**
          * 阅读次数
          */
-        var readNum: Int = 0
+        var readNum: String = "0"
         /**
          * 120*120小头像
          */

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

@@ -121,7 +121,7 @@
                 android:layout_height="wrap_content"
                 android:textSize="@dimen/platform_sp_12"
                 android:textColor="#69696A"
-                android:text="倾诉人次"
+                android:text="服务人次"
                 />
         </LinearLayout>
         <LinearLayout

m-im/src/main/java/com/yidianling/im/config/NimSDKOptionConfig.java

@@ -82,7 +82,9 @@ class NimSDKOptionConfig {
         options.shouldConsiderRevokedMessageUnreadCount = true;
 
         options.mixPushConfig = buildMixPushConfig(configBean);
-
+        //https://faq.yunxin.163.com/kb/main/#/item/KB0373
+        //disableAwake为true来禁止后台进程唤醒UI进程。
+        options.disableAwake = true;
         return options;
     }
 

m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java

@@ -936,6 +936,10 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
     @SuppressLint("CheckResult")
     private void initMenu() {
         rela_zixun.setOnClickListener(view -> {
+            if (Utils.isFastClick()) {
+                //防止连击
+                return;
+            }
             if (sessionId != null && ActionHandlerStorage.getL(sessionId) != null && ActionHandlerStorage.getL(sessionId).getInfo() != null) {
                     if (serviceItemBeanList == null || serviceItemBeanList.size() == 0) {
                         ServiceImpl.Companion.getInstance().serviceList(ActionHandlerStorage.getL(sessionId).getInfo().doctorId)

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceItemView.kt

@@ -158,6 +158,12 @@ class ExpertConsultServiceItemView : LinearLayout {
         }
 
         im_expert_service_list_btn.setOnClickListener {
+            mContext?.let {context ->
+                if (!ImIn.loginByOneKeyLogin(context, true)) {
+                    return@setOnClickListener
+                }
+            }
+
             if (ImIn.getUserService().isBindPhone()) {
                 NewH5Activity.start(
                     mContext,

m-im/src/main/java/com/yidianling/uikit/custom/widget/expertConsultService/view/ExpertConsultServiceListDialog2.kt

@@ -82,6 +82,7 @@ class ExpertConsultServiceListDialog2(
 
 
         if (mList != null) {
+            dialog_ll_empty.visibility=View.GONE
             mList.forEach { item ->
                 typeList.add(item.cateName)
             }
@@ -92,6 +93,7 @@ class ExpertConsultServiceListDialog2(
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(Consumer<BaseAPIResponse<List<ServiceItemBean>>> { res: BaseAPIResponse<List<ServiceItemBean>> ->
                     if (res.data != null && res.data.size > 0) {
+                        dialog_ll_empty.visibility=View.GONE
                         var serviceItemBeanList = res.data
 
                         serviceItemBeanList.forEach { item ->
@@ -112,7 +114,7 @@ class ExpertConsultServiceListDialog2(
 
 
                     } else {
-                        ToastUtil.toastShort("咨询师暂未发布服务")
+                        dialog_ll_empty.visibility=View.VISIBLE
                     }
                 }, Consumer { throwable: Throwable? -> })
         }

m-im/src/main/res/layout/im_expert_consult_service_list_fragment_layout.xml

@@ -22,10 +22,41 @@
             android:layout_gravity="center" />
     </LinearLayout>
 
+    <LinearLayout
+        android:id="@+id/dialog_ll_empty"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/platform_dp_5"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <TextView
+            android:id="@+id/empty_tv_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:text="选择服务主题"
+            android:textStyle="bold"
+            android:textColor="#1C1F28"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/dialog_empty"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tv_title"
+            android:gravity="center_horizontal"
+            android:paddingTop="20dp"
+            android:text="暂未开通咨询服务"
+            android:textColor="@color/color_666666" />
+    </LinearLayout>
 
     <com.ydl.ydlcommon.view.NoScrollViewPager
         android:id="@+id/dialog_bottom_scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#ffffff"></com.ydl.ydlcommon.view.NoScrollViewPager>
+
+
 </LinearLayout>
\ No newline at end of file

ydl-media/build.gradle

@@ -39,8 +39,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    api(rootProject.ext.dependencies["" +
-            "ydl-ijkplayer-jjdxm"]) {
+    api(rootProject.ext.dependencies["ydl-ijkplayer-jjdxm"]) {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }