reactor:格式化代码

m-im/src/main/java/com/yidianling/avchatkit/ui/AVChatAudioUI.java

@@ -8,8 +8,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.Chronometer;
 import android.widget.TextView;
-import android.widget.Toast;
-
 import com.netease.nimlib.sdk.avchat.AVChatCallback;
 import com.netease.nimlib.sdk.avchat.AVChatManager;
 import com.netease.nimlib.sdk.avchat.constant.AVChatControlCommand;

m-im/src/main/java/com/yidianling/avchatkit/ui/AVChatVideoUI.java

@@ -16,8 +16,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
-
 import com.netease.nimlib.sdk.avchat.AVChatManager;
 import com.netease.nimlib.sdk.avchat.constant.AVChatType;
 import com.netease.nimlib.sdk.avchat.constant.AVChatVideoScalingType;

m-im/src/main/java/com/yidianling/im/helper/MsgReceiveHelper.java

 package com.yidianling.im.helper;
 
-import android.os.Build;
-import android.support.annotation.RequiresApi;
 
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.NIMSDK;
@@ -13,15 +11,10 @@ import com.netease.nimlib.sdk.msg.model.RecentContact;
 import com.netease.nimlib.sdk.team.model.MemberChangeAttachment;
 import com.yidianling.common.tools.LogUtil;
 import com.yidianling.im.event.UpdateTabUnreadNumEvent;
-
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
 import de.greenrobot.event.EventBus;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;

m-im/src/main/java/com/yidianling/im/session/SessionHelper.java

@@ -102,7 +102,6 @@ import com.yidianling.nimbase.api.model.session.SessionCustomization;
 import com.yidianling.nimbase.api.model.session.SessionEventListener;
 import com.yidianling.nimbase.business.session.actions.BaseAction;
 import com.yidianling.nimbase.impl.cache.TeamDataCache;
-import com.yidianling.uikit.business.session.activity.YDLP2PMessageActivity;
 import com.yidianling.user.api.bean.UserResponseBean;
 import com.yidianling.uikit.api.NimUIKit;
 import com.yidianling.uikit.business.session.actions.ImageAction;
@@ -153,7 +152,7 @@ public class SessionHelper {
                 + "user_type = " + user_type
                 + ", account = " + account);
         //只要打开聊天页面，就请求接口，服务端用来判断消息红点显示隐藏
-        notifyRedPoint(context, account, ImIn.INSTANCE.getUserInfo().getUid());
+        notifyRedPoint(account, ImIn.INSTANCE.getUserInfo().getUid());
         StatusCode status = NIMClient.getStatus();
         if (status == StatusCode.UNLOGIN) {
             RequestCallback<LoginInfo> callback = new RequestCallback<LoginInfo>() {
@@ -212,7 +211,7 @@ public class SessionHelper {
     /*
      * 通知服务端红点
      * */
-    private static void notifyRedPoint(Context context, String assistantUid, String userId) {
+    private static void notifyRedPoint( String assistantUid, String userId) {
         String str = new Gson().toJson(new BuryRedPointsParm(assistantUid, userId));
         RequestBody body = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), str);
         Disposable subscribe = ImRetrofitApi.Companion.getImRetrofitApi().imBuryRedPoints(body)

m-im/src/main/java/com/yidianling/im/session/action/MakeCollectionsAction.java

@@ -4,8 +4,6 @@ import com.yidianling.im.R;
 import com.yidianling.nimbase.business.session.actions.BaseAction;
 import com.yidianling.uikit.custom.bridge.ActionHandlerStorage;
 
-import org.json.JSONObject;
-
 /**
  * 客服发起收款
  * Created by Wi1ls on 2016/9/27;

m-im/src/main/java/com/yidianling/im/session/action/SendCardAction.java

@@ -3,7 +3,6 @@ package com.yidianling.im.session.action;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.msg.MessageBuilder;
 import com.netease.nimlib.sdk.msg.MsgService;
-import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.CustomMessageConfig;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
@@ -12,10 +11,6 @@ import com.yidianling.im.dialog.CustomerCardSendRemindDialog;
 import com.yidianling.im.session.extension.CustomCustomerServiceCardAttachment;
 import com.yidianling.nimbase.business.session.actions.BaseAction;
 import com.yidianling.uikit.business.session.helper.MessageListPanelHelper;
-import com.yidianling.uikit.custom.bridge.ActionHandlerStorage;
-
-import org.json.JSONObject;
-
 /**
  * 发送名片
  * Created by XuJian on 2019/10/29;

m-im/src/main/java/com/yidianling/im/session/extension/CustomAttachConsultSubScript.java

@@ -2,7 +2,6 @@ package com.yidianling.im.session.extension;
 
 import com.alibaba.fastjson.JSONObject;
 
-import java.net.URLEncoder;
 
 /**
  * 确认预约时间

m-im/src/main/java/com/yidianling/im/session/extension/CustomAttachmentBusinessCard.java

@@ -19,7 +19,7 @@ public class CustomAttachmentBusinessCard extends CustomAttachment {
     private String WORKYEARS = "workYears";
     private String ORDERNUM = "orderNum";
     private String HELPLONG = "helpLong";
-
+    private String DOCTORCARDURL="doctorCardUrl";
 
     public String name; //专家名字
     public String secondTitle; //专家介绍
@@ -30,7 +30,7 @@ public class CustomAttachmentBusinessCard extends CustomAttachment {
     public String workYears;//持证年限
     public String orderNum;//服务人数
     public String helpLong;//服务时长
-
+    public String doctorCardUrl;//跳转专家名片URL
 
     CustomAttachmentBusinessCard() {
         super(CustomAttachmentType.TYPE_EXPERT_DETAIL_CARD);
@@ -47,6 +47,7 @@ public class CustomAttachmentBusinessCard extends CustomAttachment {
         workYears = data.getString(WORKYEARS);
         orderNum = data.getString(ORDERNUM);
         helpLong = data.getString(HELPLONG);
+        doctorCardUrl=data.getString(DOCTORCARDURL);
     }
 
 
@@ -62,6 +63,7 @@ public class CustomAttachmentBusinessCard extends CustomAttachment {
         data.put(WORKYEARS, workYears);
         data.put(ORDERNUM, orderNum);
         data.put(HELPLONG, helpLong);
+        data.put(DOCTORCARDURL,doctorCardUrl);
         return data;
     }
 }

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderAssistantReceivedMoney.java

@@ -6,10 +6,8 @@ import android.widget.TextView;
 
 import com.ydl.webview.H5Params;
 import com.ydl.webview.NewH5Activity;
-import com.ydl.ydlcommon.base.config.HttpConfig;
 import com.yidianling.im.R;
 import com.yidianling.im.session.extension.CustomAttachAssistantReceivedMoney;
-import com.yidianling.im.session.extension.CustomAttachReceivedMoney;
 import com.yidianling.nimbase.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
 import com.yidianling.uikit.business.session.viewholder.MsgViewHolderBase;
 

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderBusinessCard.java

@@ -8,8 +8,10 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.ydl.webview.H5Params;
+import com.ydl.webview.NewH5Activity;
 import com.ydl.ydl_image.module.GlideApp;
-import com.yidianling.common.tools.ToastUtil;
+import com.yidianling.common.tools.LogUtil;
 import com.yidianling.im.R;
 import com.yidianling.im.session.extension.CustomAttachmentBusinessCard;
 import com.yidianling.im.session.viewholder.adapter.AdapterBusinessCard;
@@ -41,6 +43,8 @@ public class MsgViewHolderBusinessCard extends MsgViewHolderBase {
     private AdapterBusinessCard businessCard;
 
     private LinearLayout m_im_ll_feedbackRate;
+    private String urlJump = "";//跳转URL字段
+
     public MsgViewHolderBusinessCard(BaseMultiItemFetchLoadAdapter adapter) {
         super(adapter);
     }
@@ -52,61 +56,58 @@ public class MsgViewHolderBusinessCard extends MsgViewHolderBase {
 
     @Override
     protected void inflateContentView() {
-        expertImg=findViewById(R.id.expert_Img);
-        expertSecondTitle=findViewById(R.id.expertSecondTitle);
-        expertName=findViewById(R.id.expertName);
-        scoreExpert=findViewById(R.id.scoreExpert);
-        commentCount=findViewById(R.id.commentCount);
-        cerfiticateYear=findViewById(R.id.cerfiticateYear);
-        serviceCount=findViewById(R.id.serviceCount);
-        serviceTime=findViewById(R.id.serviceTime);
-        recy=findViewById(R.id.expertTagRV);
-        m_im_ll_feedbackRate=findViewById(R.id.m_im_ll_feedbackRate);
+        expertImg = findViewById(R.id.expert_Img);
+        expertSecondTitle = findViewById(R.id.expertSecondTitle);
+        expertName = findViewById(R.id.expertName);
+        scoreExpert = findViewById(R.id.scoreExpert);
+        commentCount = findViewById(R.id.commentCount);
+        cerfiticateYear = findViewById(R.id.cerfiticateYear);
+        serviceCount = findViewById(R.id.serviceCount);
+        serviceTime = findViewById(R.id.serviceTime);
+        recy = findViewById(R.id.expertTagRV);
+        m_im_ll_feedbackRate = findViewById(R.id.m_im_ll_feedbackRate);
     }
 
     @Override
     protected void bindContentView() {
-        CustomAttachmentBusinessCard customBusinessCard= (CustomAttachmentBusinessCard) message.getAttachment();
-        businessCard=new AdapterBusinessCard();
+        CustomAttachmentBusinessCard customBusinessCard = (CustomAttachmentBusinessCard) message.getAttachment();
+        businessCard = new AdapterBusinessCard();
         businessCard.setTagData(new ArrayList<String>());
-        LinearLayoutManager linearLayoutManager=new LinearLayoutManager(context);
+        LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
         linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
         recy.setLayoutManager(linearLayoutManager);
         recy.setAdapter(businessCard);
-
         GlideApp.with(context).load(customBusinessCard.expertImg)
-            .into(expertImg);
-        String tags=customBusinessCard.tagList;
-        List<String> tagsList=Arrays.asList(tags.split("\\|"));
-        businessCard.setTagData( tagsList);
-
+                .into(expertImg);
+        String tags = customBusinessCard.tagList;
+        List<String> tagsList = Arrays.asList(tags.split("\\|"));
+        businessCard.setTagData(tagsList);
         expertName.setText(customBusinessCard.name);
         expertSecondTitle.setText(customBusinessCard.secondTitle);
-
-
         scoreExpert.setText(customBusinessCard.feedbackRate.toString());
         scoreExpert.invalidate();
-
-        commentCount.setText(customBusinessCard.commentNum+"人评价");
+        commentCount.setText(customBusinessCard.commentNum + "人评价");
         cerfiticateYear.setText(customBusinessCard.workYears);
         serviceCount.setText(customBusinessCard.orderNum);
         serviceTime.setText(customBusinessCard.helpLong);
-        m_im_ll_feedbackRate.removeAllViews();
+        urlJump = customBusinessCard.doctorCardUrl;
 
 
-        for (int j=0;j<5;j++) {
+        m_im_ll_feedbackRate.removeAllViews();
+        for (int j = 0; j < 5; j++) {
             View view = LayoutInflater.from(context).inflate(
                     R.layout.m_im_feedbackrate,
                     m_im_ll_feedbackRate,
                     false
             );
 
-            ImageView startIMG= view.findViewById(R.id.feedBackRate);
+            ImageView startIMG = view.findViewById(R.id.feedBackRate);
             if (customBusinessCard.feedbackRate > j) {
                 startIMG.setBackground(context.getResources().getDrawable(R.drawable.m_im_full_star));
             } else if (customBusinessCard.feedbackRate < j && customBusinessCard.feedbackRate > j - 1) {
                 startIMG.setBackground(context.getResources().getDrawable(R.drawable.m_im_half_star));
             } else {
+                //UI没切这个emptyStar的图，所以只能用之前的星星，墨刀很难用
                 startIMG.setBackground(context.getResources().getDrawable(R.drawable.m_im_nothing_star));
             }
             m_im_ll_feedbackRate.addView(view);
@@ -116,6 +117,10 @@ public class MsgViewHolderBusinessCard extends MsgViewHolderBase {
     @Override
     protected void onItemClick() {
         super.onItemClick();
-        ToastUtil.toastShort("点击了");
+        if (null != urlJump && !urlJump.isEmpty()) {
+            NewH5Activity.start(context, new H5Params(urlJump, "专家名片"));
+        } else {
+            LogUtil.e("doctorCardUrl:" + urlJump);
+        }
     }
 }

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderPerfectConsultData.java

@@ -4,13 +4,8 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
-
 import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
-import com.ydl.ydl_router.manager.YDLRouterManager;
-import com.yidianling.common.tools.ToastUtil;
 import com.yidianling.im.R;
-import com.yidianling.im.http.ImRetrofitApi;
 import com.yidianling.im.session.extension.CustomAttachConsultPerfectData;
 import com.yidianling.nimbase.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
 import com.yidianling.uikit.business.session.viewholder.MsgViewHolderBase;
@@ -18,12 +13,6 @@ import com.ydl.webview.H5Params;
 import com.ydl.webview.NewH5Activity;
 import com.ydl.ydlcommon.utils.log.LogHelper;
 
-import io.reactivex.Scheduler;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
-import okhttp3.MediaType;
-import okhttp3.RequestBody;
-
 /**
  * author : harvie
  * 完善咨询资料提醒消息

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderPleaseSubscribeConsultDate.java

@@ -5,7 +5,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
-import com.ydl.ydl_router.manager.YDLRouterManager;
 import com.yidianling.im.R;
 import com.yidianling.im.session.extension.CustomAttachPleaseSubscribeConsultDate;
 import com.yidianling.nimbase.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderReceivedStatus.java

@@ -13,7 +13,6 @@ import com.yidianling.im.session.extension.CustomAttachmentReceivedSuccess;
 import com.yidianling.im.session.extension.CustomAttachmentReceivedTimeout;
 import com.ydl.webview.H5Params;
 import com.ydl.webview.NewH5Activity;
-import com.ydl.ydlcommon.router.YdlCommonOut;
 
 /**
  * 后台推送到收款状态，比如超时未支付或者已经支付到拓展

m-im/src/main/java/com/yidianling/im/session/viewholder/MsgViewHolderSystemTips.java

@@ -4,24 +4,11 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.TextView;
 
-import com.netease.nimlib.sdk.NIMClient;
-import com.netease.nimlib.sdk.RequestCallback;
-import com.netease.nimlib.sdk.msg.MessageBuilder;
-import com.netease.nimlib.sdk.msg.MsgService;
-import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
-import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
-import com.netease.nimlib.sdk.msg.model.IMMessage;
-import com.yidianling.common.tools.ToastUtil;
+
 import com.yidianling.im.R;
-import com.yidianling.im.session.extension.CustomAttachmentPhoneCallSystemNotice;
 import com.yidianling.im.session.extension.CustomSystemTips;
 import com.yidianling.nimbase.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
-import com.yidianling.uikit.business.session.helper.MessageListPanelHelper;
 import com.yidianling.uikit.business.session.viewholder.MsgViewHolderBase;
-import com.yidianling.uikit.custom.bridge.ActionHandlerStorage;
-import com.ydl.ydlcommon.router.YdlCommonRouterManager;
-import com.ydl.ydlcommon.utils.StringUtils;
-import com.ydl.ydlcommon.utils.YDLCacheUtils;
 
 /**
  * @author xj

m-im/src/main/java/com/yidianling/uikit/business/contact/core/model/ContactDataAdapter.java

@@ -16,8 +16,6 @@ import com.yidianling.uikit.business.contact.core.model.ContactDataTask.Host;
 import com.yidianling.uikit.business.contact.core.query.IContactDataProvider;
 import com.yidianling.uikit.business.contact.core.query.TextQuery;
 import com.yidianling.uikit.business.contact.core.viewholder.AbsContactViewHolder;
-import com.yidianling.uikit.business.contact.core.query.TextQuery;
-import com.yidianling.uikit.business.contact.core.viewholder.AbsContactViewHolder;
 import com.yidianling.nimbase.common.ui.liv.LetterIndexView;
 import com.yidianling.nimbase.common.ui.liv.LivIndex;
 import com.yidianling.nimbase.common.util.log.LogUtil;

m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLBaseMessageActivity.java

@@ -11,9 +11,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
-import com.ydl.ydlcommon.data.http.RxUtils;
-import com.yidianling.common.tools.LogUtil;
-import com.yidianling.common.tools.ToastUtil;
 import com.yidianling.im.R;
 import com.yidianling.nimbase.api.model.session.SessionCustomization;
 import com.yidianling.nimbase.business.preference.UserPreferences;
@@ -23,15 +20,10 @@ import com.yidianling.nimbase.common.util.sys.ScreenUtil;
 import com.yidianling.uikit.business.session.fragment.YDLMessageFragment;
 import com.yidianling.uikit.custom.bridge.ActionHandlerStorage;
 import com.yidianling.uikit.custom.bridge.IP2PCustomActionHandler;
-import com.yidianling.uikit.custom.http.ServiceImpl;
 import com.yidianling.uikit.custom.widget.TitleBarBottom;
 
-import java.net.URLEncoder;
 import java.util.List;
 
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.disposables.Disposable;
-import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by zhoujianghua on 2015/9/10.

m-im/src/main/java/com/yidianling/uikit/business/session/activity/YDLP2PMessageActivity.java

 package com.yidianling.uikit.business.session.activity;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.WindowManager;
 
@@ -28,12 +26,9 @@ import com.yidianling.uikit.api.NimUIKit;
 import com.yidianling.uikit.business.session.fragment.YDLMessageFragment;
 import com.yidianling.uikit.custom.bridge.ActionHandlerStorage;
 import com.yidianling.uikit.custom.bridge.IP2PCustomActionHandler;
-import com.yidianling.uikit.custom.http.ServiceImpl;
 
 import java.util.List;
 
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
 
 /**
  * 点对点聊天界面

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

 package com.yidianling.uikit.business.session.fragment;
 
 import android.util.Log;
-import android.widget.Toast;
 
 import com.netease.nimlib.sdk.msg.model.IMMessage;
 import com.netease.nimlib.sdk.team.constant.TeamMemberType;

m-im/src/main/java/com/yidianling/uikit/business/session/module/input/InputPanel.java

@@ -25,8 +25,6 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
-
 import com.alibaba.fastjson.JSONObject;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.media.record.AudioRecorder;