Skip to content

Y
YDL-Component-Medical
Commit 6d5f0a7c by YKai
Options

feat: ui编写提交

parent a050a661
Showing with 89 additions and 30 deletions
app/src/main/java/com/ydl/component/music/FragmentContainerActivity.kt
......@@ -8,11 +8,8 @@ import com.ydl.component.mvp.DemoPresenter
import com.ydl.ydlcommon.bean.StatusBarOptions
import com.ydl.ydlcommon.mvp.lce.BaseLceActivity
import com.yidianling.consultant.ExpertSearchFragment
//import com.yidianling.consultant.ExpertSearchFragment
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import com.yidianling.home.ui.fragment.YdlHomeFragment
//import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
//import com.yidianling.home.ui.fragment.YdlHomeFragment
import com.yidianling.im.ui.page.NewMultiMessageFragment
import com.yidianling.medical.im.MeidicalChatFragment
import com.yidianling.tests.home.NewTestHomeFragment
......
m-course/build.gradle
......@@ -63,7 +63,7 @@ dependencies {
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
kapt 'com.alibaba:arouter-compiler:1.2.2'
api 'com.github.princekin-f:EasyFloat:1.3.2'
api 'com.github.princekin-f:EasyFloat:1.3.4'
api rootProject.ext.dependencies["ydl-user-router"]
api rootProject.ext.dependencies["butterknife"]
if (rootProject.ext.dev_mode){
......
m-im/src/main/java/com/yidianling/im/http/ImApi.kt
......@@ -83,10 +83,16 @@ interface ImApi {
fun getUnreadMessage(@QueryMap params: Map<String, String>): Observable<BaseAPIResponse<UnreadMessageBean>>
//私聊 获取私聊消息
@GET("chat/getPrivateMessageList")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
// @GET("chat/getPrivateMessageList")
// @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
// fun getAllChatMessage(@QueryMap params: Map<String, String>): Observable<BaseAPIResponse<ChatModelBean>>
//私聊 获取私聊消息
@GET("api/client/chat/v1/getSessionList")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA_URL)
fun getAllChatMessage(@QueryMap params: Map<String, String>): Observable<BaseAPIResponse<ChatModelBean>>
//私聊 获取通知消息
@GET("chat/getNotifyMessageList")
@Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
......
m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
......@@ -41,7 +41,6 @@ import com.netease.nimlib.sdk.msg.model.MessageReceipt;
import com.ydl.ydlcommon.data.http.RxUtils;
import com.ydl.ydlcommon.modular.ModularServiceManager;
import com.ydl.ydlcommon.utils.LogUtil;
import com.ydl.ydlcommon.utils.NetworkParamsUtils;
import com.ydl.ydlcommon.utils.SharedPreferencesEditor;
import com.ydl.ydlcommon.utils.log.AliYunLogConfig;
import com.ydl.ydlcommon.utils.log.AliYunRichLogsHelper;
......@@ -49,7 +48,6 @@ import com.ydl.ydlcommon.utils.log.LogHelper;
import com.ydl.ydlcommon.view.dialog.CommonDialog;
import com.yidianling.common.tools.ToastUtil;
import com.yidianling.im.R;
import com.yidianling.im.bean.GetExpert;
import com.yidianling.im.event.MultipleAnswerBean;
import com.yidianling.im.event.MultipleSelectedEvent;
import com.yidianling.im.helper.IMChatUtil;
......@@ -71,7 +69,6 @@ import com.yidianling.nimbase.common.fragment.TFragment;
import com.yidianling.uikit.api.NimUIKitImpl;
import com.yidianling.uikit.business.ait.AitManager;
import com.yidianling.uikit.business.session.activity.YDLBaseMessageActivity;
import com.yidianling.uikit.business.session.activity.YDLP2PMessageActivity;
import com.yidianling.uikit.business.session.helper.ChatStatusCacheHelper;
import com.yidianling.uikit.business.session.module.input.InputPanel;
import com.yidianling.uikit.business.session.module.list.MessageListPanelEx;
......@@ -442,7 +439,6 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
}
}
});
;
rootView.findViewById(R.id.action_call).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
......
m-im/src/main/res_uikit/drawable/shape_stroke_3464ec_r_8.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="8dp" />
<stroke
android:color="@color/medical_color_3464ec"
android:width="1dp" />
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/drawable/shape_stroke_8595a9_r_8.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="8dp" />
<stroke
android:color="@color/medical_color_8595a9"
android:width="1dp" />
</shape>
\ No newline at end of file
m-im/src/main/res_uikit/layout/im_nim_message_activity_bottom_layout.xml
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/messageActivityBottomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -12,4 +13,42 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
<LinearLayout
android:id="@+id/ll_start_chat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="16dp"
tools:visibility="visible"
android:visibility="gone">
<TextView
android:id="@+id/tv_prescribing_medication"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:text="复诊开药"
android:gravity="center"
android:textColor="#495c72"
android:textSize="16sp"
android:includeFontPadding="false"
android:fontFamily="sans-serif"
android:layout_marginEnd="22dp"
android:background="@drawable/shape_stroke_8595a9_r_8" />
<TextView
android:id="@+id/tv_ask_again"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_weight="1"
android:text="再次咨询"
android:gravity="center"
android:textColor="@color/medical_color_3464ec"
android:textSize="16sp"
android:includeFontPadding="false"
android:fontFamily="sans-serif"
android:background="@drawable/shape_stroke_3464ec_r_8" />
</LinearLayout>
</LinearLayout>
m-im/src/main/res_uikit/layout/im_nim_message_activity_text_layout.xml
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/textMessageLayout"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@color/white"
android:gravity="center_vertical">
<!--android:paddingTop="@dimen/bottom_component_margin_vertical"-->
<!--android:paddingBottom="@dimen/bottom_component_margin_vertical"-->
android:id="@+id/textMessageLayout"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="@color/white"
android:gravity="center_vertical">
<FrameLayout
android:id="@+id/switchLayout"
android:layout_width="wrap_content"
......@@ -42,6 +41,7 @@
<Button
android:id="@+id/audioRecord"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="10dp"
......@@ -52,7 +52,6 @@
android:textColor="@color/color_3D3D3D"
android:textSize="15sp"
android:textStyle="bold"
style="?android:attr/borderlessButtonStyle"
android:visibility="gone" />
</FrameLayout>
......@@ -75,10 +74,10 @@
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:hint="隐私保密，安心咨询"
android:layout_weight="1"
android:autoLink="all"
android:background="#F6F7F9"
android:hint="隐私保密，安心咨询"
android:maxHeight="72dp"
android:maxLines="4"
android:textColorHint="#CCCCCC"
......@@ -114,17 +113,17 @@
android:scaleType="center" />
<TextView
android:id="@+id/buttonSendMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/platform_bg_radius_5"
android:contentDescription="@string/im_empty"
android:gravity="center"
android:padding="5dp"
android:text="@string/im_send"
android:textColor="@color/platform_but_text_color"
android:textSize="14sp" />
android:id="@+id/buttonSendMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/platform_bg_radius_5"
android:contentDescription="@string/im_empty"
android:gravity="center"
android:padding="5dp"
android:text="@string/im_send"
android:textColor="@color/platform_but_text_color"
android:textSize="14sp" />
</FrameLayout>
</RelativeLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment