feat : 去掉测试重复时间代码

ed8da38c · 刘鹏 · 3b3155e2 · ed8da38c · ed8da38c
Commit ed8da38c authored Jan 24, 2022 by 刘鹏
Hide whitespace changes
Inline Side-by-side

Showing with 41 additions and 36 deletions

config.gradle config.gradle +2 -2

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

No files found.
--- a/config.gradle
+++ b/config.gradle
@@ -12,7 +12,7 @@ ext {
            "m-user-medical"  : "0.0.61.90",
            "m-home"          : "0.0.22.70",
            "m-im"            : "0.0.20.76",
-            "m-im-medical"    : "0.0.20.79",
+            "m-im-medical"    : "0.0.20.81",
            "m-dynamic"       : "0.0.7.28",
            "m-article"       : "0.0.0.10",
@@ -98,7 +98,7 @@ ext {
            "m-user-medical"  : "0.0.61.90",
            "m-home"          : "0.0.22.70",
            "m-im"            : "0.0.20.76",
-            "m-im-medical"    : "0.0.20.79",
+            "m-im-medical"    : "0.0.20.81",
            "m-dynamic"       : "0.0.7.28",
            "m-article"       : "0.0.0.8",

--- a/m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
+++ b/m-im/src/main/java/com/yidianling/uikit/business/session/fragment/YDLMessageFragment.java
@@ -523,43 +523,48 @@ public class YDLMessageFragment extends TFragment implements ModuleProxy {
                if (!TextUtils.isEmpty(statusName)) {
                    tv_receive_undiagnosis.setText(statusName);
                }
-                timer = new CountDownTimer(time * 1000, 1) {
+                if(timer != null){
-                    @Override
+                    timer.cancel();
-                    public void onTick(long millisUntilFinished) {
+                }else {
-                        //单位时
+                    timer = new CountDownTimer(time * 1000, 1) {
-                        long hour = millisUntilFinished / (1000 * 60 * 60);
+                        @Override
-                        //单位分
+                        public void onTick(long millisUntilFinished) {
-                        long minute = (millisUntilFinished - hour * (1000 * 60 * 60)) / (1000 * 60);
+                            //单位时
-                        //单位秒
+                            long hour = millisUntilFinished / (1000 * 60 * 60);
-                        long second = (millisUntilFinished - hour * (1000 * 60 * 60) - minute * (1000 * 60)) / 1000;
+                            //单位分
-                        String timeStr = "";
+                            long minute = (millisUntilFinished - hour * (1000 * 60 * 60)) / (1000 * 60);
-                         if (hour != 0) {
+                            //单位秒
-                            timeStr = hour + "小时" + minute + "分" + second + "秒";
+                            long second = (millisUntilFinished - hour * (1000 * 60 * 60) - minute * (1000 * 60)) / 1000;
-                        } else if (hour == 0 && minute != 0) {
+                            String timeStr = "";
-                            timeStr = minute + "分" + second + "秒";
+                            if (hour != 0) {
-                        }else if (hour == 0 && minute == 0 && second != 0) {
+                                timeStr = hour + "小时" + minute + "分" + second + "秒";
-                             timeStr =  second + "秒";
+                            } else if (hour == 0 && minute != 0) {
-                        }
+                                timeStr = minute + "分" + second + "秒";
-                        if (!TextUtils.isEmpty(timeStr)){
+                            }else if (hour == 0 && minute == 0 && second != 0) {
-                            String timeEnd = "后问诊结束";
+                                timeStr =  second + "秒";
-                            SpannableStringBuilder spannable = new SpannableStringBuilder(timeStr + timeEnd);
+                            }
-                            spannable.setSpan(new ForegroundColorSpan(Color.parseColor("#007AFF")),
+                            if (!TextUtils.isEmpty(timeStr)){
-                                    0,
+                                String timeEnd = "后问诊结束";
-                                    timeStr.length(),
+                                SpannableStringBuilder spannable = new SpannableStringBuilder(timeStr + timeEnd);
-                                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                                spannable.setSpan(new ForegroundColorSpan(Color.parseColor("#007AFF")),
-                            );
+                                        0,
+                                        timeStr.length(),
-                            time_count_down.setText(spannable);
+                                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                        }else {
+                                );
-                            time_count_down.setText("");
+                                time_count_down.setText(spannable);
+                            }else {
+                                time_count_down.setText("");
+                            }
                        }
-                    }
-                    @Override
+                        @Override
-                    public void onFinish() {
+                        public void onFinish() {
+                        }
+                    };
+                }
-                    }
-                };
                timer.start();
            } else if (type == 20) {