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

config.gradle

@@ -10,7 +10,7 @@ ext {
             "m-fm"            : "0.0.30.04",
             "m-user"          : "0.0.62.02",
             "m-home"          : "0.0.23.16",
-            "m-im"            : "0.0.21.21",
+            "m-im"            : "0.0.21.24",
             "m-dynamic"       : "0.0.7.35",
             "m-article"       : "0.0.0.10",
 
@@ -36,7 +36,7 @@ ext {
             "ydl-tuicore"   : "0.0.14",
 //            "m-tuicore-ydl"   : "0.0.10",
             //第一步
-            "ydl-platform"    : "0.0.40.90",
+            "ydl-platform"    : "0.0.40.95",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.58",
@@ -48,7 +48,7 @@ ext {
             //以下 几乎不会动
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.93",
-            "ydl-utils"       : "0.0.3.2",
+            "ydl-utils"       : "0.0.3.3",
     ]
     ydl_app = [
             appName      : "心理咨询壹点灵",
@@ -121,7 +121,7 @@ ext {
             "ydl-tuicore"   : "0.0.9",
             "m-tuicore-ydl"   : "0.0.10",
             //第一步
-            "ydl-platform"    : "0.0.40.90",
+            "ydl-platform"    : "0.0.40.95",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.58",
@@ -133,7 +133,7 @@ ext {
             //以下 几乎不会动
             "router"          : "0.0.1",
             "ydl-net"         : "0.0.3.93",
-            "ydl-utils"       : "0.0.3.1",
+            "ydl-utils"       : "0.0.3.3",
     ]
 
     dependencies = [

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

@@ -114,9 +114,8 @@ public class YDLTeamMessageFragment extends YDLMessageFragment {
 //                    list.add("删除聊天记录");
 //                }
                 list.add("删除聊天记录");
-                ListDialog.Builder dialog = new ListDialog.Builder(getContext(), list, 0);
+                ListDialog.Builder dialog = new ListDialog.Builder(getContext(), list, 0, team.getName());
                 list.add("取消");
-
                 dialog.create().show();
 
                 dialog.SetOnItemClickLister(new ListDialog.Builder.OnItemClickLister() {

ydl-platform/src/main/java/com/ydl/ydlcommon/view/dialog/ListDialog.java

@@ -15,6 +15,8 @@ import com.ydl.ydlcommon.adapter.DialogListAdapter;
 import com.ydl.ydlcommon.view.FullyLinearLayoutManager;
 import com.ydl.ydlcommon.R;
 
+import org.w3c.dom.Text;
+
 import java.util.List;
 
 //import com.yidianling.common.view.FullyLinearLayoutManager;
@@ -42,6 +44,8 @@ public class ListDialog extends Dialog {
         private View contentView; //对话框中间加载的其他布局界面
         private DialogListAdapter adapter;
         private String last_str; //最后一个按钮
+        private String titleStr; //标题内容
+
         private OnClickListener Last_btnClickListener;
         private int itemTextColor;
 
@@ -53,12 +57,17 @@ public class ListDialog extends Dialog {
 
         private ListDialog.Builder.OnItemClickLister mOnItemClickLister;
 
+        public Builder(Context context, List<String> mDatas, int itemTextColor,String titleStr) {
+            this.context = context;
+            this.mDatas = mDatas;
+            this.itemTextColor = itemTextColor;
+            this.titleStr=titleStr;
+        }
         public Builder(Context context, List<String> mDatas, int itemTextColor) {
             this.context = context;
             this.mDatas = mDatas;
             this.itemTextColor = itemTextColor;
         }
-
         /**
          * 设置对话框界面
          *
@@ -80,7 +89,6 @@ public class ListDialog extends Dialog {
             return this;
         }
 
-
         public ListDialog.Builder SetLastStr(String bottom) {
             this.last_str = bottom;
             return this;
@@ -129,7 +137,18 @@ public class ListDialog extends Dialog {
                 layout.findViewById(R.id.last_btn).setVisibility(
                         View.GONE);
             }
-
+            if (titleStr!=null){
+                layout.findViewById(R.id.titleLine).setVisibility(
+                        View.VISIBLE);
+                layout.findViewById(R.id.title).setVisibility(
+                        View.VISIBLE);
+                ((TextView)layout.findViewById(R.id.title)).setText(titleStr);
+            }else{
+                layout.findViewById(R.id.titleLine).setVisibility(
+                        View.GONE);
+                layout.findViewById(R.id.title).setVisibility(
+                        View.GONE);
+            }
             if (mDatas != null && mDatas.size() > 0) {
                 RecyclerView dialog_list_rcv = (RecyclerView) layout.findViewById(R.id.dialog_list_rcv);
                 if (adapter == null) {

ydl-platform/src/main/res/layout/ydl_platform_dialog_list_layout.xml

+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_gravity="center"
+        >
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="3"
+            android:minWidth="200dp"
+            android:background="@drawable/dialog_list_bg"
+            android:orientation="vertical"
+            android:scrollbars="vertical">
+           <androidx.recyclerview.widget.RecyclerView
+               android:layout_marginTop="5dp"
+               android:id="@+id/dialog_list_rcv"
+               android:layout_width="match_parent"
+               android:layout_height="match_parent"></androidx.recyclerview.widget.RecyclerView>
+            <TextView
+                android:id="@+id/last_btn"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:textSize="18sp"
+                android:gravity="center"
+                android:layout_marginBottom="5dp"
+                android:background="@drawable/normaldialog_right_btn_select"
+                android:text="确定"/>
+        </LinearLayout>
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file

ydl-utils/src/main/res/layout/dialog_list_layout.xml

@@ -18,6 +18,24 @@
             android:background="@drawable/dialog_list_bg"
             android:orientation="vertical"
             android:scrollbars="vertical">
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="我是title"
+                android:paddingTop="5dp"
+                android:id="@+id/title"
+                android:visibility="gone"
+                android:paddingBottom="5dp"
+                >
+            </TextView>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="0.5dip"
+                android:id="@+id/titleLine"
+                android:visibility="gone"
+                android:layout_below="@+id/item_dialog_tv"
+                android:background="#D1D1D1" />
            <androidx.recyclerview.widget.RecyclerView
                android:layout_marginTop="5dp"
                android:id="@+id/dialog_list_rcv"