diff --git a/README.md b/README.md index 5dabdc7..3391dc4 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ allprojects { ``` **混淆** ``` --dontwarn com.wukong.im.** --keep class com.wukong.im.**{*;} +-dontwarn com.xinbida.wukongim.** +-keep class com.xinbida.wukongim.**{*;} ``` **初始化sdk** ``` diff --git a/app/build.gradle b/app/build.gradle index e0e2ec6..f18641e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,7 +7,7 @@ android { buildToolsVersion '33.0.2' defaultConfig { - applicationId "com.wk.im" + applicationId "com.xinbida.wukongdemo" minSdkVersion 19 targetSdkVersion 33 versionCode 1 @@ -26,7 +26,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - namespace 'com.wk.im' + namespace 'com.xinbida.wukongdemo' } dependencies { diff --git a/app/src/androidTest/java/com/wk/im/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/xinbida/wukongdemo/ExampleInstrumentedTest.java similarity index 85% rename from app/src/androidTest/java/com/wk/im/ExampleInstrumentedTest.java rename to app/src/androidTest/java/com/xinbida/wukongdemo/ExampleInstrumentedTest.java index 9210895..61ca6c7 100644 --- a/app/src/androidTest/java/com/wk/im/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/xinbida/wukongdemo/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.wk.im; +package com.xinbida.wukongdemo; import android.content.Context; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.wk.im", appContext.getPackageName()); + assertEquals("com.xinbida.wukongdemo", appContext.getPackageName()); } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a0aab8..060dede 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ - + \ No newline at end of file diff --git a/app/src/main/java/com/wk/im/ChooseChannelTypeView.java b/app/src/main/java/com/xinbida/wukongdemo/ChooseChannelTypeView.java similarity index 85% rename from app/src/main/java/com/wk/im/ChooseChannelTypeView.java rename to app/src/main/java/com/xinbida/wukongdemo/ChooseChannelTypeView.java index 8abc809..2a439a8 100644 --- a/app/src/main/java/com/wk/im/ChooseChannelTypeView.java +++ b/app/src/main/java/com/xinbida/wukongdemo/ChooseChannelTypeView.java @@ -1,12 +1,14 @@ -package com.wk.im; +package com.xinbida.wukongdemo; +import android.annotation.SuppressLint; import android.content.Context; import androidx.annotation.NonNull; import com.lxj.xpopup.core.AttachPopupView; -import com.wukong.im.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKChannelType; +@SuppressLint("ViewConstructor") public class ChooseChannelTypeView extends AttachPopupView { public ChooseChannelTypeView(@NonNull Context context, IResult iResult) { super(context); diff --git a/app/src/main/java/com/wk/im/HttpUtil.java b/app/src/main/java/com/xinbida/wukongdemo/HttpUtil.java similarity index 97% rename from app/src/main/java/com/wk/im/HttpUtil.java rename to app/src/main/java/com/xinbida/wukongdemo/HttpUtil.java index 6bf81bc..21be31c 100644 --- a/app/src/main/java/com/wk/im/HttpUtil.java +++ b/app/src/main/java/com/xinbida/wukongdemo/HttpUtil.java @@ -1,12 +1,12 @@ -package com.wk.im; +package com.xinbida.wukongdemo; import android.text.TextUtils; import android.util.Base64; import android.util.Log; -import com.wukong.im.WKIM; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.message.type.WKSendMsgResult; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.message.type.WKSendMsgResult; import org.json.JSONArray; import org.json.JSONException; diff --git a/app/src/main/java/com/wk/im/LoginActivity.java b/app/src/main/java/com/xinbida/wukongdemo/LoginActivity.java similarity index 97% rename from app/src/main/java/com/wk/im/LoginActivity.java rename to app/src/main/java/com/xinbida/wukongdemo/LoginActivity.java index 20d994f..50662a4 100644 --- a/app/src/main/java/com/wk/im/LoginActivity.java +++ b/app/src/main/java/com/xinbida/wukongdemo/LoginActivity.java @@ -1,4 +1,4 @@ -package com.wk.im; +package com.xinbida.wukongdemo; import android.content.Intent; import android.os.Bundle; @@ -10,7 +10,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import com.wukong.im.WKIM; +import com.xinbida.wukongim.WKIM; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/wk/im/MainActivity.java b/app/src/main/java/com/xinbida/wukongdemo/MainActivity.java similarity index 96% rename from app/src/main/java/com/wk/im/MainActivity.java rename to app/src/main/java/com/xinbida/wukongdemo/MainActivity.java index de40f8c..271088b 100644 --- a/app/src/main/java/com/wk/im/MainActivity.java +++ b/app/src/main/java/com/xinbida/wukongdemo/MainActivity.java @@ -1,4 +1,4 @@ -package com.wk.im; +package com.xinbida.wukongdemo; import android.content.Context; import android.os.Bundle; @@ -14,11 +14,11 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.lxj.xpopup.XPopup; -import com.wukong.im.WKIM; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.message.type.WKConnectStatus; -import com.wukong.im.msgmodel.WKTextContent; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.message.type.WKConnectStatus; +import com.xinbida.wukongim.msgmodel.WKTextContent; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/com/wk/im/MessageAdapter.java b/app/src/main/java/com/xinbida/wukongdemo/MessageAdapter.java similarity index 94% rename from app/src/main/java/com/wk/im/MessageAdapter.java rename to app/src/main/java/com/xinbida/wukongdemo/MessageAdapter.java index 7d623dc..80eb441 100644 --- a/app/src/main/java/com/wk/im/MessageAdapter.java +++ b/app/src/main/java/com/xinbida/wukongdemo/MessageAdapter.java @@ -1,11 +1,11 @@ -package com.wk.im; +package com.xinbida.wukongdemo; import android.widget.ImageView; import android.widget.TextView; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.viewholder.BaseViewHolder; -import com.wukong.im.message.type.WKSendMsgResult; +import com.xinbida.wukongim.message.type.WKSendMsgResult; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/wk/im/UIMessageEntity.java b/app/src/main/java/com/xinbida/wukongdemo/UIMessageEntity.java similarity index 82% rename from app/src/main/java/com/wk/im/UIMessageEntity.java rename to app/src/main/java/com/xinbida/wukongdemo/UIMessageEntity.java index df68452..d4bbab1 100644 --- a/app/src/main/java/com/wk/im/UIMessageEntity.java +++ b/app/src/main/java/com/xinbida/wukongdemo/UIMessageEntity.java @@ -1,7 +1,7 @@ -package com.wk.im; +package com.xinbida.wukongdemo; import com.chad.library.adapter.base.entity.MultiItemEntity; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; class UIMessageEntity implements MultiItemEntity { public WKMsg msg; diff --git a/app/src/main/java/com/wk/im/UpdateChannelIDView.java b/app/src/main/java/com/xinbida/wukongdemo/UpdateChannelIDView.java similarity index 97% rename from app/src/main/java/com/wk/im/UpdateChannelIDView.java rename to app/src/main/java/com/xinbida/wukongdemo/UpdateChannelIDView.java index 4ea0da3..d47767d 100644 --- a/app/src/main/java/com/wk/im/UpdateChannelIDView.java +++ b/app/src/main/java/com/xinbida/wukongdemo/UpdateChannelIDView.java @@ -1,4 +1,4 @@ -package com.wk.im; +package com.xinbida.wukongdemo; import android.annotation.SuppressLint; import android.app.Activity; @@ -12,7 +12,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.lxj.xpopup.core.CenterPopupView; -import com.wukong.im.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKChannelType; import org.json.JSONArray; import org.json.JSONException; diff --git a/wkim/src/test/java/com/xinbida/limaoim/ExampleUnitTest.java b/app/src/test/java/com/xinbida/wukongdemo/ExampleUnitTest.java similarity index 91% rename from wkim/src/test/java/com/xinbida/limaoim/ExampleUnitTest.java rename to app/src/test/java/com/xinbida/wukongdemo/ExampleUnitTest.java index 5655641..0ac1d0c 100644 --- a/wkim/src/test/java/com/xinbida/limaoim/ExampleUnitTest.java +++ b/app/src/test/java/com/xinbida/wukongdemo/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.wukong.im; +package com.xinbida.wukongdemo; import org.junit.Test; diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar deleted file mode 100644 index f402f03..0000000 Binary files a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar and /dev/null differ diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.md5 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.md5 deleted file mode 100644 index 127766a..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -2574a1a954394bc0e14512c8c9130d29 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha1 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha1 deleted file mode 100644 index 764db2f..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -400b72d0de18580ae143d524e08c3b67010b44be \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha256 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha256 deleted file mode 100644 index 2e442c7..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -5ace1b9a36a5370e07e744f9431064021db7d362ef58620f5868d5932c823c21 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha512 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha512 deleted file mode 100644 index cfde7d1..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -84d94b8f261faf5aedf1a4e7be07c953fdc0e6c6d37639c1640a8fe62924d9cacba636c97767cf2355bb3736b1a40f8bbad33e6bfa0e46ca6cff23df437c355a \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom deleted file mode 100644 index 2c74d7d..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.wukong.im - WKIMLib_loca - 1.0.0 - aar - diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.md5 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.md5 deleted file mode 100644 index 74e0302..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -3ba12068a79874b5d3c0630df3e9424a \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha1 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha1 deleted file mode 100644 index 778cd5e..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -661ca872e7597a96bae9bb32206029fda635c03a \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha256 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha256 deleted file mode 100644 index 6e25840..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -dd3e739be498f556545ae3c39336dc876f5ad6dce006e3fdf83044087989592e \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha512 b/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha512 deleted file mode 100644 index 5e3468a..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.0/WKIMLib_loca-1.0.0.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -b2ae240f103954a7b5a2d3f2d75dd8cc248f57365ec7b570af7c2c886fe018989903d12cb45733b5ee1923e0e4262fff1ba2c0f7d84edc191ed252543daf4d6c \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar deleted file mode 100644 index 8e1835d..0000000 Binary files a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar and /dev/null differ diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 deleted file mode 100644 index 9e6d348..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 +++ /dev/null @@ -1 +0,0 @@ -a834d1c870e1b58d4530b187a1c568a9 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 deleted file mode 100644 index 5496c2c..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 +++ /dev/null @@ -1 +0,0 @@ -130d3588b00c2e6b7798da9c05cd6b7db58417f5 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 deleted file mode 100644 index ed8f6b9..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 +++ /dev/null @@ -1 +0,0 @@ -681dbddd2958c98592015fa8b037bd7766b09c77e786db6867018f98ea0d6a10 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 deleted file mode 100644 index 6b8f318..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 +++ /dev/null @@ -1 +0,0 @@ -058dd5210889a9b24ae14826adcbc00f02aa86fb8eca7eec8bb4e6ec864cc56cca0859e73a8c6ded84363b6354f2d790634efaf702c9e2dc8019a6a1c161c2ec \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.md5 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.md5 deleted file mode 100644 index 462db59..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -ae5443a8ec63e4a3c4e4c75b011d8329 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha1 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha1 deleted file mode 100644 index 1e7b015..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -c54007b4b6d9c943e65452a032cf5f0f3fad7f1c \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha256 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha256 deleted file mode 100644 index 98e3a01..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha256 +++ /dev/null @@ -1 +0,0 @@ -8284daf4ec8bbe6079a4c956ad7870c739e9724157dd3b7a82e4381b4941e68e \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha512 b/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha512 deleted file mode 100644 index 2859f87..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha512 +++ /dev/null @@ -1 +0,0 @@ -71f01502b151fe8b755106e2cc88d9b1a106b04c527515d977e3a15d2803421f6fa05c3fcfdc746fcd15d5867566a4294743532b8065951617afddcd5c2d3499 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.md5 b/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.md5 deleted file mode 100644 index aecdca7..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -d8d7749f8b5c0d9dfb58ce497eb00966 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha1 b/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha1 deleted file mode 100644 index 1bb89ea..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -7b0a4a0d8ae72d7d20fa5917d47098bb72996ad4 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha256 b/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha256 deleted file mode 100644 index 0ac4f8e..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha256 +++ /dev/null @@ -1 +0,0 @@ -9ce496a230bd923be4da34abd5f3501fe8dd686e8dd5e72b82515ab84e32a668 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha512 b/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha512 deleted file mode 100644 index 270ca70..0000000 --- a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml.sha512 +++ /dev/null @@ -1 +0,0 @@ -6279bd9f456efb566b4707ef2fe43d19f0ef8adc8f92cbba1fd497e5d55da8dc70b5c7096d76079a409d85e32ddc51938c751d69b24fd9a78a488087cbcac892 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar new file mode 100644 index 0000000..afc98ab Binary files /dev/null and b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar differ diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 new file mode 100644 index 0000000..473e72e --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.md5 @@ -0,0 +1 @@ +0f10025815cc3b3a056bbf80206e8eb0 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 new file mode 100644 index 0000000..c23cf96 --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha1 @@ -0,0 +1 @@ +e87d6e5bf997e0afc996543cd9f4b0c9eb807d71 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 new file mode 100644 index 0000000..eb7d2d5 --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha256 @@ -0,0 +1 @@ +0d930b968b9478cbac3f4ad19a8ee6337f53c3d11cf508be5c3e34394c7100a1 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 new file mode 100644 index 0000000..50a0322 --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.aar.sha512 @@ -0,0 +1 @@ +552b58a2c784495d09379f18a96d7852a7676162c88b981322be99d88305fad868f216817dcf90f5b58e71aaab9354d84743842c74197c8f9287e2e0198e16b9 \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom similarity index 90% rename from repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom rename to repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom index 5aa3056..90c76b3 100644 --- a/repository/com/wukong/im/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom @@ -2,7 +2,7 @@ 4.0.0 - com.wukong.im + com.xinbida.wukongim WKIMLib_loca 1.0.1 aar diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.md5 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.md5 new file mode 100644 index 0000000..aa228f0 --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.md5 @@ -0,0 +1 @@ +ce374b23b88d89b44520f0a4208d993e \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha1 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha1 new file mode 100644 index 0000000..9ac831c --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha1 @@ -0,0 +1 @@ +13bd7bd83bb8f28ff1d1a5bb3456413e5e579775 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha256 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha256 new file mode 100644 index 0000000..9ee487c --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha256 @@ -0,0 +1 @@ +1bd249c4f6fd91a96abd9dcdf5748bb5af774b10a9fffd85e52df9a8ade8a61e \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha512 b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha512 new file mode 100644 index 0000000..167cb5f --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/1.0.1/WKIMLib_loca-1.0.1.pom.sha512 @@ -0,0 +1 @@ +94d43a8b00ba1ecd736073c7e9abe5e655b0722582096e3066e18f677ce08aa184e968cefa10eeeeef9b6b59a4dbd99ea2dfce909b5a3a2c6cb6e6a5d2af460f \ No newline at end of file diff --git a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml similarity index 69% rename from repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml rename to repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml index 3f3afc0..1e0987a 100644 --- a/repository/com/wukong/im/WKIMLib_loca/maven-metadata.xml +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml @@ -1,14 +1,13 @@ - com.wukong.im + com.xinbida.wukongim WKIMLib_loca 1.0.1 1.0.1 - 1.0.0 1.0.1 - 20230609162512 + 20230619101429 diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.md5 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.md5 new file mode 100644 index 0000000..8a8d2ae --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.md5 @@ -0,0 +1 @@ +0b8c0fccab1fa9b8d5ea4208275b3e0a \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha1 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha1 new file mode 100644 index 0000000..84f2b00 --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha1 @@ -0,0 +1 @@ +77cd7adf77b6e7834245e0313c1b623742ea8061 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha256 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha256 new file mode 100644 index 0000000..1716bff --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha256 @@ -0,0 +1 @@ +c8b4564b86ca8a9dd5055e53fa89444023a21c194a03422440129089c1a5c075 \ No newline at end of file diff --git a/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha512 b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha512 new file mode 100644 index 0000000..8eb6a05 --- /dev/null +++ b/repository/com/xinbida/wukongim/WKIMLib_loca/maven-metadata.xml.sha512 @@ -0,0 +1 @@ +9304a6dddf512c7d08c918ea7d6f68685ae992329d3aa33a8016f8627a0bdceee9edd868d15999a0a98d6d263c0259fd26c911d9366d92ce51da65ff763e4ac2 \ No newline at end of file diff --git a/wkim/build.gradle b/wkim/build.gradle index 816408f..8eef912 100644 --- a/wkim/build.gradle +++ b/wkim/build.gradle @@ -9,7 +9,7 @@ afterEvaluate { publications { maven(MavenPublication) { afterEvaluate { artifact(tasks.getByName("bundleReleaseAar")) } - groupId = 'com.wukong.im' + groupId = 'com.xinbida.wukongim' artifactId = 'WKIMLib_loca' version = '1.0.1' } @@ -45,7 +45,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - namespace 'com.wukong.im' + namespace 'com.xinbida.wukongim' } dependencies { diff --git a/wkim/proguard-rules.pro b/wkim/proguard-rules.pro index 97a4ef6..b7d3a34 100644 --- a/wkim/proguard-rules.pro +++ b/wkim/proguard-rules.pro @@ -24,21 +24,21 @@ -dontwarn org.xsocket.** -keep class org.xsocket.** { *; } -keep class javax.ws.rs.** { *; } --keep class com.wukong.im.WKIM {*;} --keep class com.wukong.im.protocol.WKMessageContent {*;} --keep class com.wukong.im.protocol.WKMsgEntity {*;} --keep class com.wukong.im.message.type.WKMsgContentType { *; } --keep class com.wukong.im.entity.WKChannelType { *; } --keep class com.wukong.im.message.type.WKSendMsgResult { *; } --keep class com.wukong.im.message.type.WKConnectStatus { *; } --keep class com.wukong.im.message.type.WKConnectReason { *; } +-keep class com.xinbida.wukongim.WKIM {*;} +-keep class com.xinbida.wukongim.protocol.WKMessageContent {*;} +-keep class com.xinbida.wukongim.protocol.WKMsgEntity {*;} +-keep class com.xinbida.wukongim.message.type.WKMsgContentType { *; } +-keep class com.xinbida.wukongim.entity.WKChannelType { *; } +-keep class com.xinbida.wukongim.message.type.WKSendMsgResult { *; } +-keep class com.xinbida.wukongim.message.type.WKConnectStatus { *; } +-keep class com.xinbida.wukongim.message.type.WKConnectReason { *; } --keep class com.wukong.im.entity.* { *; } --keep class com.wukong.im.interfaces.** { *; } --keep class com.wukong.im.msgmodel.** { *; } --keep class com.wukong.im.manager.** { *; } +-keep class com.xinbida.wukongim.entity.* { *; } +-keep class com.xinbida.wukongim.interfaces.** { *; } +-keep class com.xinbida.wukongim.msgmodel.** { *; } +-keep class com.xinbida.wukongim.manager.** { *; } -keep class org.whispersystems.curve25519.** { *; } --keepclassmembers class com.wukong.im.db.WKDBHelper$DatabaseHelper { +-keepclassmembers class com.xinbida.wukongim.db.WKDBHelper$DatabaseHelper { public *; } # sqlcipher diff --git a/wkim/src/androidTest/java/com/xinbida/limaoim/ExampleInstrumentedTest.java b/wkim/src/androidTest/java/com/xinbida/wukongim/ExampleInstrumentedTest.java similarity index 85% rename from wkim/src/androidTest/java/com/xinbida/limaoim/ExampleInstrumentedTest.java rename to wkim/src/androidTest/java/com/xinbida/wukongim/ExampleInstrumentedTest.java index 8d79797..743a459 100644 --- a/wkim/src/androidTest/java/com/xinbida/limaoim/ExampleInstrumentedTest.java +++ b/wkim/src/androidTest/java/com/xinbida/wukongim/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package com.wukong.im; +package com.xinbida.wukongim; import android.content.Context; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - assertEquals("com.wukong.im.test", appContext.getPackageName()); + assertEquals("com.xinbida.wukongim.test", appContext.getPackageName()); } } \ No newline at end of file diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IUploadMsgExtraListener.java b/wkim/src/main/java/com/wukong/im/interfaces/IUploadMsgExtraListener.java deleted file mode 100644 index 8f195c7..0000000 --- a/wkim/src/main/java/com/wukong/im/interfaces/IUploadMsgExtraListener.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.wukong.im.interfaces; - -import com.wukong.im.entity.WKMsgExtra; - -public interface IUploadMsgExtraListener { - void onUpload(WKMsgExtra extra); -} diff --git a/wkim/src/main/java/com/wukong/im/WKIM.java b/wkim/src/main/java/com/xinbida/wukongim/WKIM.java similarity index 82% rename from wkim/src/main/java/com/wukong/im/WKIM.java rename to wkim/src/main/java/com/xinbida/wukongim/WKIM.java index 5dcc0f7..d47a39e 100644 --- a/wkim/src/main/java/com/wukong/im/WKIM.java +++ b/wkim/src/main/java/com/xinbida/wukongim/WKIM.java @@ -1,19 +1,19 @@ -package com.wukong.im; +package com.xinbida.wukongim; import android.content.Context; import android.text.TextUtils; -import com.wukong.im.manager.CMDManager; -import com.wukong.im.manager.ChannelManager; -import com.wukong.im.manager.ChannelMembersManager; -import com.wukong.im.manager.ConnectionManager; -import com.wukong.im.manager.ConversationManager; -import com.wukong.im.manager.MsgManager; -import com.wukong.im.manager.ReminderManager; -import com.wukong.im.manager.RobotManager; -import com.wukong.im.message.MessageHandler; -import com.wukong.im.utils.Curve25519Utils; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.manager.CMDManager; +import com.xinbida.wukongim.manager.ChannelManager; +import com.xinbida.wukongim.manager.ChannelMembersManager; +import com.xinbida.wukongim.manager.ConnectionManager; +import com.xinbida.wukongim.manager.ConversationManager; +import com.xinbida.wukongim.manager.MsgManager; +import com.xinbida.wukongim.manager.ReminderManager; +import com.xinbida.wukongim.manager.RobotManager; +import com.xinbida.wukongim.message.MessageHandler; +import com.xinbida.wukongim.utils.Curve25519Utils; +import com.xinbida.wukongim.utils.WKLoggerUtils; /** * 5/20/21 5:25 PM diff --git a/wkim/src/main/java/com/wukong/im/WKIMApplication.java b/wkim/src/main/java/com/xinbida/wukongim/WKIMApplication.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/WKIMApplication.java rename to wkim/src/main/java/com/xinbida/wukongim/WKIMApplication.java index 2c9024a..07a5f89 100644 --- a/wkim/src/main/java/com/wukong/im/WKIMApplication.java +++ b/wkim/src/main/java/com/xinbida/wukongim/WKIMApplication.java @@ -1,4 +1,4 @@ -package com.wukong.im; +package com.xinbida.wukongim; import android.content.Context; import android.content.SharedPreferences; @@ -8,9 +8,9 @@ import android.net.NetworkInfo; import android.os.Build; import android.text.TextUtils; -import com.wukong.im.db.WKDBHelper; -import com.wukong.im.entity.WKSyncMsgMode; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.db.WKDBHelper; +import com.xinbida.wukongim.entity.WKSyncMsgMode; +import com.xinbida.wukongim.utils.WKLoggerUtils; import java.lang.ref.WeakReference; import java.util.UUID; diff --git a/wkim/src/main/java/com/wukong/im/db/ChannelDBManager.java b/wkim/src/main/java/com/xinbida/wukongim/db/ChannelDBManager.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/db/ChannelDBManager.java rename to wkim/src/main/java/com/xinbida/wukongim/db/ChannelDBManager.java index 8549494..9ea6fdf 100644 --- a/wkim/src/main/java/com/wukong/im/db/ChannelDBManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/ChannelDBManager.java @@ -1,15 +1,15 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; -import static com.wukong.im.db.WKDBColumns.TABLE.channel; -import static com.wukong.im.db.WKDBColumns.TABLE.channelMembers; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.channel; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.channelMembers; import android.content.ContentValues; import android.database.Cursor; import android.text.TextUtils; -import com.wukong.im.WKIMApplication; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelSearchResult; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelSearchResult; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/db/ChannelMembersDbManager.java b/wkim/src/main/java/com/xinbida/wukongim/db/ChannelMembersDbManager.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/db/ChannelMembersDbManager.java rename to wkim/src/main/java/com/xinbida/wukongim/db/ChannelMembersDbManager.java index ecc5341..e8cfe83 100644 --- a/wkim/src/main/java/com/wukong/im/db/ChannelMembersDbManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/ChannelMembersDbManager.java @@ -1,15 +1,15 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; -import static com.wukong.im.db.WKDBColumns.TABLE.channel; -import static com.wukong.im.db.WKDBColumns.TABLE.channelMembers; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.channel; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.channelMembers; import android.content.ContentValues; import android.database.Cursor; import android.text.TextUtils; -import com.wukong.im.WKIMApplication; -import com.wukong.im.entity.WKChannelMember; -import com.wukong.im.manager.ChannelMembersManager; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.entity.WKChannelMember; +import com.xinbida.wukongim.manager.ChannelMembersManager; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/db/ConversationDbManager.java b/wkim/src/main/java/com/xinbida/wukongim/db/ConversationDbManager.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/db/ConversationDbManager.java rename to wkim/src/main/java/com/xinbida/wukongim/db/ConversationDbManager.java index b317cc6..293a684 100644 --- a/wkim/src/main/java/com/wukong/im/db/ConversationDbManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/ConversationDbManager.java @@ -1,23 +1,23 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; -import static com.wukong.im.db.WKDBColumns.TABLE.channel; -import static com.wukong.im.db.WKDBColumns.TABLE.conversation; -import static com.wukong.im.db.WKDBColumns.TABLE.conversationExtra; -import static com.wukong.im.db.WKDBColumns.TABLE.message; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.channel; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.conversation; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.conversationExtra; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.message; import android.content.ContentValues; import android.database.Cursor; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.entity.WKConversationMsg; -import com.wukong.im.entity.WKConversationMsgExtra; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKUIConversationMsg; -import com.wukong.im.manager.ConversationManager; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKConversationMsg; +import com.xinbida.wukongim.entity.WKConversationMsgExtra; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKUIConversationMsg; +import com.xinbida.wukongim.manager.ConversationManager; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/db/MsgDbManager.java b/wkim/src/main/java/com/xinbida/wukongim/db/MsgDbManager.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/db/MsgDbManager.java rename to wkim/src/main/java/com/xinbida/wukongim/db/MsgDbManager.java index c64a85a..4f5003b 100644 --- a/wkim/src/main/java/com/wukong/im/db/MsgDbManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/MsgDbManager.java @@ -1,30 +1,30 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; -import static com.wukong.im.db.WKDBColumns.TABLE.channel; -import static com.wukong.im.db.WKDBColumns.TABLE.channelMembers; -import static com.wukong.im.db.WKDBColumns.TABLE.message; -import static com.wukong.im.db.WKDBColumns.TABLE.messageExtra; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.channel; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.channelMembers; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.message; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.messageExtra; import android.content.ContentValues; import android.database.Cursor; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelMember; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.entity.WKMessageGroupByDate; -import com.wukong.im.entity.WKMessageSearchResult; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKMsgExtra; -import com.wukong.im.entity.WKMsgReaction; -import com.wukong.im.entity.WKMsgSetting; -import com.wukong.im.interfaces.IGetOrSyncHistoryMsgBack; -import com.wukong.im.manager.MsgManager; -import com.wukong.im.message.type.WKSendMsgResult; -import com.wukong.im.protocol.WKMessageContent; -import com.wukong.im.utils.WKTypeUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKMessageGroupByDate; +import com.xinbida.wukongim.entity.WKMessageSearchResult; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsgExtra; +import com.xinbida.wukongim.entity.WKMsgReaction; +import com.xinbida.wukongim.entity.WKMsgSetting; +import com.xinbida.wukongim.interfaces.IGetOrSyncHistoryMsgBack; +import com.xinbida.wukongim.manager.MsgManager; +import com.xinbida.wukongim.message.type.WKSendMsgResult; +import com.xinbida.wukongim.protocol.WKMessageContent; +import com.xinbida.wukongim.utils.WKTypeUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/db/MsgReactionDBManager.java b/wkim/src/main/java/com/xinbida/wukongim/db/MsgReactionDBManager.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/db/MsgReactionDBManager.java rename to wkim/src/main/java/com/xinbida/wukongim/db/MsgReactionDBManager.java index f48499a..94debd3 100644 --- a/wkim/src/main/java/com/wukong/im/db/MsgReactionDBManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/MsgReactionDBManager.java @@ -1,16 +1,16 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; -import static com.wukong.im.db.WKDBColumns.TABLE.messageReaction; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.messageReaction; import android.content.ContentValues; import android.database.Cursor; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKMsgReaction; -import com.wukong.im.entity.WKChannelType; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKMsgReaction; +import com.xinbida.wukongim.entity.WKChannelType; import java.util.ArrayList; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/db/ReminderDBManager.java b/wkim/src/main/java/com/xinbida/wukongim/db/ReminderDBManager.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/db/ReminderDBManager.java rename to wkim/src/main/java/com/xinbida/wukongim/db/ReminderDBManager.java index eab5b80..7138261 100644 --- a/wkim/src/main/java/com/wukong/im/db/ReminderDBManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/ReminderDBManager.java @@ -1,15 +1,15 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; -import static com.wukong.im.db.WKDBColumns.TABLE.reminders; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.reminders; import android.content.ContentValues; import android.database.Cursor; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.entity.WKReminder; -import com.wukong.im.entity.WKUIConversationMsg; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.entity.WKReminder; +import com.xinbida.wukongim.entity.WKUIConversationMsg; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/db/RobotDBManager.java b/wkim/src/main/java/com/xinbida/wukongim/db/RobotDBManager.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/db/RobotDBManager.java rename to wkim/src/main/java/com/xinbida/wukongim/db/RobotDBManager.java index 9c0652c..6ad3fdd 100644 --- a/wkim/src/main/java/com/wukong/im/db/RobotDBManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/RobotDBManager.java @@ -1,14 +1,14 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; -import static com.wukong.im.db.WKDBColumns.TABLE.robot; -import static com.wukong.im.db.WKDBColumns.TABLE.robotMenu; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.robot; +import static com.xinbida.wukongim.db.WKDBColumns.TABLE.robotMenu; import android.content.ContentValues; import android.database.Cursor; -import com.wukong.im.WKIMApplication; -import com.wukong.im.entity.WKRobot; -import com.wukong.im.entity.WKRobotMenu; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.entity.WKRobot; +import com.xinbida.wukongim.entity.WKRobotMenu; import java.util.ArrayList; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/db/WKCursor.java b/wkim/src/main/java/com/xinbida/wukongim/db/WKCursor.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/db/WKCursor.java rename to wkim/src/main/java/com/xinbida/wukongim/db/WKCursor.java index e9c1ee6..bf3b50c 100644 --- a/wkim/src/main/java/com/wukong/im/db/WKCursor.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/WKCursor.java @@ -1,4 +1,4 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; import android.database.Cursor; diff --git a/wkim/src/main/java/com/wukong/im/db/WKDBColumns.java b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBColumns.java similarity index 99% rename from wkim/src/main/java/com/wukong/im/db/WKDBColumns.java rename to wkim/src/main/java/com/xinbida/wukongim/db/WKDBColumns.java index 0a2f38f..275c3e6 100644 --- a/wkim/src/main/java/com/wukong/im/db/WKDBColumns.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBColumns.java @@ -1,4 +1,4 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; /** * 2020-05-20 17:26 diff --git a/wkim/src/main/java/com/wukong/im/db/WKDBHelper.java b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBHelper.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/db/WKDBHelper.java rename to wkim/src/main/java/com/xinbida/wukongim/db/WKDBHelper.java index 2465838..300d451 100755 --- a/wkim/src/main/java/com/wukong/im/db/WKDBHelper.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBHelper.java @@ -1,11 +1,11 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.text.TextUtils; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.utils.WKLoggerUtils; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteOpenHelper; diff --git a/wkim/src/main/java/com/wukong/im/db/WKDBSql.java b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBSql.java similarity index 89% rename from wkim/src/main/java/com/wukong/im/db/WKDBSql.java rename to wkim/src/main/java/com/xinbida/wukongim/db/WKDBSql.java index 0af387d..4617e34 100644 --- a/wkim/src/main/java/com/wukong/im/db/WKDBSql.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBSql.java @@ -1,4 +1,4 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/db/WKDBUpgrade.java b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBUpgrade.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/db/WKDBUpgrade.java rename to wkim/src/main/java/com/xinbida/wukongim/db/WKDBUpgrade.java index f26ae6f..671393e 100644 --- a/wkim/src/main/java/com/wukong/im/db/WKDBUpgrade.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/WKDBUpgrade.java @@ -1,10 +1,10 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; import android.content.res.AssetManager; import android.text.TextUtils; -import com.wukong.im.WKIMApplication; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.utils.WKLoggerUtils; import net.sqlcipher.database.SQLiteDatabase; diff --git a/wkim/src/main/java/com/wukong/im/db/WKSqlContentValues.java b/wkim/src/main/java/com/xinbida/wukongim/db/WKSqlContentValues.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/db/WKSqlContentValues.java rename to wkim/src/main/java/com/xinbida/wukongim/db/WKSqlContentValues.java index 2b5d0a2..8e02231 100755 --- a/wkim/src/main/java/com/wukong/im/db/WKSqlContentValues.java +++ b/wkim/src/main/java/com/xinbida/wukongim/db/WKSqlContentValues.java @@ -1,19 +1,19 @@ -package com.wukong.im.db; +package com.xinbida.wukongim.db; import android.content.ContentValues; import android.text.TextUtils; import android.util.Log; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelMember; -import com.wukong.im.entity.WKConversationMsg; -import com.wukong.im.entity.WKConversationMsgExtra; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKMsgExtra; -import com.wukong.im.entity.WKMsgReaction; -import com.wukong.im.entity.WKMsgSetting; -import com.wukong.im.entity.WKReminder; -import com.wukong.im.utils.WKTypeUtils; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKConversationMsg; +import com.xinbida.wukongim.entity.WKConversationMsgExtra; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsgExtra; +import com.xinbida.wukongim.entity.WKMsgReaction; +import com.xinbida.wukongim.entity.WKMsgSetting; +import com.xinbida.wukongim.entity.WKReminder; +import com.xinbida.wukongim.utils.WKTypeUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKCMD.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKCMD.java similarity index 90% rename from wkim/src/main/java/com/wukong/im/entity/WKCMD.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKCMD.java index daaadc8..0298cf0 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKCMD.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKCMD.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKCMDKeys.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKCMDKeys.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/entity/WKCMDKeys.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKCMDKeys.java index f3d529b..78afb09 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKCMDKeys.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKCMDKeys.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 2020-10-20 16:44 diff --git a/wkim/src/main/java/com/wukong/im/entity/WKChannel.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannel.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/entity/WKChannel.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKChannel.java index 3fbc6b4..3ed8aa7 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKChannel.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannel.java @@ -1,9 +1,9 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.utils.DateUtils; +import com.xinbida.wukongim.utils.DateUtils; import java.util.HashMap; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKChannelExtras.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelExtras.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/entity/WKChannelExtras.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelExtras.java index d608321..c47ae0e 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKChannelExtras.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelExtras.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** diff --git a/wkim/src/main/java/com/wukong/im/entity/WKChannelMember.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelMember.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/entity/WKChannelMember.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelMember.java index 1c27c88..43d004c 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKChannelMember.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelMember.java @@ -1,9 +1,9 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.utils.DateUtils; +import com.xinbida.wukongim.utils.DateUtils; import java.util.HashMap; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKChannelMemberExtras.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelMemberExtras.java similarity index 79% rename from wkim/src/main/java/com/wukong/im/entity/WKChannelMemberExtras.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelMemberExtras.java index 36ab333..1b52b08 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKChannelMemberExtras.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelMemberExtras.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 2020-12-04 13:30 diff --git a/wkim/src/main/java/com/wukong/im/entity/WKChannelSearchResult.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelSearchResult.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/entity/WKChannelSearchResult.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelSearchResult.java index 651f4ca..5435fea 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKChannelSearchResult.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelSearchResult.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKChannelStatus.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelStatus.java similarity index 87% rename from wkim/src/main/java/com/wukong/im/entity/WKChannelStatus.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelStatus.java index 98bc788..d38ac7a 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKChannelStatus.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelStatus.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 3/4/21 11:44 AM diff --git a/wkim/src/main/java/com/wukong/im/entity/WKChannelType.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelType.java similarity index 90% rename from wkim/src/main/java/com/wukong/im/entity/WKChannelType.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelType.java index 632af0f..25a4e91 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKChannelType.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKChannelType.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 2019-11-11 09:50 diff --git a/wkim/src/main/java/com/wukong/im/entity/WKConversationMsg.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKConversationMsg.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/entity/WKConversationMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKConversationMsg.java index 4b14a39..2dcc2a6 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKConversationMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKConversationMsg.java @@ -1,9 +1,9 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import androidx.annotation.NonNull; -import com.wukong.im.utils.DateUtils; +import com.xinbida.wukongim.utils.DateUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKConversationMsgExtra.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKConversationMsgExtra.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/entity/WKConversationMsgExtra.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKConversationMsgExtra.java index 59d1742..bd6389c 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKConversationMsgExtra.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKConversationMsgExtra.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import androidx.annotation.NonNull; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMentionInfo.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMentionInfo.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/entity/WKMentionInfo.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMentionInfo.java index b0cd3de..5e88826 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMentionInfo.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMentionInfo.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMentionType.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMentionType.java similarity index 85% rename from wkim/src/main/java/com/wukong/im/entity/WKMentionType.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMentionType.java index b47cdce..d5e5705 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMentionType.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMentionType.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 2020-05-12 23:42 diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMessageGroupByDate.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMessageGroupByDate.java similarity index 82% rename from wkim/src/main/java/com/wukong/im/entity/WKMessageGroupByDate.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMessageGroupByDate.java index 3715523..3347061 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMessageGroupByDate.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMessageGroupByDate.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 3/23/21 4:59 PM diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMessageSearchResult.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMessageSearchResult.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/entity/WKMessageSearchResult.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMessageSearchResult.java index 396e16d..3297be0 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMessageSearchResult.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMessageSearchResult.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMsg.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsg.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/entity/WKMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMsg.java index 5054499..28aa1ff 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsg.java @@ -1,14 +1,14 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.WKIM; -import com.wukong.im.manager.ChannelManager; -import com.wukong.im.manager.ChannelMembersManager; -import com.wukong.im.message.type.WKSendMsgResult; -import com.wukong.im.protocol.WKMessageContent; -import com.wukong.im.utils.DateUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.manager.ChannelManager; +import com.xinbida.wukongim.manager.ChannelMembersManager; +import com.xinbida.wukongim.message.type.WKSendMsgResult; +import com.xinbida.wukongim.protocol.WKMessageContent; +import com.xinbida.wukongim.utils.DateUtils; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMsgExtra.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgExtra.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/entity/WKMsgExtra.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgExtra.java index e2eae20..b38edea 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMsgExtra.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgExtra.java @@ -1,9 +1,9 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.protocol.WKMessageContent; public class WKMsgExtra implements Parcelable { public String messageID; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMsgHeader.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgHeader.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/entity/WKMsgHeader.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgHeader.java index fad6264..2655946 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMsgHeader.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgHeader.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMsgReaction.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgReaction.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/entity/WKMsgReaction.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgReaction.java index 15ab033..f6fa22c 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMsgReaction.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgReaction.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKMsgSetting.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgSetting.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/entity/WKMsgSetting.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgSetting.java index c3ce4f9..d562385 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKMsgSetting.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKMsgSetting.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.os.Parcel; import android.os.Parcelable; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKOneTimePreKey.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKOneTimePreKey.java similarity index 68% rename from wkim/src/main/java/com/wukong/im/entity/WKOneTimePreKey.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKOneTimePreKey.java index 49c29f1..923e805 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKOneTimePreKey.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKOneTimePreKey.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; public class WKOneTimePreKey { public int keyID; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKReminder.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKReminder.java similarity index 92% rename from wkim/src/main/java/com/wukong/im/entity/WKReminder.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKReminder.java index 3f9c3b2..c84bee1 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKReminder.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKReminder.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.Map; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKRobot.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKRobot.java similarity index 86% rename from wkim/src/main/java/com/wukong/im/entity/WKRobot.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKRobot.java index 6e273e0..eef195a 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKRobot.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKRobot.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; public class WKRobot { public String robotID; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKRobotMenu.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKRobotMenu.java similarity index 83% rename from wkim/src/main/java/com/wukong/im/entity/WKRobotMenu.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKRobotMenu.java index cbb36a3..cd9edfa 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKRobotMenu.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKRobotMenu.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; public class WKRobotMenu { public String robotID; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSignalKey.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSignalKey.java similarity index 87% rename from wkim/src/main/java/com/wukong/im/entity/WKSignalKey.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSignalKey.java index 3bfb5ed..83a6a08 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSignalKey.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSignalKey.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; public class WKSignalKey { public String UID; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSignalProtocolData.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSignalProtocolData.java similarity index 90% rename from wkim/src/main/java/com/wukong/im/entity/WKSignalProtocolData.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSignalProtocolData.java index cb7d9ea..bca74e7 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSignalProtocolData.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSignalProtocolData.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncChannelMsg.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncChannelMsg.java similarity index 86% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncChannelMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncChannelMsg.java index addac87..5b91f45 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncChannelMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncChannelMsg.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncChat.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncChat.java similarity index 86% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncChat.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncChat.java index db2f7f5..5942533 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncChat.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncChat.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncCmd.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncCmd.java similarity index 83% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncCmd.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncCmd.java index a671706..b5f2fd0 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncCmd.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncCmd.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.Map; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncConvMsg.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncConvMsg.java similarity index 90% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncConvMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncConvMsg.java index 41b332e..eafbc62 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncConvMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncConvMsg.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncConvMsgExtra.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncConvMsgExtra.java similarity index 88% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncConvMsgExtra.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncConvMsgExtra.java index ed2268e..e6d857c 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncConvMsgExtra.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncConvMsgExtra.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; public class WKSyncConvMsgExtra { public String channel_id; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncExtraMsg.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncExtraMsg.java similarity index 92% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncExtraMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncExtraMsg.java index 24f3dc8..4c2d1d5 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncExtraMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncExtraMsg.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.Map; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncMsg.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsg.java similarity index 82% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsg.java index df8e8f7..dfbde82 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsg.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 2019-12-06 16:32 diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncMsgMode.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsgMode.java similarity index 72% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncMsgMode.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsgMode.java index 95800fc..1f1c6c2 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncMsgMode.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsgMode.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 2020-10-16 10:44 diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncMsgReaction.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsgReaction.java similarity index 89% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncMsgReaction.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsgReaction.java index 42d86f4..944a73c 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncMsgReaction.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncMsgReaction.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 4/16/21 2:48 PM diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncRecent.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncRecent.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncRecent.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncRecent.java index 9718414..a25ba51 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncRecent.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncRecent.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import java.util.List; import java.util.Map; diff --git a/wkim/src/main/java/com/wukong/im/entity/WKSyncRecentHeader.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncRecentHeader.java similarity index 81% rename from wkim/src/main/java/com/wukong/im/entity/WKSyncRecentHeader.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncRecentHeader.java index 323264e..0eac904 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKSyncRecentHeader.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKSyncRecentHeader.java @@ -1,4 +1,4 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; /** * 2020-10-09 15:12 diff --git a/wkim/src/main/java/com/wukong/im/entity/WKUIConversationMsg.java b/wkim/src/main/java/com/xinbida/wukongim/entity/WKUIConversationMsg.java similarity index 92% rename from wkim/src/main/java/com/wukong/im/entity/WKUIConversationMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/entity/WKUIConversationMsg.java index 53b68b4..6f9d823 100644 --- a/wkim/src/main/java/com/wukong/im/entity/WKUIConversationMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/entity/WKUIConversationMsg.java @@ -1,11 +1,11 @@ -package com.wukong.im.entity; +package com.xinbida.wukongim.entity; import android.text.TextUtils; -import com.wukong.im.db.MsgDbManager; -import com.wukong.im.db.ReminderDBManager; -import com.wukong.im.manager.ChannelManager; +import com.xinbida.wukongim.db.MsgDbManager; +import com.xinbida.wukongim.db.ReminderDBManager; +import com.xinbida.wukongim.manager.ChannelManager; import java.util.HashMap; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IAddChannelMemberListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IAddChannelMemberListener.java similarity index 65% rename from wkim/src/main/java/com/wukong/im/interfaces/IAddChannelMemberListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IAddChannelMemberListener.java index e53b650..5a70810 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IAddChannelMemberListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IAddChannelMemberListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelMember; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ICMDListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ICMDListener.java similarity index 55% rename from wkim/src/main/java/com/wukong/im/interfaces/ICMDListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ICMDListener.java index 144d3bb..a367265 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ICMDListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ICMDListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKCMD; +import com.xinbida.wukongim.entity.WKCMD; /** * 2/3/21 2:23 PM diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IChannelInfoListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelInfoListener.java similarity index 59% rename from wkim/src/main/java/com/wukong/im/interfaces/IChannelInfoListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelInfoListener.java index d798c54..c86e2bd 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IChannelInfoListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelInfoListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannel; /** * 2019-12-01 15:42 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IChannelMemberInfoListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelMemberInfoListener.java similarity index 60% rename from wkim/src/main/java/com/wukong/im/interfaces/IChannelMemberInfoListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelMemberInfoListener.java index be2fcd8..4248452 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IChannelMemberInfoListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelMemberInfoListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelMember; /** * 2019-12-01 15:54 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IChannelMemberListResult.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelMemberListResult.java similarity index 56% rename from wkim/src/main/java/com/wukong/im/interfaces/IChannelMemberListResult.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelMemberListResult.java index ed0ebe8..99c3db8 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IChannelMemberListResult.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IChannelMemberListResult.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelMember; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IClearMsgListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IClearMsgListener.java similarity index 72% rename from wkim/src/main/java/com/wukong/im/interfaces/IClearMsgListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IClearMsgListener.java index fb11f5a..c335553 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IClearMsgListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IClearMsgListener.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; public interface IClearMsgListener { void clear(String channelID, byte channelType, String fromUID); diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IConnectionStatus.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IConnectionStatus.java similarity index 75% rename from wkim/src/main/java/com/wukong/im/interfaces/IConnectionStatus.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IConnectionStatus.java index 1021b57..96a117f 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IConnectionStatus.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IConnectionStatus.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2019-11-18 11:54 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ICryptoSignalData.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ICryptoSignalData.java similarity index 79% rename from wkim/src/main/java/com/wukong/im/interfaces/ICryptoSignalData.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ICryptoSignalData.java index 5bd5aa0..ec317b9 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ICryptoSignalData.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ICryptoSignalData.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; public interface ICryptoSignalData { void getChannelSignalData(String channelID, byte channelTyp, ICryptoSignalDataResult iCryptoSignalDataResult); diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ICryptoSignalDataResult.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ICryptoSignalDataResult.java similarity index 50% rename from wkim/src/main/java/com/wukong/im/interfaces/ICryptoSignalDataResult.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ICryptoSignalDataResult.java index 04a177e..e237714 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ICryptoSignalDataResult.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ICryptoSignalDataResult.java @@ -1,6 +1,6 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKSignalKey; +import com.xinbida.wukongim.entity.WKSignalKey; public interface ICryptoSignalDataResult { void onResult(WKSignalKey signalKey); diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IDeleteConversationMsg.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IDeleteConversationMsg.java similarity index 79% rename from wkim/src/main/java/com/wukong/im/interfaces/IDeleteConversationMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IDeleteConversationMsg.java index 65e8a89..84f90cc 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IDeleteConversationMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IDeleteConversationMsg.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2020-12-04 11:30 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IDeleteMsgListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IDeleteMsgListener.java similarity index 60% rename from wkim/src/main/java/com/wukong/im/interfaces/IDeleteMsgListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IDeleteMsgListener.java index cc8d093..9bc453f 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IDeleteMsgListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IDeleteMsgListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; /** * 2020-08-19 21:42 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelInfo.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelInfo.java similarity index 69% rename from wkim/src/main/java/com/wukong/im/interfaces/IGetChannelInfo.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelInfo.java index 43b3c7d..577cc00 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelInfo.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelInfo.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannel; /** * 2019-12-01 15:40 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberInfo.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberInfo.java similarity index 71% rename from wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberInfo.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberInfo.java index cc5b1ba..0dad9bf 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberInfo.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberInfo.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelMember; /** * 2019-12-01 15:52 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberList.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberList.java similarity index 84% rename from wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberList.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberList.java index d5a272e..539431f 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberList.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberList.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberListResult.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberListResult.java similarity index 61% rename from wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberListResult.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberListResult.java index d156e7b..4601afd 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IGetChannelMemberListResult.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetChannelMemberListResult.java @@ -1,6 +1,6 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelMember; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IGetIpAndPort.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetIpAndPort.java similarity index 79% rename from wkim/src/main/java/com/wukong/im/interfaces/IGetIpAndPort.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetIpAndPort.java index 7a5a733..389c198 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IGetIpAndPort.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetIpAndPort.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2019-11-11 10:04 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IGetOrSyncHistoryMsgBack.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetOrSyncHistoryMsgBack.java similarity index 67% rename from wkim/src/main/java/com/wukong/im/interfaces/IGetOrSyncHistoryMsgBack.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetOrSyncHistoryMsgBack.java index ad4b498..554e192 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IGetOrSyncHistoryMsgBack.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetOrSyncHistoryMsgBack.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IGetSocketIpAndPortListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetSocketIpAndPortListener.java similarity index 79% rename from wkim/src/main/java/com/wukong/im/interfaces/IGetSocketIpAndPortListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetSocketIpAndPortListener.java index 4b84155..e6219ba 100755 --- a/wkim/src/main/java/com/wukong/im/interfaces/IGetSocketIpAndPortListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IGetSocketIpAndPortListener.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2019-11-11 10:05 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IMessageStoreBeforeIntercept.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IMessageStoreBeforeIntercept.java similarity index 62% rename from wkim/src/main/java/com/wukong/im/interfaces/IMessageStoreBeforeIntercept.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IMessageStoreBeforeIntercept.java index cba0d12..eb718f2 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IMessageStoreBeforeIntercept.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IMessageStoreBeforeIntercept.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; /** * 2020-12-04 17:33 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/INewMsgListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/INewMsgListener.java similarity index 63% rename from wkim/src/main/java/com/wukong/im/interfaces/INewMsgListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/INewMsgListener.java index e6fdee1..c7ce436 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/INewMsgListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/INewMsgListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/INewReminderListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/INewReminderListener.java similarity index 56% rename from wkim/src/main/java/com/wukong/im/interfaces/INewReminderListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/INewReminderListener.java index b552cdc..b97efd2 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/INewReminderListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/INewReminderListener.java @@ -1,6 +1,6 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKReminder; +import com.xinbida.wukongim.entity.WKReminder; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IReceivedMsgListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IReceivedMsgListener.java similarity index 74% rename from wkim/src/main/java/com/wukong/im/interfaces/IReceivedMsgListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IReceivedMsgListener.java index 27ac494..677a618 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IReceivedMsgListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IReceivedMsgListener.java @@ -1,10 +1,10 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.protocol.WKDisconnectMsg; -import com.wukong.im.protocol.WKPongMsg; -import com.wukong.im.protocol.WKSendAckMsg; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.protocol.WKDisconnectMsg; +import com.xinbida.wukongim.protocol.WKPongMsg; +import com.xinbida.wukongim.protocol.WKSendAckMsg; /** * 2019-11-10 17:03 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannel.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannel.java similarity index 62% rename from wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannel.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannel.java index 7c2b505..f3745b0 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannel.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannel.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannel; /** * 2020-02-01 14:38 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannelAvatar.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannelAvatar.java similarity index 79% rename from wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannelAvatar.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannelAvatar.java index 37e1092..bdd150f 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannelAvatar.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannelAvatar.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2020-04-01 22:16 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannelMember.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannelMember.java similarity index 64% rename from wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannelMember.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannelMember.java index 63f855e..2aff059 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshChannelMember.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshChannelMember.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelMember; /** * 2020-02-01 15:19 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshConversationMsg.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshConversationMsg.java similarity index 66% rename from wkim/src/main/java/com/wukong/im/interfaces/IRefreshConversationMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshConversationMsg.java index 8649719..b0a528c 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshConversationMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshConversationMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKUIConversationMsg; +import com.xinbida.wukongim.entity.WKUIConversationMsg; /** * 2020-02-21 11:11 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshMsg.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshMsg.java similarity index 61% rename from wkim/src/main/java/com/wukong/im/interfaces/IRefreshMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshMsg.java index 294592b..005317f 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; /** * 2020-08-27 21:18 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshRobotMenu.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshRobotMenu.java similarity index 63% rename from wkim/src/main/java/com/wukong/im/interfaces/IRefreshRobotMenu.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshRobotMenu.java index 9ab2e55..bdae8ec 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IRefreshRobotMenu.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRefreshRobotMenu.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; public interface IRefreshRobotMenu { void onRefreshRobotMenu(); diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IRemoveChannelMember.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRemoveChannelMember.java similarity index 65% rename from wkim/src/main/java/com/wukong/im/interfaces/IRemoveChannelMember.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IRemoveChannelMember.java index 9045bf8..749191d 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IRemoveChannelMember.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IRemoveChannelMember.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKChannelMember; +import com.xinbida.wukongim.entity.WKChannelMember; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISendACK.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISendACK.java similarity index 57% rename from wkim/src/main/java/com/wukong/im/interfaces/ISendACK.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISendACK.java index 00ae629..a388d18 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISendACK.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISendACK.java @@ -1,6 +1,6 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; /** * 5/12/21 2:02 PM diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISendMsgCallBackListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISendMsgCallBackListener.java similarity index 61% rename from wkim/src/main/java/com/wukong/im/interfaces/ISendMsgCallBackListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISendMsgCallBackListener.java index 8dda2f6..b34730c 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISendMsgCallBackListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISendMsgCallBackListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; /** * 2020-08-02 00:21 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMembers.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMembers.java similarity index 80% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMembers.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMembers.java index cfd0d6f..800a9fa 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMembers.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMembers.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2020-02-21 10:52 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMsgBack.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMsgBack.java similarity index 56% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMsgBack.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMsgBack.java index d505cb8..2d32b7d 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMsgBack.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMsgBack.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKSyncChannelMsg; +import com.xinbida.wukongim.entity.WKSyncChannelMsg; /** * 2020-10-10 15:17 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMsgListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMsgListener.java similarity index 86% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMsgListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMsgListener.java index 8fdce65..717ddd7 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncChannelMsgListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncChannelMsgListener.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2020-10-10 15:16 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncConversationChat.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncConversationChat.java similarity index 92% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncConversationChat.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncConversationChat.java index e9a6874..6b0a979 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncConversationChat.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncConversationChat.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2020-10-09 14:41 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncConversationChatBack.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncConversationChatBack.java similarity index 61% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncConversationChatBack.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncConversationChatBack.java index 911feec..77a840e 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncConversationChatBack.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncConversationChatBack.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKSyncChat; +import com.xinbida.wukongim.entity.WKSyncChat; /** * 2020-10-09 14:43 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncMsgReaction.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncMsgReaction.java similarity index 80% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncMsgReaction.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncMsgReaction.java index 3d3abb6..f933bf0 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncMsgReaction.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncMsgReaction.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 4/16/21 3:00 PM diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncOfflineMsgBack.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncOfflineMsgBack.java similarity index 67% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncOfflineMsgBack.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncOfflineMsgBack.java index 77f1368..2ed51ef 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncOfflineMsgBack.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncOfflineMsgBack.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKSyncMsg; +import com.xinbida.wukongim.entity.WKSyncMsg; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/interfaces/ISyncOfflineMsgListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncOfflineMsgListener.java similarity index 81% rename from wkim/src/main/java/com/wukong/im/interfaces/ISyncOfflineMsgListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncOfflineMsgListener.java index 225eea4..3a79ee0 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/ISyncOfflineMsgListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/ISyncOfflineMsgListener.java @@ -1,4 +1,4 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; /** * 2020-09-28 15:05 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IUploadAttacResultListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadAttacResultListener.java similarity index 70% rename from wkim/src/main/java/com/wukong/im/interfaces/IUploadAttacResultListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadAttacResultListener.java index 7a2d3c7..362f486 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IUploadAttacResultListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadAttacResultListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.protocol.WKMessageContent; /** * 2019-11-10 16:12 diff --git a/wkim/src/main/java/com/wukong/im/interfaces/IUploadAttachmentListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadAttachmentListener.java similarity index 70% rename from wkim/src/main/java/com/wukong/im/interfaces/IUploadAttachmentListener.java rename to wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadAttachmentListener.java index d5f76ea..54185b7 100644 --- a/wkim/src/main/java/com/wukong/im/interfaces/IUploadAttachmentListener.java +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadAttachmentListener.java @@ -1,7 +1,7 @@ -package com.wukong.im.interfaces; +package com.xinbida.wukongim.interfaces; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; /** * 2020-08-02 00:29 diff --git a/wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadMsgExtraListener.java b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadMsgExtraListener.java new file mode 100644 index 0000000..f64b548 --- /dev/null +++ b/wkim/src/main/java/com/xinbida/wukongim/interfaces/IUploadMsgExtraListener.java @@ -0,0 +1,7 @@ +package com.xinbida.wukongim.interfaces; + +import com.xinbida.wukongim.entity.WKMsgExtra; + +public interface IUploadMsgExtraListener { + void onUpload(WKMsgExtra extra); +} diff --git a/wkim/src/main/java/com/wukong/im/manager/BaseManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/BaseManager.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/manager/BaseManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/BaseManager.java index 5d3e161..e0daa96 100644 --- a/wkim/src/main/java/com/wukong/im/manager/BaseManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/BaseManager.java @@ -1,4 +1,4 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.os.Handler; import android.os.Looper; diff --git a/wkim/src/main/java/com/wukong/im/manager/CMDManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/CMDManager.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/manager/CMDManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/CMDManager.java index 6082556..d60783c 100644 --- a/wkim/src/main/java/com/wukong/im/manager/CMDManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/CMDManager.java @@ -1,18 +1,18 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.db.ConversationDbManager; -import com.wukong.im.db.WKDBColumns; -import com.wukong.im.db.MsgDbManager; -import com.wukong.im.entity.WKCMD; -import com.wukong.im.entity.WKCMDKeys; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.interfaces.ICMDListener; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.utils.DateUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.db.ConversationDbManager; +import com.xinbida.wukongim.db.WKDBColumns; +import com.xinbida.wukongim.db.MsgDbManager; +import com.xinbida.wukongim.entity.WKCMD; +import com.xinbida.wukongim.entity.WKCMDKeys; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.interfaces.ICMDListener; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.utils.DateUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/manager/ChannelManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/ChannelManager.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/manager/ChannelManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/ChannelManager.java index 55e8abd..c2c2098 100644 --- a/wkim/src/main/java/com/wukong/im/manager/ChannelManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/ChannelManager.java @@ -1,15 +1,15 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.text.TextUtils; -import com.wukong.im.db.ChannelDBManager; -import com.wukong.im.db.WKDBColumns; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelSearchResult; -import com.wukong.im.interfaces.IChannelInfoListener; -import com.wukong.im.interfaces.IGetChannelInfo; -import com.wukong.im.interfaces.IRefreshChannel; -import com.wukong.im.interfaces.IRefreshChannelAvatar; +import com.xinbida.wukongim.db.ChannelDBManager; +import com.xinbida.wukongim.db.WKDBColumns; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelSearchResult; +import com.xinbida.wukongim.interfaces.IChannelInfoListener; +import com.xinbida.wukongim.interfaces.IGetChannelInfo; +import com.xinbida.wukongim.interfaces.IRefreshChannel; +import com.xinbida.wukongim.interfaces.IRefreshChannelAvatar; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/manager/ChannelMembersManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/ChannelMembersManager.java similarity index 94% rename from wkim/src/main/java/com/wukong/im/manager/ChannelMembersManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/ChannelMembersManager.java index cd92b1c..4a65667 100644 --- a/wkim/src/main/java/com/wukong/im/manager/ChannelMembersManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/ChannelMembersManager.java @@ -1,23 +1,23 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.text.TextUtils; import androidx.annotation.NonNull; -import com.wukong.im.WKIM; -import com.wukong.im.db.ChannelMembersDbManager; -import com.wukong.im.db.WKDBColumns; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelExtras; -import com.wukong.im.entity.WKChannelMember; -import com.wukong.im.interfaces.IAddChannelMemberListener; -import com.wukong.im.interfaces.IChannelMemberInfoListener; -import com.wukong.im.interfaces.IGetChannelMemberInfo; -import com.wukong.im.interfaces.IGetChannelMemberList; -import com.wukong.im.interfaces.IGetChannelMemberListResult; -import com.wukong.im.interfaces.IRefreshChannelMember; -import com.wukong.im.interfaces.IRemoveChannelMember; -import com.wukong.im.interfaces.ISyncChannelMembers; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.db.ChannelMembersDbManager; +import com.xinbida.wukongim.db.WKDBColumns; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelExtras; +import com.xinbida.wukongim.entity.WKChannelMember; +import com.xinbida.wukongim.interfaces.IAddChannelMemberListener; +import com.xinbida.wukongim.interfaces.IChannelMemberInfoListener; +import com.xinbida.wukongim.interfaces.IGetChannelMemberInfo; +import com.xinbida.wukongim.interfaces.IGetChannelMemberList; +import com.xinbida.wukongim.interfaces.IGetChannelMemberListResult; +import com.xinbida.wukongim.interfaces.IRefreshChannelMember; +import com.xinbida.wukongim.interfaces.IRemoveChannelMember; +import com.xinbida.wukongim.interfaces.ISyncChannelMembers; import java.util.ArrayList; import java.util.List; diff --git a/wkim/src/main/java/com/wukong/im/manager/ConnectionManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/ConnectionManager.java similarity index 89% rename from wkim/src/main/java/com/wukong/im/manager/ConnectionManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/ConnectionManager.java index d762940..0704e31 100644 --- a/wkim/src/main/java/com/wukong/im/manager/ConnectionManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/ConnectionManager.java @@ -1,15 +1,15 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.interfaces.IConnectionStatus; -import com.wukong.im.interfaces.IGetIpAndPort; -import com.wukong.im.interfaces.IGetSocketIpAndPortListener; -import com.wukong.im.message.ConnectionHandler; -import com.wukong.im.message.MessageHandler; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.interfaces.IConnectionStatus; +import com.xinbida.wukongim.interfaces.IGetIpAndPort; +import com.xinbida.wukongim.interfaces.IGetSocketIpAndPortListener; +import com.xinbida.wukongim.message.ConnectionHandler; +import com.xinbida.wukongim.message.MessageHandler; +import com.xinbida.wukongim.utils.WKLoggerUtils; import java.util.Map; import java.util.UUID; diff --git a/wkim/src/main/java/com/wukong/im/manager/ConversationManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java similarity index 93% rename from wkim/src/main/java/com/wukong/im/manager/ConversationManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java index 693a7e7..75646e6 100644 --- a/wkim/src/main/java/com/wukong/im/manager/ConversationManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/ConversationManager.java @@ -1,27 +1,27 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.content.ContentValues; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.db.ConversationDbManager; -import com.wukong.im.db.MsgDbManager; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.entity.WKConversationMsg; -import com.wukong.im.entity.WKConversationMsgExtra; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKMsgExtra; -import com.wukong.im.entity.WKMsgReaction; -import com.wukong.im.entity.WKSyncChat; -import com.wukong.im.entity.WKSyncConvMsgExtra; -import com.wukong.im.entity.WKSyncRecent; -import com.wukong.im.entity.WKUIConversationMsg; -import com.wukong.im.interfaces.IDeleteConversationMsg; -import com.wukong.im.interfaces.IRefreshConversationMsg; -import com.wukong.im.interfaces.ISyncConversationChat; -import com.wukong.im.interfaces.ISyncConversationChatBack; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.db.ConversationDbManager; +import com.xinbida.wukongim.db.MsgDbManager; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKConversationMsg; +import com.xinbida.wukongim.entity.WKConversationMsgExtra; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsgExtra; +import com.xinbida.wukongim.entity.WKMsgReaction; +import com.xinbida.wukongim.entity.WKSyncChat; +import com.xinbida.wukongim.entity.WKSyncConvMsgExtra; +import com.xinbida.wukongim.entity.WKSyncRecent; +import com.xinbida.wukongim.entity.WKUIConversationMsg; +import com.xinbida.wukongim.interfaces.IDeleteConversationMsg; +import com.xinbida.wukongim.interfaces.IRefreshConversationMsg; +import com.xinbida.wukongim.interfaces.ISyncConversationChat; +import com.xinbida.wukongim.interfaces.ISyncConversationChatBack; +import com.xinbida.wukongim.utils.WKLoggerUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/manager/MsgManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java similarity index 94% rename from wkim/src/main/java/com/wukong/im/manager/MsgManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java index 8abc5ab..056e743 100644 --- a/wkim/src/main/java/com/wukong/im/manager/MsgManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/MsgManager.java @@ -1,56 +1,56 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.db.ConversationDbManager; -import com.wukong.im.db.MsgDbManager; -import com.wukong.im.db.WKDBColumns; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.entity.WKConversationMsg; -import com.wukong.im.entity.WKMentionInfo; -import com.wukong.im.entity.WKMessageGroupByDate; -import com.wukong.im.entity.WKMessageSearchResult; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKMsgExtra; -import com.wukong.im.entity.WKMsgReaction; -import com.wukong.im.entity.WKMsgSetting; -import com.wukong.im.entity.WKSyncExtraMsg; -import com.wukong.im.entity.WKSyncMsg; -import com.wukong.im.entity.WKSyncMsgReaction; -import com.wukong.im.entity.WKSyncRecent; -import com.wukong.im.entity.WKUIConversationMsg; -import com.wukong.im.interfaces.IClearMsgListener; -import com.wukong.im.interfaces.IDeleteMsgListener; -import com.wukong.im.interfaces.IGetOrSyncHistoryMsgBack; -import com.wukong.im.interfaces.IMessageStoreBeforeIntercept; -import com.wukong.im.interfaces.INewMsgListener; -import com.wukong.im.interfaces.IRefreshMsg; -import com.wukong.im.interfaces.ISendACK; -import com.wukong.im.interfaces.ISendMsgCallBackListener; -import com.wukong.im.interfaces.ISyncChannelMsgBack; -import com.wukong.im.interfaces.ISyncChannelMsgListener; -import com.wukong.im.interfaces.ISyncMsgReaction; -import com.wukong.im.interfaces.ISyncOfflineMsgBack; -import com.wukong.im.interfaces.ISyncOfflineMsgListener; -import com.wukong.im.interfaces.IUploadAttacResultListener; -import com.wukong.im.interfaces.IUploadAttachmentListener; -import com.wukong.im.interfaces.IUploadMsgExtraListener; -import com.wukong.im.message.ConnectionHandler; -import com.wukong.im.message.MessageHandler; -import com.wukong.im.message.type.WKMsgContentType; -import com.wukong.im.message.type.WKSendMsgResult; -import com.wukong.im.msgmodel.WKImageContent; -import com.wukong.im.msgmodel.WKReply; -import com.wukong.im.msgmodel.WKTextContent; -import com.wukong.im.msgmodel.WKVideoContent; -import com.wukong.im.msgmodel.WKVoiceContent; -import com.wukong.im.protocol.WKMessageContent; -import com.wukong.im.protocol.WKMsgEntity; -import com.wukong.im.utils.DateUtils; -import com.wukong.im.utils.WKTypeUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.db.ConversationDbManager; +import com.xinbida.wukongim.db.MsgDbManager; +import com.xinbida.wukongim.db.WKDBColumns; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKConversationMsg; +import com.xinbida.wukongim.entity.WKMentionInfo; +import com.xinbida.wukongim.entity.WKMessageGroupByDate; +import com.xinbida.wukongim.entity.WKMessageSearchResult; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsgExtra; +import com.xinbida.wukongim.entity.WKMsgReaction; +import com.xinbida.wukongim.entity.WKMsgSetting; +import com.xinbida.wukongim.entity.WKSyncExtraMsg; +import com.xinbida.wukongim.entity.WKSyncMsg; +import com.xinbida.wukongim.entity.WKSyncMsgReaction; +import com.xinbida.wukongim.entity.WKSyncRecent; +import com.xinbida.wukongim.entity.WKUIConversationMsg; +import com.xinbida.wukongim.interfaces.IClearMsgListener; +import com.xinbida.wukongim.interfaces.IDeleteMsgListener; +import com.xinbida.wukongim.interfaces.IGetOrSyncHistoryMsgBack; +import com.xinbida.wukongim.interfaces.IMessageStoreBeforeIntercept; +import com.xinbida.wukongim.interfaces.INewMsgListener; +import com.xinbida.wukongim.interfaces.IRefreshMsg; +import com.xinbida.wukongim.interfaces.ISendACK; +import com.xinbida.wukongim.interfaces.ISendMsgCallBackListener; +import com.xinbida.wukongim.interfaces.ISyncChannelMsgBack; +import com.xinbida.wukongim.interfaces.ISyncChannelMsgListener; +import com.xinbida.wukongim.interfaces.ISyncMsgReaction; +import com.xinbida.wukongim.interfaces.ISyncOfflineMsgBack; +import com.xinbida.wukongim.interfaces.ISyncOfflineMsgListener; +import com.xinbida.wukongim.interfaces.IUploadAttacResultListener; +import com.xinbida.wukongim.interfaces.IUploadAttachmentListener; +import com.xinbida.wukongim.interfaces.IUploadMsgExtraListener; +import com.xinbida.wukongim.message.ConnectionHandler; +import com.xinbida.wukongim.message.MessageHandler; +import com.xinbida.wukongim.message.type.WKMsgContentType; +import com.xinbida.wukongim.message.type.WKSendMsgResult; +import com.xinbida.wukongim.msgmodel.WKImageContent; +import com.xinbida.wukongim.msgmodel.WKReply; +import com.xinbida.wukongim.msgmodel.WKTextContent; +import com.xinbida.wukongim.msgmodel.WKVideoContent; +import com.xinbida.wukongim.msgmodel.WKVoiceContent; +import com.xinbida.wukongim.protocol.WKMessageContent; +import com.xinbida.wukongim.protocol.WKMsgEntity; +import com.xinbida.wukongim.utils.DateUtils; +import com.xinbida.wukongim.utils.WKTypeUtils; import org.json.JSONArray; import org.json.JSONException; diff --git a/wkim/src/main/java/com/wukong/im/manager/ReminderManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/ReminderManager.java similarity index 93% rename from wkim/src/main/java/com/wukong/im/manager/ReminderManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/ReminderManager.java index f9e6393..d2b6822 100644 --- a/wkim/src/main/java/com/wukong/im/manager/ReminderManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/ReminderManager.java @@ -1,10 +1,10 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.text.TextUtils; -import com.wukong.im.db.ReminderDBManager; -import com.wukong.im.entity.WKReminder; -import com.wukong.im.interfaces.INewReminderListener; +import com.xinbida.wukongim.db.ReminderDBManager; +import com.xinbida.wukongim.entity.WKReminder; +import com.xinbida.wukongim.interfaces.INewReminderListener; import java.util.List; import java.util.Map; diff --git a/wkim/src/main/java/com/wukong/im/manager/RobotManager.java b/wkim/src/main/java/com/xinbida/wukongim/manager/RobotManager.java similarity index 90% rename from wkim/src/main/java/com/wukong/im/manager/RobotManager.java rename to wkim/src/main/java/com/xinbida/wukongim/manager/RobotManager.java index 315ad99..b025ab3 100644 --- a/wkim/src/main/java/com/wukong/im/manager/RobotManager.java +++ b/wkim/src/main/java/com/xinbida/wukongim/manager/RobotManager.java @@ -1,11 +1,11 @@ -package com.wukong.im.manager; +package com.xinbida.wukongim.manager; import android.text.TextUtils; -import com.wukong.im.db.RobotDBManager; -import com.wukong.im.entity.WKRobot; -import com.wukong.im.entity.WKRobotMenu; -import com.wukong.im.interfaces.IRefreshRobotMenu; +import com.xinbida.wukongim.db.RobotDBManager; +import com.xinbida.wukongim.entity.WKRobot; +import com.xinbida.wukongim.entity.WKRobotMenu; +import com.xinbida.wukongim.interfaces.IRefreshRobotMenu; import java.util.List; import java.util.Map; diff --git a/wkim/src/main/java/com/wukong/im/message/ClientHandler.java b/wkim/src/main/java/com/xinbida/wukongim/message/ClientHandler.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/message/ClientHandler.java rename to wkim/src/main/java/com/xinbida/wukongim/message/ClientHandler.java index d7f9111..9e462cc 100644 --- a/wkim/src/main/java/com/wukong/im/message/ClientHandler.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/ClientHandler.java @@ -1,10 +1,10 @@ -package com.wukong.im.message; +package com.xinbida.wukongim.message; import android.text.TextUtils; import android.util.Log; -import com.wukong.im.WKIMApplication; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.utils.WKLoggerUtils; import org.xsocket.connection.IConnectExceptionHandler; import org.xsocket.connection.IConnectHandler; diff --git a/wkim/src/main/java/com/wukong/im/message/ConnectionHandler.java b/wkim/src/main/java/com/xinbida/wukongim/message/ConnectionHandler.java similarity index 93% rename from wkim/src/main/java/com/wukong/im/message/ConnectionHandler.java rename to wkim/src/main/java/com/xinbida/wukongim/message/ConnectionHandler.java index 04a3d45..792b559 100644 --- a/wkim/src/main/java/com/wukong/im/message/ConnectionHandler.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/ConnectionHandler.java @@ -1,4 +1,4 @@ -package com.wukong.im.message; +package com.xinbida.wukongim.message; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -6,35 +6,35 @@ import android.os.Handler; import android.os.Looper; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.db.MsgDbManager; -import com.wukong.im.entity.WKChannel; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKMsgSetting; -import com.wukong.im.entity.WKSyncMsgMode; -import com.wukong.im.interfaces.IReceivedMsgListener; -import com.wukong.im.manager.ConnectionManager; -import com.wukong.im.message.type.WKConnectReason; -import com.wukong.im.message.type.WKConnectStatus; -import com.wukong.im.message.type.WKMsgType; -import com.wukong.im.message.type.WKSendMsgResult; -import com.wukong.im.message.type.WKSendingMsg; -import com.wukong.im.msgmodel.WKImageContent; -import com.wukong.im.msgmodel.WKMediaMessageContent; -import com.wukong.im.msgmodel.WKVideoContent; -import com.wukong.im.protocol.WKBaseMsg; -import com.wukong.im.protocol.WKConnectMsg; -import com.wukong.im.protocol.WKDisconnectMsg; -import com.wukong.im.protocol.WKMessageContent; -import com.wukong.im.protocol.WKPingMsg; -import com.wukong.im.protocol.WKPongMsg; -import com.wukong.im.protocol.WKSendAckMsg; -import com.wukong.im.protocol.WKSendMsg; -import com.wukong.im.utils.DateUtils; -import com.wukong.im.utils.FileUtils; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.db.MsgDbManager; +import com.xinbida.wukongim.entity.WKChannel; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsgSetting; +import com.xinbida.wukongim.entity.WKSyncMsgMode; +import com.xinbida.wukongim.interfaces.IReceivedMsgListener; +import com.xinbida.wukongim.manager.ConnectionManager; +import com.xinbida.wukongim.message.type.WKConnectReason; +import com.xinbida.wukongim.message.type.WKConnectStatus; +import com.xinbida.wukongim.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKSendMsgResult; +import com.xinbida.wukongim.message.type.WKSendingMsg; +import com.xinbida.wukongim.msgmodel.WKImageContent; +import com.xinbida.wukongim.msgmodel.WKMediaMessageContent; +import com.xinbida.wukongim.msgmodel.WKVideoContent; +import com.xinbida.wukongim.protocol.WKBaseMsg; +import com.xinbida.wukongim.protocol.WKConnectMsg; +import com.xinbida.wukongim.protocol.WKDisconnectMsg; +import com.xinbida.wukongim.protocol.WKMessageContent; +import com.xinbida.wukongim.protocol.WKPingMsg; +import com.xinbida.wukongim.protocol.WKPongMsg; +import com.xinbida.wukongim.protocol.WKSendAckMsg; +import com.xinbida.wukongim.protocol.WKSendMsg; +import com.xinbida.wukongim.utils.DateUtils; +import com.xinbida.wukongim.utils.FileUtils; +import com.xinbida.wukongim.utils.WKLoggerUtils; import org.xsocket.connection.IConnection; import org.xsocket.connection.INonBlockingConnection; diff --git a/wkim/src/main/java/com/wukong/im/message/ConnectionTimerHandler.java b/wkim/src/main/java/com/xinbida/wukongim/message/ConnectionTimerHandler.java similarity index 92% rename from wkim/src/main/java/com/wukong/im/message/ConnectionTimerHandler.java rename to wkim/src/main/java/com/xinbida/wukongim/message/ConnectionTimerHandler.java index f6a6970..388b40d 100644 --- a/wkim/src/main/java/com/wukong/im/message/ConnectionTimerHandler.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/ConnectionTimerHandler.java @@ -1,11 +1,11 @@ -package com.wukong.im.message; +package com.xinbida.wukongim.message; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.message.type.WKConnectReason; -import com.wukong.im.message.type.WKConnectStatus; -import com.wukong.im.protocol.WKPingMsg; -import com.wukong.im.utils.WKLoggerUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.message.type.WKConnectReason; +import com.xinbida.wukongim.message.type.WKConnectStatus; +import com.xinbida.wukongim.protocol.WKPingMsg; +import com.xinbida.wukongim.utils.WKLoggerUtils; import java.util.Timer; import java.util.TimerTask; diff --git a/wkim/src/main/java/com/wukong/im/message/MessageConvertHandler.java b/wkim/src/main/java/com/xinbida/wukongim/message/MessageConvertHandler.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/message/MessageConvertHandler.java rename to wkim/src/main/java/com/xinbida/wukongim/message/MessageConvertHandler.java index 19de25d..d0792a7 100644 --- a/wkim/src/main/java/com/wukong/im/message/MessageConvertHandler.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/MessageConvertHandler.java @@ -1,35 +1,35 @@ -package com.wukong.im.message; +package com.xinbida.wukongim.message; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.db.MsgDbManager; -import com.wukong.im.db.WKDBColumns; -import com.wukong.im.entity.WKConversationMsgExtra; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKMsgSetting; -import com.wukong.im.entity.WKUIConversationMsg; -import com.wukong.im.message.type.WKMsgType; -import com.wukong.im.message.type.WKSendMsgResult; -import com.wukong.im.msgmodel.WKMediaMessageContent; -import com.wukong.im.protocol.WKBaseMsg; -import com.wukong.im.protocol.WKConnectAckMsg; -import com.wukong.im.protocol.WKConnectMsg; -import com.wukong.im.protocol.WKDisconnectMsg; -import com.wukong.im.protocol.WKMessageContent; -import com.wukong.im.protocol.WKMsgEntity; -import com.wukong.im.protocol.WKPingMsg; -import com.wukong.im.protocol.WKPongMsg; -import com.wukong.im.protocol.WKReceivedAckMsg; -import com.wukong.im.protocol.WKReceivedMsg; -import com.wukong.im.protocol.WKSendAckMsg; -import com.wukong.im.protocol.WKSendMsg; -import com.wukong.im.utils.AESEncryptUtils; -import com.wukong.im.utils.BigTypeUtils; -import com.wukong.im.utils.Curve25519Utils; -import com.wukong.im.utils.WKLoggerUtils; -import com.wukong.im.utils.WKTypeUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.db.MsgDbManager; +import com.xinbida.wukongim.db.WKDBColumns; +import com.xinbida.wukongim.entity.WKConversationMsgExtra; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsgSetting; +import com.xinbida.wukongim.entity.WKUIConversationMsg; +import com.xinbida.wukongim.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKSendMsgResult; +import com.xinbida.wukongim.msgmodel.WKMediaMessageContent; +import com.xinbida.wukongim.protocol.WKBaseMsg; +import com.xinbida.wukongim.protocol.WKConnectAckMsg; +import com.xinbida.wukongim.protocol.WKConnectMsg; +import com.xinbida.wukongim.protocol.WKDisconnectMsg; +import com.xinbida.wukongim.protocol.WKMessageContent; +import com.xinbida.wukongim.protocol.WKMsgEntity; +import com.xinbida.wukongim.protocol.WKPingMsg; +import com.xinbida.wukongim.protocol.WKPongMsg; +import com.xinbida.wukongim.protocol.WKReceivedAckMsg; +import com.xinbida.wukongim.protocol.WKReceivedMsg; +import com.xinbida.wukongim.protocol.WKSendAckMsg; +import com.xinbida.wukongim.protocol.WKSendMsg; +import com.xinbida.wukongim.utils.AESEncryptUtils; +import com.xinbida.wukongim.utils.BigTypeUtils; +import com.xinbida.wukongim.utils.Curve25519Utils; +import com.xinbida.wukongim.utils.WKLoggerUtils; +import com.xinbida.wukongim.utils.WKTypeUtils; import org.json.JSONArray; import org.json.JSONException; diff --git a/wkim/src/main/java/com/wukong/im/message/MessageHandler.java b/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java similarity index 93% rename from wkim/src/main/java/com/wukong/im/message/MessageHandler.java rename to wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java index 8c4e84b..a11415b 100644 --- a/wkim/src/main/java/com/wukong/im/message/MessageHandler.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/MessageHandler.java @@ -1,32 +1,32 @@ -package com.wukong.im.message; +package com.xinbida.wukongim.message; import android.text.TextUtils; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; -import com.wukong.im.db.ConversationDbManager; -import com.wukong.im.db.WKDBColumns; -import com.wukong.im.db.MsgDbManager; -import com.wukong.im.entity.WKMsg; -import com.wukong.im.entity.WKSyncMsg; -import com.wukong.im.entity.WKUIConversationMsg; -import com.wukong.im.interfaces.IReceivedMsgListener; -import com.wukong.im.manager.CMDManager; -import com.wukong.im.manager.ConversationManager; -import com.wukong.im.entity.WKChannelType; -import com.wukong.im.message.type.WKMsgContentType; -import com.wukong.im.message.type.WKMsgType; -import com.wukong.im.protocol.WKBaseMsg; -import com.wukong.im.protocol.WKConnectAckMsg; -import com.wukong.im.protocol.WKConnectMsg; -import com.wukong.im.protocol.WKDisconnectMsg; -import com.wukong.im.protocol.WKPingMsg; -import com.wukong.im.protocol.WKPongMsg; -import com.wukong.im.protocol.WKReceivedAckMsg; -import com.wukong.im.protocol.WKSendAckMsg; -import com.wukong.im.protocol.WKSendMsg; -import com.wukong.im.utils.WKLoggerUtils; -import com.wukong.im.utils.WKTypeUtils; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.db.ConversationDbManager; +import com.xinbida.wukongim.db.WKDBColumns; +import com.xinbida.wukongim.db.MsgDbManager; +import com.xinbida.wukongim.entity.WKMsg; +import com.xinbida.wukongim.entity.WKSyncMsg; +import com.xinbida.wukongim.entity.WKUIConversationMsg; +import com.xinbida.wukongim.interfaces.IReceivedMsgListener; +import com.xinbida.wukongim.manager.CMDManager; +import com.xinbida.wukongim.manager.ConversationManager; +import com.xinbida.wukongim.entity.WKChannelType; +import com.xinbida.wukongim.message.type.WKMsgContentType; +import com.xinbida.wukongim.message.type.WKMsgType; +import com.xinbida.wukongim.protocol.WKBaseMsg; +import com.xinbida.wukongim.protocol.WKConnectAckMsg; +import com.xinbida.wukongim.protocol.WKConnectMsg; +import com.xinbida.wukongim.protocol.WKDisconnectMsg; +import com.xinbida.wukongim.protocol.WKPingMsg; +import com.xinbida.wukongim.protocol.WKPongMsg; +import com.xinbida.wukongim.protocol.WKReceivedAckMsg; +import com.xinbida.wukongim.protocol.WKSendAckMsg; +import com.xinbida.wukongim.protocol.WKSendMsg; +import com.xinbida.wukongim.utils.WKLoggerUtils; +import com.xinbida.wukongim.utils.WKTypeUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/message/SavedMsg.java b/wkim/src/main/java/com/xinbida/wukongim/message/SavedMsg.java similarity index 74% rename from wkim/src/main/java/com/wukong/im/message/SavedMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/message/SavedMsg.java index 3b4014d..c9e2cc9 100644 --- a/wkim/src/main/java/com/wukong/im/message/SavedMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/SavedMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.message; +package com.xinbida.wukongim.message; -import com.wukong.im.entity.WKMsg; +import com.xinbida.wukongim.entity.WKMsg; /** * 4/22/21 4:26 PM diff --git a/wkim/src/main/java/com/wukong/im/message/type/WKConnectReason.java b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKConnectReason.java similarity index 90% rename from wkim/src/main/java/com/wukong/im/message/type/WKConnectReason.java rename to wkim/src/main/java/com/xinbida/wukongim/message/type/WKConnectReason.java index 08f2145..b8c9966 100644 --- a/wkim/src/main/java/com/wukong/im/message/type/WKConnectReason.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKConnectReason.java @@ -1,4 +1,4 @@ -package com.wukong.im.message.type; +package com.xinbida.wukongim.message.type; public class WKConnectReason { public final static String ReasonAuthFail = "ReasonAuthFail"; diff --git a/wkim/src/main/java/com/wukong/im/message/type/WKConnectStatus.java b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKConnectStatus.java similarity index 91% rename from wkim/src/main/java/com/wukong/im/message/type/WKConnectStatus.java rename to wkim/src/main/java/com/xinbida/wukongim/message/type/WKConnectStatus.java index 23e1c6c..5166b41 100644 --- a/wkim/src/main/java/com/wukong/im/message/type/WKConnectStatus.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKConnectStatus.java @@ -1,4 +1,4 @@ -package com.wukong.im.message.type; +package com.xinbida.wukongim.message.type; /** * 2019-11-11 10:10 diff --git a/wkim/src/main/java/com/wukong/im/message/type/WKMsgContentType.java b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKMsgContentType.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/message/type/WKMsgContentType.java rename to wkim/src/main/java/com/xinbida/wukongim/message/type/WKMsgContentType.java index f476999..a9a1734 100644 --- a/wkim/src/main/java/com/wukong/im/message/type/WKMsgContentType.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKMsgContentType.java @@ -1,4 +1,4 @@ -package com.wukong.im.message.type; +package com.xinbida.wukongim.message.type; /** * 2019-11-11 09:47 diff --git a/wkim/src/main/java/com/wukong/im/message/type/WKMsgType.java b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKMsgType.java similarity index 94% rename from wkim/src/main/java/com/wukong/im/message/type/WKMsgType.java rename to wkim/src/main/java/com/xinbida/wukongim/message/type/WKMsgType.java index f5ef230..3eaadb0 100644 --- a/wkim/src/main/java/com/wukong/im/message/type/WKMsgType.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKMsgType.java @@ -1,4 +1,4 @@ -package com.wukong.im.message.type; +package com.xinbida.wukongim.message.type; /** * 2019-11-10 17:10 diff --git a/wkim/src/main/java/com/wukong/im/message/type/WKSendMsgResult.java b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKSendMsgResult.java similarity index 92% rename from wkim/src/main/java/com/wukong/im/message/type/WKSendMsgResult.java rename to wkim/src/main/java/com/xinbida/wukongim/message/type/WKSendMsgResult.java index 9948ff1..dec4012 100755 --- a/wkim/src/main/java/com/wukong/im/message/type/WKSendMsgResult.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKSendMsgResult.java @@ -1,4 +1,4 @@ -package com.wukong.im.message.type; +package com.xinbida.wukongim.message.type; /** * @version 1.0 diff --git a/wkim/src/main/java/com/wukong/im/message/type/WKSendingMsg.java b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKSendingMsg.java similarity index 80% rename from wkim/src/main/java/com/wukong/im/message/type/WKSendingMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/message/type/WKSendingMsg.java index 8aa042c..233ae4e 100644 --- a/wkim/src/main/java/com/wukong/im/message/type/WKSendingMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/message/type/WKSendingMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.message.type; +package com.xinbida.wukongim.message.type; -import com.wukong.im.protocol.WKSendMsg; -import com.wukong.im.utils.DateUtils; +import com.xinbida.wukongim.protocol.WKSendMsg; +import com.xinbida.wukongim.utils.DateUtils; /** * 2020-05-28 17:45 diff --git a/wkim/src/main/java/com/wukong/im/msgmodel/WKImageContent.java b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKImageContent.java similarity index 94% rename from wkim/src/main/java/com/wukong/im/msgmodel/WKImageContent.java rename to wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKImageContent.java index c97fced..601ad0b 100644 --- a/wkim/src/main/java/com/wukong/im/msgmodel/WKImageContent.java +++ b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKImageContent.java @@ -1,10 +1,10 @@ -package com.wukong.im.msgmodel; +package com.xinbida.wukongim.msgmodel; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.message.type.WKMsgContentType; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.message.type.WKMsgContentType; +import com.xinbida.wukongim.protocol.WKMessageContent; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/msgmodel/WKMediaMessageContent.java b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKMediaMessageContent.java similarity index 80% rename from wkim/src/main/java/com/wukong/im/msgmodel/WKMediaMessageContent.java rename to wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKMediaMessageContent.java index fe07b88..3dc454d 100644 --- a/wkim/src/main/java/com/wukong/im/msgmodel/WKMediaMessageContent.java +++ b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKMediaMessageContent.java @@ -1,8 +1,8 @@ -package com.wukong.im.msgmodel; +package com.xinbida.wukongim.msgmodel; import android.os.Parcel; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.protocol.WKMessageContent; /** * 2020-04-04 10:39 diff --git a/wkim/src/main/java/com/wukong/im/msgmodel/WKReply.java b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKReply.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/msgmodel/WKReply.java rename to wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKReply.java index 81264e3..5dedb37 100644 --- a/wkim/src/main/java/com/wukong/im/msgmodel/WKReply.java +++ b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKReply.java @@ -1,10 +1,10 @@ -package com.wukong.im.msgmodel; +package com.xinbida.wukongim.msgmodel; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.manager.MsgManager; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.manager.MsgManager; +import com.xinbida.wukongim.protocol.WKMessageContent; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/msgmodel/WKTextContent.java b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKTextContent.java similarity index 92% rename from wkim/src/main/java/com/wukong/im/msgmodel/WKTextContent.java rename to wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKTextContent.java index 5a8057e..713dfcb 100644 --- a/wkim/src/main/java/com/wukong/im/msgmodel/WKTextContent.java +++ b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKTextContent.java @@ -1,11 +1,11 @@ -package com.wukong.im.msgmodel; +package com.xinbida.wukongim.msgmodel; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; -import com.wukong.im.message.type.WKMsgContentType; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.message.type.WKMsgContentType; +import com.xinbida.wukongim.protocol.WKMessageContent; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/msgmodel/WKVideoContent.java b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKVideoContent.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/msgmodel/WKVideoContent.java rename to wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKVideoContent.java index 8370766..3343adc 100644 --- a/wkim/src/main/java/com/wukong/im/msgmodel/WKVideoContent.java +++ b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKVideoContent.java @@ -1,10 +1,10 @@ -package com.wukong.im.msgmodel; +package com.xinbida.wukongim.msgmodel; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.message.type.WKMsgContentType; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.message.type.WKMsgContentType; +import com.xinbida.wukongim.protocol.WKMessageContent; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/msgmodel/WKVoiceContent.java b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKVoiceContent.java similarity index 94% rename from wkim/src/main/java/com/wukong/im/msgmodel/WKVoiceContent.java rename to wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKVoiceContent.java index 767be5b..0bf59ee 100644 --- a/wkim/src/main/java/com/wukong/im/msgmodel/WKVoiceContent.java +++ b/wkim/src/main/java/com/xinbida/wukongim/msgmodel/WKVoiceContent.java @@ -1,10 +1,10 @@ -package com.wukong.im.msgmodel; +package com.xinbida.wukongim.msgmodel; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.message.type.WKMsgContentType; -import com.wukong.im.protocol.WKMessageContent; +import com.xinbida.wukongim.message.type.WKMsgContentType; +import com.xinbida.wukongim.protocol.WKMessageContent; import org.json.JSONException; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKBaseMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKBaseMsg.java similarity index 87% rename from wkim/src/main/java/com/wukong/im/protocol/WKBaseMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKBaseMsg.java index 5ef97cc..2e4caab 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKBaseMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKBaseMsg.java @@ -1,6 +1,6 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:14 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKConnectAckMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKConnectAckMsg.java similarity index 84% rename from wkim/src/main/java/com/wukong/im/protocol/WKConnectAckMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKConnectAckMsg.java index 9f5ee87..959d5b8 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKConnectAckMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKConnectAckMsg.java @@ -1,6 +1,6 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:27 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKConnectMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKConnectMsg.java similarity index 87% rename from wkim/src/main/java/com/wukong/im/protocol/WKConnectMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKConnectMsg.java index c975d51..ce1f065 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKConnectMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKConnectMsg.java @@ -1,9 +1,9 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.WKIMApplication; -import com.wukong.im.message.type.WKMsgType; -import com.wukong.im.utils.DateUtils; +import com.xinbida.wukongim.WKIMApplication; +import com.xinbida.wukongim.message.type.WKMsgType; +import com.xinbida.wukongim.utils.DateUtils; /** * 2019-11-11 10:22 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKDisconnectMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKDisconnectMsg.java similarity index 72% rename from wkim/src/main/java/com/wukong/im/protocol/WKDisconnectMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKDisconnectMsg.java index 0999b99..d986524 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKDisconnectMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKDisconnectMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2020-01-30 17:34 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKMessageContent.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKMessageContent.java similarity index 95% rename from wkim/src/main/java/com/wukong/im/protocol/WKMessageContent.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKMessageContent.java index e28e373..0e3efa1 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKMessageContent.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKMessageContent.java @@ -1,10 +1,10 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; import android.os.Parcel; import android.os.Parcelable; -import com.wukong.im.entity.WKMentionInfo; -import com.wukong.im.msgmodel.WKReply; +import com.xinbida.wukongim.entity.WKMentionInfo; +import com.xinbida.wukongim.msgmodel.WKReply; import org.json.JSONObject; diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKMsgEntity.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKMsgEntity.java similarity index 96% rename from wkim/src/main/java/com/wukong/im/protocol/WKMsgEntity.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKMsgEntity.java index ca04704..0f461ee 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKMsgEntity.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKMsgEntity.java @@ -1,4 +1,4 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; import android.os.Parcel; import android.os.Parcelable; diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKPingMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKPingMsg.java similarity index 63% rename from wkim/src/main/java/com/wukong/im/protocol/WKPingMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKPingMsg.java index 923ba6b..5d1df47 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKPingMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKPingMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:49 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKPongMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKPongMsg.java similarity index 65% rename from wkim/src/main/java/com/wukong/im/protocol/WKPongMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKPongMsg.java index e0622ca..3a742cf 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKPongMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKPongMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:49 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKReceivedAckMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKReceivedAckMsg.java similarity index 81% rename from wkim/src/main/java/com/wukong/im/protocol/WKReceivedAckMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKReceivedAckMsg.java index 887f294..478f45e 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKReceivedAckMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKReceivedAckMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:46 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKReceivedMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKReceivedMsg.java similarity index 84% rename from wkim/src/main/java/com/wukong/im/protocol/WKReceivedMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKReceivedMsg.java index e0c1399..9085c73 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKReceivedMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKReceivedMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.entity.WKMsgSetting; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.entity.WKMsgSetting; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:37 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKSendAckMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKSendAckMsg.java similarity index 85% rename from wkim/src/main/java/com/wukong/im/protocol/WKSendAckMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKSendAckMsg.java index 264c25a..6136c08 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKSendAckMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKSendAckMsg.java @@ -1,7 +1,7 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:33 diff --git a/wkim/src/main/java/com/wukong/im/protocol/WKSendMsg.java b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKSendMsg.java similarity index 90% rename from wkim/src/main/java/com/wukong/im/protocol/WKSendMsg.java rename to wkim/src/main/java/com/xinbida/wukongim/protocol/WKSendMsg.java index 6dc96b5..11ad643 100644 --- a/wkim/src/main/java/com/wukong/im/protocol/WKSendMsg.java +++ b/wkim/src/main/java/com/xinbida/wukongim/protocol/WKSendMsg.java @@ -1,8 +1,8 @@ -package com.wukong.im.protocol; +package com.xinbida.wukongim.protocol; -import com.wukong.im.entity.WKMsgSetting; -import com.wukong.im.message.type.WKMsgType; +import com.xinbida.wukongim.entity.WKMsgSetting; +import com.xinbida.wukongim.message.type.WKMsgType; /** * 2019-11-11 10:30 diff --git a/wkim/src/main/java/com/wukong/im/utils/AESEncryptUtils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/AESEncryptUtils.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/utils/AESEncryptUtils.java rename to wkim/src/main/java/com/xinbida/wukongim/utils/AESEncryptUtils.java index 9230782..fa357bc 100644 --- a/wkim/src/main/java/com/wukong/im/utils/AESEncryptUtils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/AESEncryptUtils.java @@ -1,9 +1,9 @@ -package com.wukong.im.utils; +package com.xinbida.wukongim.utils; import android.util.Base64; import android.util.Log; -import com.wukong.im.WKIMApplication; +import com.xinbida.wukongim.WKIMApplication; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/wkim/src/main/java/com/wukong/im/utils/BigTypeUtils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/BigTypeUtils.java similarity index 99% rename from wkim/src/main/java/com/wukong/im/utils/BigTypeUtils.java rename to wkim/src/main/java/com/xinbida/wukongim/utils/BigTypeUtils.java index 6cbbe49..6f0e583 100755 --- a/wkim/src/main/java/com/wukong/im/utils/BigTypeUtils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/BigTypeUtils.java @@ -1,4 +1,4 @@ -package com.wukong.im.utils; +package com.xinbida.wukongim.utils; /** * 对数字和字节进行转换。
diff --git a/wkim/src/main/java/com/wukong/im/utils/Curve25519Utils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/Curve25519Utils.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/utils/Curve25519Utils.java rename to wkim/src/main/java/com/xinbida/wukongim/utils/Curve25519Utils.java index 2d09cf8..786a781 100644 --- a/wkim/src/main/java/com/wukong/im/utils/Curve25519Utils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/Curve25519Utils.java @@ -1,4 +1,4 @@ -package com.wukong.im.utils; +package com.xinbida.wukongim.utils; import android.text.TextUtils; import android.util.Base64; diff --git a/wkim/src/main/java/com/wukong/im/utils/DateUtils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/DateUtils.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/utils/DateUtils.java rename to wkim/src/main/java/com/xinbida/wukongim/utils/DateUtils.java index ec8292d..fc92b20 100644 --- a/wkim/src/main/java/com/wukong/im/utils/DateUtils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.wukong.im.utils; +package com.xinbida.wukongim.utils; import java.text.SimpleDateFormat; import java.util.Calendar; diff --git a/wkim/src/main/java/com/wukong/im/utils/FileUtils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/FileUtils.java similarity index 97% rename from wkim/src/main/java/com/wukong/im/utils/FileUtils.java rename to wkim/src/main/java/com/xinbida/wukongim/utils/FileUtils.java index 32f9604..ed5f994 100644 --- a/wkim/src/main/java/com/wukong/im/utils/FileUtils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/FileUtils.java @@ -1,8 +1,8 @@ -package com.wukong.im.utils; +package com.xinbida.wukongim.utils; import android.text.TextUtils; -import com.wukong.im.WKIMApplication; +import com.xinbida.wukongim.WKIMApplication; import java.io.File; import java.io.FileInputStream; diff --git a/wkim/src/main/java/com/wukong/im/utils/WKLoggerUtils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/WKLoggerUtils.java similarity index 98% rename from wkim/src/main/java/com/wukong/im/utils/WKLoggerUtils.java rename to wkim/src/main/java/com/xinbida/wukongim/utils/WKLoggerUtils.java index 4a2e678..46540f5 100644 --- a/wkim/src/main/java/com/wukong/im/utils/WKLoggerUtils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/WKLoggerUtils.java @@ -1,10 +1,10 @@ -package com.wukong.im.utils; +package com.xinbida.wukongim.utils; import android.annotation.SuppressLint; import android.util.Log; -import com.wukong.im.WKIM; -import com.wukong.im.WKIMApplication; +import com.xinbida.wukongim.WKIM; +import com.xinbida.wukongim.WKIMApplication; import java.io.File; import java.io.FileWriter; diff --git a/wkim/src/main/java/com/wukong/im/utils/WKTypeUtils.java b/wkim/src/main/java/com/xinbida/wukongim/utils/WKTypeUtils.java similarity index 99% rename from wkim/src/main/java/com/wukong/im/utils/WKTypeUtils.java rename to wkim/src/main/java/com/xinbida/wukongim/utils/WKTypeUtils.java index 3dedaa0..6d0f714 100644 --- a/wkim/src/main/java/com/wukong/im/utils/WKTypeUtils.java +++ b/wkim/src/main/java/com/xinbida/wukongim/utils/WKTypeUtils.java @@ -1,6 +1,6 @@ -package com.wukong.im.utils; +package com.xinbida.wukongim.utils; -import com.wukong.im.entity.WKMsgSetting; +import com.xinbida.wukongim.entity.WKMsgSetting; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/app/src/test/java/com/wk/im/ExampleUnitTest.java b/wkim/src/test/java/com/xinbida/wukongim/ExampleUnitTest.java similarity index 92% rename from app/src/test/java/com/wk/im/ExampleUnitTest.java rename to wkim/src/test/java/com/xinbida/wukongim/ExampleUnitTest.java index 78b5b83..64c9bf7 100644 --- a/app/src/test/java/com/wk/im/ExampleUnitTest.java +++ b/wkim/src/test/java/com/xinbida/wukongim/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.wk.im; +package com.xinbida.wukongim; import org.junit.Test;