Browse Source

1.修改IM样式

王鹏鹏 2 years ago
parent
commit
d1a7507ac2

+ 9 - 0
.idea/misc.xml

@@ -262,6 +262,15 @@
         <entry key="..\:/workspace/hcp-pad/setting/src/main/res/layout/activity_setting.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/superplayerkit/src/main/res/drawable/superplayer_biz_video_progressbar.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/tuibeauty/src/main/res/layout/tuibeauty_view_panel.xml" value="0.22826086956521738" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/drawable/action_audio_selector.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/drawable/action_more_selector.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/drawable/message_send_border.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/drawable/msg_editor_border.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/drawable/my_cursor.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/layout/chat_fragment.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/layout/chat_input_layout.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/layout/chat_layout.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pad/tuichat/src/main/res/layout/reply_preview_layout.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pad/tuigift/src/main/res/drawable/tuigift_bg_bottom_dialog.xml" value="0.2265" />
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_bridge_web.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/webview/src/main/res/layout/activity_webview.xml" value="0.22826086956521738" />

+ 13 - 9
healthconsultation/src/main/java/com/yingyang/healthconsultation/activity/HealthConsultationActivity.kt

@@ -12,10 +12,13 @@ import com.tencent.imsdk.v2.V2TIMConversation
 import com.tencent.imsdk.v2.V2TIMManager
 import com.tencent.qcloud.tuicore.TUIConstants
 import com.tencent.qcloud.tuicore.TUICore
+import com.tencent.qcloud.tuicore.TUILogin
+import com.tencent.qcloud.tuicore.interfaces.TUICallback
 import com.yingyang.healthconsultation.R
 import com.yingyang.healthconsultation.adapter.ConsultationAdapter
 import com.yingyang.healthconsultation.adapter.RecommendDoctorAdapter
 import com.yingyang.healthconsultation.databinding.ActivityHealthConsultationBinding
+import com.yingyangfly.baselib.config.AccountConfig
 import com.yingyangfly.baselib.db.DoctorBean
 import com.yingyangfly.baselib.ext.getEndAnimation
 import com.yingyangfly.baselib.ext.getScaleAnimation
@@ -197,24 +200,25 @@ class HealthConsultationActivity :
      *
      */
     private fun loginIM(sign: String, bean: DoctorBean) {
-        V2TIMManager.getInstance().login(User.getUserId(), sign, object : V2TIMCallback {
-            override fun onError(p0: Int, p1: String?) {
-                runOnUiThread {
-                    //用户登录IM失败
-                    CrashReport.postCatchedException(Throwable(User.getName() + "用户登录IM失败,错误码:" + p0 + " ,错误信息:" + p1))
-                }
-            }
-
+        TUILogin.login(mContext, AccountConfig.TENCENT_IM_APPID, User.getUserId(), sign, object :
+            TUICallback() {
             override fun onSuccess() {
                 runOnUiThread {
+                    "IM登陆成功".toast()
                     val param = Bundle()
                     param.putInt(TUIConstants.TUIChat.CHAT_TYPE, V2TIMConversation.V2TIM_C2C)
                     param.putString(TUIConstants.TUIChat.CHAT_ID, bean.id)
-                    param.putString(TUIConstants.TUIChat.CHAT_NAME, "你好")
+                    param.putString(TUIConstants.TUIChat.CHAT_NAME, bean.userName)
                     param.putString(TUIConstants.TUIChat.FACE_URL, bean.avatar)
                     TUICore.startActivity(TUIConstants.TUIChat.C2C_CHAT_ACTIVITY_NAME, param)
                 }
             }
+
+            override fun onError(errorCode: Int, errorMessage: String?) {
+                runOnUiThread {
+                    "IM登陆失败".toast()
+                }
+            }
         })
     }
 }

+ 1 - 1
tuichat/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
         <activity
             android:name=".classicui.page.TUIC2CChatActivity"
             android:launchMode="singleTask"
-            android:screenOrientation="portrait"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="adjustNothing|stateHidden" />
 
 

+ 1 - 1
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIBaseChatFragment.java

@@ -52,6 +52,7 @@ import java.util.List;
 import java.util.Map;
 
 public class TUIBaseChatFragment extends BaseFragment {
+
     private static final String TAG = TUIBaseChatFragment.class.getSimpleName();
 
     protected View baseView;
@@ -71,7 +72,6 @@ public class TUIBaseChatFragment extends BaseFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
         TUIChatLog.i(TAG, "oncreate view " + this);
-
         baseView = inflater.inflate(R.layout.chat_fragment, container, false);
         //        // TODO 通过api设置ChatLayout各种属性的样例
         //        // Example of setting various properties of ChatLayout through api

+ 1 - 1
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/page/TUIC2CChatFragment.java

@@ -18,6 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 public class TUIC2CChatFragment extends TUIBaseChatFragment {
+
     private static final String TAG = TUIC2CChatFragment.class.getSimpleName();
 
     private ChatInfo chatInfo;
@@ -27,7 +28,6 @@ public class TUIC2CChatFragment extends TUIBaseChatFragment {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
         TUIChatLog.i(TAG, "oncreate view " + this);
-
         baseView = super.onCreateView(inflater, container, savedInstanceState);
         Bundle bundle = getArguments();
         if (bundle == null) {

+ 4 - 3
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/ChatView.java

@@ -76,6 +76,7 @@ import java.util.List;
 import java.util.Map;
 
 public class ChatView extends LinearLayout implements IChatLayout {
+
     private static final String TAG = ChatView.class.getSimpleName();
     // 逐条转发消息数量限制
     // Limit the number of messages forwarded one by one
@@ -405,7 +406,7 @@ public class ChatView extends LinearLayout implements IChatLayout {
             @Override
             public void onError(String module, int errCode, String errMsg) {
                 if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
-                    showNotSupportDialog();
+//                    showNotSupportDialog();
                 }
             }
         });
@@ -1172,7 +1173,7 @@ public class ChatView extends LinearLayout implements IChatLayout {
                 TUIChatUtils.callbackOnError(callback, errCode, errMsg);
                 String toastMsg = errCode + ", " + errMsg;
                 if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
-                    showNotSupportDialog();
+//                    showNotSupportDialog();
                     if (messageBean.isNeedReadReceipt()) {
                         toastMsg = getResources().getString(R.string.chat_message_read_receipt)
                             + getResources().getString(com.tencent.qcloud.tuicore.R.string.TUIKitErrorUnsupporInterfaceSuffix);
@@ -1216,7 +1217,7 @@ public class ChatView extends LinearLayout implements IChatLayout {
             public void onError(String module, int errCode, String errMsg) {
                 String toastMsg = errCode + ", " + errMsg;
                 if (errCode == TUIConstants.BuyingFeature.ERR_SDK_INTERFACE_NOT_SUPPORT) {
-                    showNotSupportDialog();
+//                    showNotSupportDialog();
                     if (msg.isNeedReadReceipt()) {
                         toastMsg = getResources().getString(R.string.chat_message_read_receipt)
                             + getResources().getString(com.tencent.qcloud.tuicore.R.string.TUIKitErrorUnsupporInterfaceSuffix);

+ 1 - 0
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/input/InputView.java

@@ -83,6 +83,7 @@ import java.util.Map;
  */
 
 public class InputView extends LinearLayout implements View.OnClickListener, TextWatcher {
+
     private static final String TAG = InputView.class.getSimpleName();
 
     private static final int STATE_NONE_INPUT = -1;

BIN
tuichat/src/main/res/drawable-xxhdpi/chat_input_more.png


BIN
tuichat/src/main/res/drawable-xxhdpi/chat_input_voice.png


+ 1 - 1
tuichat/src/main/res/drawable/message_send_border.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/green" />
+    <solid android:color="#FF4A76FF" />
 
     <corners android:radius="5dp" />
 </shape>

+ 2 - 2
tuichat/src/main/res/drawable/msg_editor_border.xml

@@ -3,6 +3,6 @@
     <solid android:color="#fff" />
     <stroke
         android:width="1px"
-        android:color="#bfbfbf" />
-    <corners android:radius="3dp" />
+        android:color="#FFE4E2E2" />
+    <corners android:radius="50dp" />
 </shape>

+ 1 - 1
tuichat/src/main/res/drawable/my_cursor.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/green" />
+    <solid android:color="#FF4A76FF" />
     <size android:width="1dp" />
 </shape>

+ 2 - 1
tuichat/src/main/res/layout/chat_input_layout.xml

@@ -31,7 +31,7 @@
             android:layout_width="@dimen/chat_input_icon_size"
             android:layout_height="@dimen/chat_input_icon_size"
             android:layout_margin="5dp"
-            android:scaleType="fitXY"
+            android:scaleType="centerInside"
             android:src="@drawable/action_audio_selector" />
 
         <com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.TIMMentionEditText
@@ -66,6 +66,7 @@
             android:layout_height="@dimen/chat_input_icon_size"
             android:layout_margin="5dp"
             android:scaleType="fitXY"
+            android:visibility="gone"
             android:src="@drawable/action_face_selector" />
 
         <ImageView

+ 1 - 1
tuichat/src/main/res/values/strings.xml

@@ -67,7 +67,7 @@
     <string name="record_fail">Recording failed</string>
     <string name="up_cancle_send">Release to Cancel</string>
 
-    <string name="send">Send</string>
+    <string name="send">发送</string>
 
     <string name="custom_msg">[Custom Messages]</string>
     <string name="custom_emoji">[Animated Sticker]</string>