feat: im改造

api/im/.gitignore

+/build
\ No newline at end of file

api/im/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply from: "../../maven_push_api.gradle"
+
+version = '1.0.0'
+
+android {
+    compileSdkVersion rootProject.ext.android["compileSdkVersion"]
+    buildToolsVersion rootProject.ext.android["buildToolsVersion"]
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.android["minSdkVersion"]
+        targetSdkVersion rootProject.ext.android["targetSdkVersion"]
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    implementation "com.alibaba:arouter-api:$arouter_api"
+    implementation "com.google.code.gson:gson:2.8.5"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
\ No newline at end of file

api/im/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file

api/im/src/main/AndroidManifest.xml

+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.ydl.im.api">
+
+</manifest>
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/IMDoctorBriefInfo.java

+package com.yidianling.im.api.bean;
+
+/**
+ * Created by xj on 2019/6/27.
+ */
+
+public class IMDoctorBriefInfo {
+    public String smallImage = "";
+    public double feedbackRate = 0.000;
+    public String feedbackRateForShow = "";
+    public int orderNum = 0;
+    public int helpLong = 0;
+}

api/im/src/main/java/com/yidianling/im/api/bean/IMExpertBuild.java

+package com.yidianling.im.api.bean;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by hgw on 2018/3/13.
+ */
+
+public class IMExpertBuild {
+    public IMShareDataBuild shareData;
+    public String tips; //禁言提示内容
+    public String url;//禁言帮助URL
+    public IMDoctorBriefInfo doctorBriefInfo = new IMDoctorBriefInfo();
+    public List<ImCommendDetailBean> commentList = new ArrayList(); //评论列表
+    public int commentCounter = 0; //评论总数
+    public String commentCounterUrl = ""; //评论总数url
+
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/IMInitConfigBean.java

+package com.yidianling.im.api.bean;
+
+/**
+ * Created by haorui on 2020/3/6.
+ * Des:
+ */
+public class IMInitConfigBean {
+    /**
+     * 测试环境AppKey
+     */
+    public String debugAppKey;
+    /**
+     * 正式环境AppKey
+     */
+    public String releaseAppKey;
+
+    /**
+     * 小米推送 appId
+     */
+    public String xmAppId;
+
+    /**
+     * 小米推送 appKey
+     */
+    public String xmAppKey;
+
+    /**
+     * 小米推送证书，请在云信管理后台申请
+     */
+    public String xmCertificateName;
+
+    /**
+     * 华为推送 hwAppId
+     */
+    public String hwAppId;
+
+    /**
+     *
+     * 华为推送证书，请在云信管理后台申请
+     */
+    public String hwCertificateName;
+
+    /**
+     * 魅族推送 appId
+     */
+    public String mzAppId;
+
+    /**
+     * 魅族推送 appKey
+     */
+    public String mzAppKey;
+
+    /**
+     * 魅族推送证书，请在云信管理后台申请
+     */
+    public String mzCertificateName;
+
+    /**
+     * FCM 推送证书，请在云信管理后台申请
+     * 海外客户使用
+     */
+    public String fcmCertificateName;
+
+    /**
+     * VIVO推送 appId apiKey请在 AndroidManifest.xml 文件中配置
+     * VIVO推送证书，请在云信管理后台申请
+     */
+    public String vivoCertificateName;
+
+    /**
+     * oppo 推送appId
+     */
+    public String oppoAppId;
+
+    /**
+     * oppo 推送appKey
+     */
+    public String oppoAppKey;
+
+    /**
+     * oppo 推送AppSecret
+     */
+    public String oppoAppSercet;
+
+    /**
+     * OPPO推送证书，请在云信管理后台申请
+     */
+    public String oppoCertificateName;
+}

api/im/src/main/java/com/yidianling/im/api/bean/IMLoginInfo.kt

+package com.yidianling.im.api.bean
+
+/**
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/03/23
+ * 登录 im 时传入的参数，对应 im 模块中的 IMLoginInfo
+ */
+data class IMLoginInfo(val account: String, val passWord: String)
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/IMRegisterObserverCustomNotificationCallBack.kt

+package com.yidianling.im.api.bean
+
+/**
+ * @author jiucheng
+ * @描述:
+ * @Copyright Copyright (c) 2018
+ * @Company 壹点灵
+ * @date 2020/4/21
+ */
+interface IMRegisterObserverCustomNotificationCallBack {
+
+    fun onObserverCustomNotification(fromUid:String,toUid:String,content: String)
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/IMRequestCallback.kt

+package com.yidianling.im.api.bean
+
+/**
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/03/23
+ * 登录 im 时传入的接口，对应 im 模块中的 IMRequestCallback
+ */
+interface IMRequestCallback<in T> {
+
+    fun onSuccess(t: T?)
+
+    fun onFailed(i: Int)
+
+    fun onException(throwable: Throwable?)
+
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/IMSendCustomNotificationResultCallBack.kt

+package com.yidianling.im.api.bean
+
+/**
+ * @author jiucheng
+ * @描述:
+ * @Copyright Copyright (c) 2018
+ * @Company 壹点灵
+ * @date 2020/4/21
+ */
+interface IMSendCustomNotificationResultCallBack {
+
+    fun onSuccess()
+
+    fun onFailed(code: Int)
+
+    fun onException(throwable: Throwable)
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/IMShareDataBuild.java

+package com.yidianling.im.api.bean;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by hgw on 2018/3/13.
+ */
+
+public class IMShareDataBuild {
+    public String toUid;
+    public String doctorId;
+    public String listenerId;
+    //    public String name;
+    public String title;
+    @SerializedName(value = "isOnline", alternate = "is_online")
+    public int is_online;//专家倾述在线状态 1.在线 2.离线 3通话中 4-继续拨打 ,
+    public int isChatOnline;//专家私聊在线状态 1.在线 2.离线
+    public String cover;
+    public String desc;
+    @SerializedName(value = "urlShare", alternate = "url_share")
+    public String url_share;
+    public String price;
+    public String unitTxt;
+    public String url;
+    public String urlTitle;
+    public String blackStatus;
+    @SerializedName(value = "userType", alternate = "user_type")
+    public int user_type;//1用户,2专家,3助理
+    public int is_first;//1表示第一次聊天0不是
+
+    public paramsBuild params = new paramsBuild();
+
+    public int hasAvailableListenOrder;//是否还有未完成的倾诉订单 1、没有 2、有
+    public int listenOrderCommentStatus;//倾诉订单评论状态 1：未评价 9：已评价 ,
+    public String listenOrderCommentUrl;//倾诉订单评价页url
+    public String listenOrderUrl;//订单详情页面url
+    public String listenOrderDesc;//倾诉订单状态描述
+    public String listenOrderRemainTime;//未完成倾诉订单剩余时间
+
+    @SerializedName(value = "orderUrl", alternate = "order_url")
+    public String order_url;
+    @SerializedName(value = "name", alternate = "doctorName")
+    public String doctorName;
+    public Boolean isFollowed = false; // 是否关注
+    /**
+     * 是否开启电话倾诉
+     * 1.开启 2.关闭
+     */
+    public int listenerIsOpen;
+
+    public static class paramsBuild {
+        //php接口此字段返回值始终为0，更换java接口后，服务端去掉了此字段，本地改动太多，先给默认值
+        public String orderid = "0";
+    }
+
+    public String tag1 = ""; //该字段是私聊改造项目新加的，用于在获取推荐专家列表的时候，catName字段
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/ImCommendDetailBean.kt

+package com.yidianling.im.api.bean
+
+/**
+ * 评论细节bean
+ */
+
+class ImCommendDetailBean  {
+    var nickName: String = ""
+    var commentContent: String = ""
+    var commentUrl: String = ""
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/MsgDetail.java

+package com.yidianling.im.api.bean;
+
+/**
+     * type: 消息类型
+     * 1、2、501 502为预约消息；
+     * 3、4、503、1001、1002为心事消息；
+     */
+public class MsgDetail {
+    public int id;//消息的id
+    public int type;//
+    public String content;
+    public String create_time;
+    public String image_url;//消息封面图
+
+    public String relation_id1;//关联的业务id
+
+
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/MsgReadAll.java

+package com.yidianling.im.api.bean;
+
+public class MsgReadAll {
+    public int update_status;
+
+    public String msg;
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/ReceiveRedPacketParam.kt

+package com.yidianling.im.api.bean
+
+import android.os.Parcel
+import android.os.Parcelable
+
+/**
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/05/04
+ */
+data class ReceiveRedPacketParam(
+        var status: Int = 0,
+        var money: String? = null,
+        var name: String? = null,
+        var headUrl: String? = null,
+        var expertUrl: String? = null,
+        var expertName: String? = null,
+        var expertTime: String? = null) : Parcelable {
+    constructor(parcel: Parcel) : this(
+            parcel.readInt(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString(),
+            parcel.readString()) {
+    }
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeInt(status)
+        parcel.writeString(money)
+        parcel.writeString(name)
+        parcel.writeString(headUrl)
+        parcel.writeString(expertUrl)
+        parcel.writeString(expertName)
+        parcel.writeString(expertTime)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Parcelable.Creator<ReceiveRedPacketParam> {
+        override fun createFromParcel(parcel: Parcel): ReceiveRedPacketParam {
+            return ReceiveRedPacketParam(parcel)
+        }
+
+        override fun newArray(size: Int): Array<ReceiveRedPacketParam?> {
+            return arrayOfNulls(size)
+        }
+    }
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/bean/UpdateStatusBean.java

+package com.yidianling.im.api.bean;
+
+public class UpdateStatusBean {
+    public int update_status;
+
+    public String msg;
+
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/event/AccountChangeEvent.kt

+package com.yidianling.im.api.event
+
+/**
+ * 账号被剔出事件
+ * Created by hgw on 2018/3/20.
+ */
+class AccountChangeEvent{
+
+    var code : Int = 0 //1表示账号被踢出，2表示需要重新登录
+
+    constructor(code: Int) {
+        this.code = code
+    }
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/event/BlackEvent.java

+package com.yidianling.im.api.event;
+
+/**
+ * 黑名单更新通知
+ * Created by xiongyu on 2017/3/7.
+ */
+
+public class BlackEvent {
+    private boolean change;
+
+    public BlackEvent(boolean change) {
+        this.change = change;
+    }
+
+    public boolean isChange() {
+        return change;
+    }
+
+    public void setChange(boolean change) {
+        this.change = change;
+    }
+}

api/im/src/main/java/com/yidianling/im/api/event/ImLogoutEvent.kt

+package com.yidianling.im.api.event
+
+/**
+ * Created by xj on 2019/10/25.
+ */
+class ImLogoutEvent()
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/event/MsgPushEvent.java

+package com.yidianling.im.api.event;
+
+/**
+ * @author jiucheng
+ * @描述:
+ * @Copyright Copyright (c) 2018
+ * @Company 壹点灵
+ * @date 2019/12/13
+ */
+public class MsgPushEvent {
+    public String toUid;
+    public String headUrl;
+    public String content;
+    public String name;
+
+    @Override
+    public String toString() {
+        return "MsgPushEvent{" +
+                "toUid='" + toUid + '\'' +
+                ", headUrl='" + headUrl + '\'' +
+                ", content='" + content + '\'' +
+                ", name='" + name + '\'' +
+                '}';
+    }
+}

api/im/src/main/java/com/yidianling/im/api/event/SelectTabIMEvent.kt

+package com.yidianling.im.api.event
+
+/**
+ * Created by haorui on 2019-12-10.
+ * Des:选中Tab事件
+ */
+class SelectTabIMEvent(var tab: Int)

api/im/src/main/java/com/yidianling/im/api/event/UpdateBottomBarUnreadNumEvent.kt

+package com.yidianling.im.api.event
+
+/**
+ * 刷新底部导航栏角标
+ * Created by xj on 2019/10/23.
+ */
+class UpdateBottomBarUnreadNumEvent(val unreadNum: Int)
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/listener/ApiStringResponseCallback.kt

+package com.yidianling.im.api.listener
+
+interface ApiStringResponseCallback {
+    fun onUidCallback(uid: String)
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/param/MsgDetailParam.kt

+package com.yidianling.im.message.param
+
+/**
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/03/12
+ */
+data class MsgDetailParam(val id: String)
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/param/MsgListParam.kt

+package com.yidianling.im.message.param
+
+/**
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/03/12
+ */
+data class MsgListParam(val page: String, val type: Int)
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/param/ReadMsgAllParam.java

+package com.yidianling.im.api.param;
+
+//消息列表 全部已读
+public class ReadMsgAllParam {
+
+    public int type;
+
+    public ReadMsgAllParam(int type) {
+        this.type = type;
+    }
+
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/param/ReadParam.kt

+package com.yidianling.im.message.param
+
+/**
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/03/12
+ */
+data class ReadParam(val type: Int)
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/param/RmHistoryParam.java

+package com.yidianling.im.api.param;
+
+public class RmHistoryParam {
+    public String toUid;//私聊对象
+    public int type;//1全部移除 2移除单条
+    public int msgId;//type为2时，要移除的消息
+
+    public RmHistoryParam(String toUid, int type) {
+        this.toUid = toUid;
+        this.type = type;
+    }
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/param/RmTalkParam.java

+package com.yidianling.im.api.param;
+
+public class RmTalkParam {
+
+    public String toUid;
+
+    public RmTalkParam(String toUid) {
+        super();
+        this.toUid = toUid;
+    }
+
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/param/TopMessageParam.java

+package com.yidianling.im.api.param;
+
+public class TopMessageParam {
+
+    public String to_uid;
+    public int act;//1置顶操作 2待定
+    public int val;// 	1置顶，0取消置顶
+
+    public TopMessageParam(String to_uid, int act, int val) {
+        this.to_uid = to_uid;
+        this.act = act;
+        this.val = val;
+    }
+
+}
\ No newline at end of file

api/im/src/main/java/com/yidianling/im/api/service/IImService.kt

+package com.yidianling.im.api.service
+
+import android.app.Activity
+import android.app.Application
+import android.content.Context
+import androidx.fragment.app.Fragment
+import com.alibaba.android.arouter.facade.template.IProvider
+import com.yidianling.im.api.bean.*
+import com.yidianling.im.api.listener.ApiStringResponseCallback
+
+/**
+ * author : Zhangwenchao
+ * e-mail : zhangwch@yidianling.com
+ * time   : 2018/04/13
+ */
+interface IImService : IProvider {
+
+    // 打开与小壹聊天界面
+    fun startP2PXiaoYi(context: Context)
+
+    // 打开私聊界面
+    fun startP2PSession(context: Activity, toUid: String)
+
+    // 直接打开聊天页面，不走分配导医
+    fun startChatBySessionId(context: Activity, toUid: String)
+    // 打开信息前置收集页
+    fun startP2PSession(context: Activity, location: Int, ffrom2: String?)
+
+    fun setAccount(account: String)
+
+    fun setChattingAccountAll()
+
+    fun setChattingAccountNone()
+
+    fun isHasUnread(): Boolean
+
+    fun login(info: IMLoginInfo, callback: IMRequestCallback<IMLoginInfo>?)
+
+    /**
+     * 绑定手机后，重新登录IM
+     */
+    fun imLogin(info: IMLoginInfo)
+
+    fun logout()
+
+    fun clear()
+
+    /**
+     * 创建一条普通文本消息
+     * @param sessionId   聊天对象ID
+     * @param content     文本消息内容
+     */
+    fun createTextMessage(sessionId: String?, content: String, callback: IMRequestCallback<Void>)
+
+    fun sendSubscriptionTimeMessage(
+        sessionId: String?,
+        content: String,
+        callback: IMRequestCallback<Void>
+    )
+
+    fun showSelector(activity: Activity, requestCode: Int)
+
+    fun sendTestResultMessage(
+        uid: String,
+        content: String,
+        title: String?,
+        head: String?,
+        url: String?,
+        id: Int,
+        share_url: String?,
+        callback: IMRequestCallback<Void>
+    )
+
+    fun startChat(context: Activity, toUid: String, flag: Int, canTalk: Int)
+
+    fun startChat(
+        context: Activity,
+        toUid: String,
+        flag: Int,
+        canTalk: Int,
+        isFramQingsu: Int,
+        isFromMessageList: Boolean
+    )
+
+    fun startChatCloseReplaceChat(context: Activity, toUid: String)
+
+
+    /**
+     * 根据对方uid获取未读数
+     */
+    fun getUnReadByUid(uid: String): Int
+
+
+    /**
+     * 获取自己的所有未读数
+     */
+    fun getAllUnReadNum(): Int
+
+    /**
+     * 发送自定义通知
+     */
+    fun sendCustomNotification(
+        toUid: String,
+        content: String,
+        callback: IMSendCustomNotificationResultCallBack
+    )
+
+    /**
+     * 注册自定通知接收器
+     */
+    fun registerObserveCustomNotification(callback: IMRegisterObserverCustomNotificationCallBack)
+
+    fun unregisterObserveCustomNotification(callback: IMRegisterObserverCustomNotificationCallBack)
+
+
+    fun getMultiMessageFragment(): Fragment
+
+    // 跳转下一个未读数
+    fun nextUnreadItem(fragment: Fragment): Boolean
+
+    // 判断是否存在私聊页面
+    fun isChatFragment(fragment: Fragment): Boolean
+
+    // 判断云信是否登录
+    fun isImLogin(): Boolean
+
+    // 刷新未读数
+    fun requestTopUnReadNumber(fragment: Fragment)
+
+    // 登录IM
+    fun loginIm(uid: String?, hxPwd: String?)
+
+    //注销
+    fun logoutAll()
+
+    // 初始化imcache
+    fun initImCache(mContext: Context)
+
+    // 客服
+    fun startKefuChat(context: Context, toUid: String, flag: Int, canTalk: Int)
+
+    //
+    fun startP2PSession(
+        mContext: Context,
+        userType: Int,
+        account: String,
+        toChatUsername: String,
+        toName: String,
+        head: String
+    )
+
+    fun updateUserHead(head: String?)
+
+    fun updateUserName(name: String?)
+
+    fun imInSetRing(bool: Boolean)
+
+    fun imInSetVibrate(bool: Boolean)
+
+    fun getUserInfoDescription(): String?
+
+    fun getEarModeKey(): String
+
+    fun getEarModeOpenType(): String
+
+    fun getEarModeIsOpen(): Boolean
+
+    fun getEarModeCloseType(): String
+
+    fun updateEarMode(bool: Boolean)
+
+    fun getChatUid(context: Context?, uid: String, callback: ApiStringResponseCallback)
+
+    fun chatScheule(
+        context: Activity,
+        userUrl: String,
+        docUrl: String,
+        dsmId: Int,
+        title: String,
+        toUid: Int
+    )
+
+    fun initIm(app: Application, activity: Class<out Activity>)
+
+    fun initIm(app: Application, activity: Class<out Activity>, imInitBean: IMInitConfigBean)
+
+    fun isWifiOr3G(activity: Activity): Boolean
+}
\ No newline at end of file

app/build.gradle

@@ -209,7 +209,7 @@ dependencies {
     implementation project(':ydl-media')
     implementation project(':m-muse')
     implementation project(':m-im')
-    implementation modularPublication('com.ydl:m-im-api')
+    implementation project(":api:im")
     implementation project(':m-dynamic')
     implementation project(':m-course')
     implementation project(':m-article')

config.gradle

@@ -34,7 +34,6 @@ ext {
             "ydl-utils"       : "0.0.3.12",
             //-------------- 业务模块 API 层 --------------
             "m-home-api"      : "0.0.4.4",
-            "m-im-api"        : "0.0.12.24",
     ]
     ydl_app = [
             appName      : "壹点灵心理咨询",

m-audioim/build.gradle

@@ -83,7 +83,7 @@ dependencies {
         api project(':ydl-platform')
         api project(':ydl-webview')
         implementation project(":api:user")
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
     }else {
         //发布时使用
         api rootProject.ext.dependencies["ydl-webview"]

m-confide/build.gradle

@@ -76,7 +76,7 @@ dependencies {
         api project(":ydl-pay")
         api project(':ydl-webview')
         api project(':ydl-utils')
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
         implementation project(":api:user")
         implementation project(":api:consultant")
         implementation project(':api:confide')

m-consultant/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     if (rootProject.ext.dev_mode){
         //开发时使用
         implementation project(":api:user")
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
         implementation modularPublication('com.ydl:m-home-api')
         implementation project(":api:consultant")
         api project(":ydl-webview")

m-dynamic/build.gradle

@@ -77,7 +77,7 @@ dependencies {
         api project(':ydl-webview')
         api project(':ydl-platform')
         api project(":ydl-pay")
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
         implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation project(":api:tests")

m-home/build.gradle

@@ -81,7 +81,7 @@ dependencies {
         implementation project(":api:user")
         implementation project(":api:tests")
         implementation modularPublication('com.ydl:m-home-api')
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
         implementation project(':api:confide')
         implementation project(':ydl-webview')
         implementation project(':ydl-media')

m-im/build.gradle

@@ -2,13 +2,6 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'resTools' // 资源重命名插件
-
-// 配置资源重命名插件
-resConfig {
-    new_prefix = 'im_'  // 资源前缀
-    old_prefix = ''         // 老前缀，可为''空字符串
-}
 
 kapt {
     arguments {
@@ -24,22 +17,12 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.android["minSdkVersion"]
         targetSdkVersion rootProject.ext.android["targetSdkVersion"]
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [AROUTER_MODULE_NAME: "im"]
             }
         }
-
-        flavorDimensions "versionCode"//Flavor 维度信息
-
-        ndk {
-            abiFilters  "arm64-v8a"
-        }
     }
 
     buildTypes {
@@ -49,19 +32,9 @@ android {
         }
     }
 
-    //前缀的名字
-    //resourcePrefix "im_"
-
-    //Flavor 信息
-    publishNonDefault true
-    productFlavors {
-        ydl {}
-        xlzx {}
-    }
 
     sourceSets {
         main {
-            manifest.srcFile 'src/main/AndroidManifest.xml'
             res.srcDirs = [
                     'src/main/res',
                     'src/main/res_avchat',
@@ -79,9 +52,6 @@ android {
 dependencies {
     api fileTree(dir: 'libs', include: ['*.aar','*.jar'])
     implementation 'androidx.appcompat:appcompat:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     kapt 'com.alibaba:arouter-compiler:1.2.2'
     implementation 'com.ydl:nim-base:1.1.0.7'
@@ -92,11 +62,12 @@ dependencies {
     implementation rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
     api 'com.tencent.tbs.tbssdk:sdk:43903'
 
+    implementation project(':ydl-resource')
     if (rootProject.ext.dev_mode){
         //开发时使用
         api project(':ydl-webview')
         api project(':ydl-platform')
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
         implementation project(":api:user")
         implementation project(":api:dynamic")
         implementation project(":api:tests")

m-im/gradle.properties

-isApplicaiton = false

m-im/modular.gradle

-modular {
-    //模块包名
-    packageName "com.yidianling.im"
-    // 模块发布需要的参数
-    publish {
-        modules {
-            xlzx {
-                groupId = "com.ydl"
-                artifactId = "m-im-module-xlzx"
-                // 上报的 心理咨询 业务模块 aar 包的版本号
-                version = rootProject.ext.ydlPublishVersion[childProject.getName()]
-            }
-
-            ydl{
-                groupId = "com.ydl"
-                artifactId = "m-im-module-ydl"
-                // 上报的 壹点灵 业务模块 aar 包的版本号
-                version = rootProject.ext.ydlPublishVersion[childProject.getName()]
-            }
-        }
-
-        api {
-            //壹点灵/心理咨询 业务模块 API层 jar包的发布信息
-            groupId = "com.ydl"
-            artifactId = "m-im-api"
-            //开发时注释掉版本号，发布api时打开
-            version = rootProject.ext.ydlPublishVersion[childProject.getName()+"-api"]
-            // API 层打包时需要引入的依赖
-            apiDependencies {
-                implementation 'androidx.fragment:fragment-ktx:1.2.4'
-                implementation "com.google.code.gson:gson:2.8.2"
-                implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-                implementation 'com.alibaba:arouter-api:1.4.1'
-            }
-        }
-    }
-}
\ No newline at end of file

m-im/src/main/java/com/yidianling/im/config/NimApplication.java

@@ -142,7 +142,7 @@ public class NimApplication {
             }
         };
         avChatOptions.entranceActivity = activity;
-        avChatOptions.notificationIconRes = R.mipmap.im_ic_launcher;
+        avChatOptions.notificationIconRes = R.drawable.im_ic_launcher;
         AVChatKit.init(avChatOptions);
 
         // 设置用户相关资料提供者

m-im/src/main/java/com/yidianling/im/config/NimSDKOptionConfig.java

@@ -135,7 +135,7 @@ class NimSDKOptionConfig {
         StatusBarNotificationConfig config = new StatusBarNotificationConfig();
         // 点击通知需要跳转到的界面
         config.notificationEntrance = activity;
-        config.notificationSmallIconId = R.mipmap.im_ic_launcher;
+        config.notificationSmallIconId = R.drawable.im_ic_launcher;
         config.notificationColor = IMCache.getContext().getResources().getColor(R.color.platform_color_blue_3a9efb);
         // 通知铃声的uri字符串
 //        config.notificationSound = "android.resource://com.yidianling.im/raw/msg";

m-im/src/xlzx/res/values/colors.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-</resources>

m-im/src/ydl/res/values/colors.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-</resources>

m-tests/build.gradle

@@ -49,7 +49,7 @@ dependencies {
         implementation project(":api:tests")
         implementation project(":api:user")
         implementation project(":api:dynamic")
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
     }else {
         //发布时使用
         compileOnly rootProject.ext.dependencies["ydl-m-tests-api"]

m-user/build.gradle

@@ -61,7 +61,7 @@ dependencies {
 //        implementation project(":ydl-tuicore")
         implementation project(":api:user")
         implementation project(":api:course")
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
         implementation project(":api:fm")
         implementation project(":api:dynamic")
         implementation project(":api:consultant")

settings.gradle

@@ -4,5 +4,5 @@ include ':app',
         ':m-home',
         ':m-consultant', ':m-muse', ':m-fm', ':m-tests', ":m-course",
         ":m-im",":m-dynamic","m-article","m-audioim","m-user", "m-confide"
-include ':ydl-tuicore', ':api:confide', ':api:dynamic', ':api:fm',':api:consultant',
-        ':api:course',':api:user',':api:tests'
+include ':ydl-tuicore', ':api:confide', ':api:dynamic', ':api:fm', ':api:consultant',
+        ':api:course', ':api:user', ':api:tests', ':api:im'

ydl-pay/build.gradle

@@ -44,7 +44,7 @@ dependencies {
     if (rootProject.ext.dev_mode){
         //开发时使用
         api project(':ydl-platform')
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
     }else {
         compileOnly rootProject.ext.dependencies["ydl-m-im-api"]
         //发布时使用

ydl-webview/build.gradle

@@ -60,7 +60,7 @@ dependencies {
         api project(':ydl-platform')
         implementation project(":api:user")
         implementation project(":api:dynamic")
-        implementation modularPublication('com.ydl:m-im-api')
+        implementation project(":api:im")
     } else {
         //发布时使用
         compileOnly rootProject.ext.dependencies["ydl-m-user-api"]