Преглед изворни кода

1.专业测评添加非空判断

王鹏鹏 пре 2 година
родитељ
комит
07093011bc

+ 3 - 1
.idea/misc.xml

@@ -613,10 +613,12 @@
         <entry key="..\:/workspace/hcp-pads/timcommon/src/main/res/layout/message_adapter_item_content.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/chat_minimalist_fragment.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/chat_minimalist_header_layout.xml" value="0.536" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res-minimalistui/layout/chat_react_dialog_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/chat_end_consultation.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/forward_chat_layout.xml" value="0.23697916666666666" />
-        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/group_receipt_member_item.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/group_receipt_member_item.xml" value="0.6" />
         <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/message_adapter_content_reply.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/tuichat/src/main/res/layout/msg_receipt_detail_layout.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_bridge_web.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_tencent_webview.xml" value="0.22239583333333332" />
         <entry key="..\:/workspace/hcp-pads/webview/src/main/res/layout/activity_webview.xml" value="0.23697916666666666" />

+ 10 - 10
game/src/main/java/com/yingyangfly/game/dialog/CountdownDialog.kt

@@ -181,17 +181,17 @@ class CountdownDialog : DialogFragment() {
                     dismiss()
                 }
             }
+        }
 
-            //游戏加载完成
-            LiveEventBusUtil.observer<String>(this, RxBusCodes.LOADINGOVER) {
-                loadingOver = true
-                if (countdown) {
-                    rxTimer.cancel()
-                    onDialogClickListener?.invoke("")
-                    imageCountdown!!.postDelayed({
-                        dismiss()
-                    }, 200)
-                }
+        //游戏加载完成
+        LiveEventBusUtil.observer<String>(this, RxBusCodes.LOADINGOVER) {
+            loadingOver = true
+            if (countdown) {
+                rxTimer.cancel()
+                onDialogClickListener?.invoke("")
+                imageCountdown!!.postDelayed({
+                    dismiss()
+                }, 200)
             }
         }
     }

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

@@ -37,18 +37,14 @@ public class TUIC2CChatFragment extends TUIBaseChatFragment {
         if (chatInfo == null) {
             return baseView;
         }
-
         initView();
-
         return baseView;
     }
 
     @Override
     protected void initView() {
         super.initView();
-
         setTitleBarExtension();
-
         chatView.setPresenter(presenter);
         presenter.setChatInfo(chatInfo);
         presenter.setTypingListener(chatView.mTypingListener);

+ 1 - 12
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/setting/ChatLayoutSetting.java

@@ -1,21 +1,10 @@
 package com.tencent.qcloud.tuikit.tuichat.classicui.setting;
 
 import android.content.Context;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.widget.FrameLayout;
-import com.google.gson.Gson;
-import com.tencent.qcloud.tuikit.timcommon.bean.TUIMessageBean;
-import com.tencent.qcloud.tuikit.tuichat.R;
-import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
-import com.tencent.qcloud.tuikit.tuichat.bean.CustomHelloMessage;
-import com.tencent.qcloud.tuikit.tuichat.bean.InputMoreActionUnit;
+
 import com.tencent.qcloud.tuikit.tuichat.classicui.widget.ChatView;
 import com.tencent.qcloud.tuikit.tuichat.classicui.widget.input.InputView;
 import com.tencent.qcloud.tuikit.tuichat.classicui.widget.message.MessageRecyclerView;
-import com.tencent.qcloud.tuikit.tuichat.config.TUIChatConfigs;
-import com.tencent.qcloud.tuikit.tuichat.util.ChatMessageBuilder;
 
 public class ChatLayoutSetting {
     private static final String TAG = ChatLayoutSetting.class.getSimpleName();

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

@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.AnimationDrawable;
 import android.net.Uri;
-import android.os.Bundle;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextPaint;
@@ -19,7 +18,6 @@ import android.text.style.ForegroundColorSpan;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -47,12 +45,10 @@ import com.tencent.qcloud.tuikit.tuichat.R;
 import com.tencent.qcloud.tuikit.tuichat.TUIChatConstants;
 import com.tencent.qcloud.tuikit.tuichat.TUIChatService;
 import com.tencent.qcloud.tuikit.tuichat.bean.ChatInfo;
-import com.tencent.qcloud.tuikit.tuichat.bean.GroupApplyInfo;
 import com.tencent.qcloud.tuikit.tuichat.bean.MessageTyping;
 import com.tencent.qcloud.tuikit.tuichat.bean.ReplyPreviewBean;
 import com.tencent.qcloud.tuikit.tuichat.bean.message.CallingMessageBean;
 import com.tencent.qcloud.tuikit.tuichat.bean.message.ReplyMessageBean;
-import com.tencent.qcloud.tuikit.tuichat.classicui.component.noticelayout.NoticeLayout;
 import com.tencent.qcloud.tuikit.tuichat.classicui.interfaces.IChatLayout;
 import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIBaseChatFragment;
 import com.tencent.qcloud.tuikit.tuichat.classicui.setting.ChatLayoutSetting;

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

@@ -17,7 +17,6 @@ import android.util.DisplayMetrics;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
@@ -70,8 +69,6 @@ import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
 import com.tencent.qcloud.tuikit.tuichat.util.TUIChatUtils;
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

@@ -21,7 +21,6 @@ import com.tencent.qcloud.tuicore.interfaces.TUIExtensionEventListener;
 import com.tencent.qcloud.tuicore.interfaces.TUIExtensionInfo;
 import com.tencent.qcloud.tuicore.util.ToastUtil;
 import com.tencent.qcloud.tuikit.timcommon.bean.TUIMessageBean;
-import com.tencent.qcloud.tuikit.timcommon.classicui.component.BeginnerGuidePage;
 import com.tencent.qcloud.tuikit.timcommon.component.CustomLinearLayoutManager;
 import com.tencent.qcloud.tuikit.timcommon.component.MessageProperties;
 import com.tencent.qcloud.tuikit.timcommon.component.dialog.TUIKitDialog;

+ 0 - 1
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/classicui/widget/message/viewholder/StartConsultationMessageHolder.java

@@ -6,7 +6,6 @@ import android.widget.TextView;
 import com.tencent.qcloud.tuikit.timcommon.bean.TUIMessageBean;
 import com.tencent.qcloud.tuikit.timcommon.classicui.widget.message.MessageContentHolder;
 import com.tencent.qcloud.tuikit.tuichat.R;
-import com.tencent.qcloud.tuikit.tuichat.bean.CustomStartConsultationBean;
 
 /**
  * 开始问诊消息

+ 0 - 1
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/minimalistui/widget/message/SelectTextHelper.java

@@ -33,7 +33,6 @@ import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
-import com.tencent.qcloud.tuikit.timcommon.classicui.component.BeginnerGuidePage;
 import com.tencent.qcloud.tuikit.timcommon.component.face.FaceManager;
 import com.tencent.qcloud.tuikit.tuichat.util.TUIChatLog;
 import java.util.LinkedList;

+ 3 - 0
tuichat/src/main/java/com/tencent/qcloud/tuikit/tuichat/presenter/C2CChatPresenter.java

@@ -24,6 +24,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+/**
+ * @author 王鹏鹏
+ */
 public class C2CChatPresenter extends ChatPresenter {
 
     private static final String TAG = C2CChatPresenter.class.getSimpleName();