Commit 41afdf4d9c20609ed33d6ba2233461ad0a81578d
1 parent
7e2d34ca
修改聊天sdk包名
Showing
38 changed files
with
125 additions
and
244 deletions
.idea/misc.xml
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | <ConfirmationsSetting value="0" id="Add" /> | 37 | <ConfirmationsSetting value="0" id="Add" /> |
| 38 | <ConfirmationsSetting value="0" id="Remove" /> | 38 | <ConfirmationsSetting value="0" id="Remove" /> |
| 39 | </component> | 39 | </component> |
| 40 | - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | 40 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> |
| 41 | <output url="file://$PROJECT_DIR$/build/classes" /> | 41 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 42 | </component> | 42 | </component> |
| 43 | <component name="ProjectType"> | 43 | <component name="ProjectType"> |
IMLib/AndroidManifest.xml
| 1 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 1 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 2 | - package="io.rong.imlib"> | 2 | + package="com.cnlive.libs.chat"> |
| 3 | 3 | ||
| 4 | <uses-sdk | 4 | <uses-sdk |
| 5 | android:minSdkVersion="9" | 5 | android:minSdkVersion="9" |
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | 20 | ||
| 21 | <application> | 21 | <application> |
| 22 | 22 | ||
| 23 | - <!-- imlib config begin --> | 23 | + <!-- com.cnlive.libs.chat config begin --> |
| 24 | <meta-data | 24 | <meta-data |
| 25 | android:name="RONG_CLOUD_APP_KEY" | 25 | android:name="RONG_CLOUD_APP_KEY" |
| 26 | android:value="此处添加APP_KEY" /> | 26 | android:value="此处添加APP_KEY" /> |
| @@ -30,30 +30,30 @@ | @@ -30,30 +30,30 @@ | ||
| 30 | android:exported="true" | 30 | android:exported="true" |
| 31 | android:process=":ipc" /> | 31 | android:process=":ipc" /> |
| 32 | 32 | ||
| 33 | - <service android:name="io.rong.imlib.ReConnectService" | ||
| 34 | - android:exported="true"/> | 33 | + <service |
| 34 | + android:name="io.rong.imlib.ReConnectService" | ||
| 35 | + android:exported="true" /> | ||
| 35 | 36 | ||
| 36 | - <receiver android:name="io.rong.imlib.ConnectChangeReceiver" | ||
| 37 | - android:exported="true"/> | 37 | + <receiver |
| 38 | + android:name="io.rong.imlib.ConnectChangeReceiver" | ||
| 39 | + android:exported="true" /> | ||
| 38 | 40 | ||
| 39 | <receiver | 41 | <receiver |
| 40 | android:name="io.rong.imlib.HeartbeatReceiver" | 42 | android:name="io.rong.imlib.HeartbeatReceiver" |
| 41 | android:process=":ipc" /> | 43 | android:process=":ipc" /> |
| 42 | - <!-- imlib config end --> | 44 | + <!-- com.cnlive.libs.chat config end --> |
| 43 | 45 | ||
| 44 | 46 | ||
| 45 | <!--必选: SDK 核心功能--> | 47 | <!--必选: SDK 核心功能--> |
| 46 | <!--第三方相关,向第三方推送服务请求 token 的服务 --> | 48 | <!--第三方相关,向第三方推送服务请求 token 的服务 --> |
| 47 | <service | 49 | <service |
| 48 | android:name="io.rong.push.core.PushRegistrationService" | 50 | android:name="io.rong.push.core.PushRegistrationService" |
| 49 | - android:exported="false"> | ||
| 50 | - </service> | 51 | + android:exported="false"></service> |
| 51 | 52 | ||
| 52 | <!-- 处理 push 消息相关的服务 --> | 53 | <!-- 处理 push 消息相关的服务 --> |
| 53 | <service | 54 | <service |
| 54 | android:name="io.rong.push.core.MessageHandleService" | 55 | android:name="io.rong.push.core.MessageHandleService" |
| 55 | - android:exported="true"> | ||
| 56 | - </service> | 56 | + android:exported="true"></service> |
| 57 | 57 | ||
| 58 | <!-- push服务 --> | 58 | <!-- push服务 --> |
| 59 | <service | 59 | <service |
| @@ -84,7 +84,7 @@ | @@ -84,7 +84,7 @@ | ||
| 84 | <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" /> | 84 | <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" /> |
| 85 | </intent-filter> | 85 | </intent-filter> |
| 86 | </receiver> | 86 | </receiver> |
| 87 | - | 87 | + |
| 88 | <!--必选: SDK 核心功能--> | 88 | <!--必选: SDK 核心功能--> |
| 89 | 89 | ||
| 90 | <!-- end --> | 90 | <!-- end --> |
IMLib/build.gradle
| @@ -8,7 +8,7 @@ android { | @@ -8,7 +8,7 @@ android { | ||
| 8 | minSdkVersion 9 | 8 | minSdkVersion 9 |
| 9 | targetSdkVersion 19 | 9 | targetSdkVersion 19 |
| 10 | versionCode 1 | 10 | versionCode 1 |
| 11 | - versionName "2.8.5" | 11 | + versionName "1.0" |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | sourceSets { | 14 | sourceSets { |
| @@ -31,9 +31,8 @@ android { | @@ -31,9 +31,8 @@ android { | ||
| 31 | } | 31 | } |
| 32 | 32 | ||
| 33 | dependencies { | 33 | dependencies { |
| 34 | - compile fileTree(include: ['*.jar'], dir: 'libs') | 34 | + compile fileTree(dir: 'libs', include: ['*.jar']) |
| 35 | compile 'com.android.support:support-v4:21.0.0' | 35 | compile 'com.android.support:support-v4:21.0.0' |
| 36 | - compile files('libs/libcnliveutil.jar') | ||
| 37 | } | 36 | } |
| 38 | 37 | ||
| 39 | ext { | 38 | ext { |
IMLib/build/generated/source/buildConfig/androidTest/debug/io/rong/imlib/test/BuildConfig.java deleted
100644 → 0
| 1 | -/** | ||
| 2 | - * Automatically generated file. DO NOT MODIFY | ||
| 3 | - */ | ||
| 4 | -package io.rong.imlib.test; | ||
| 5 | - | ||
| 6 | -public final class BuildConfig { | ||
| 7 | - public static final boolean DEBUG = Boolean.parseBoolean("true"); | ||
| 8 | - public static final String APPLICATION_ID = "io.rong.imlib.test"; | ||
| 9 | - public static final String BUILD_TYPE = "debug"; | ||
| 10 | - public static final String FLAVOR = ""; | ||
| 11 | - public static final int VERSION_CODE = 1; | ||
| 12 | - public static final String VERSION_NAME = "2.8.5"; | ||
| 13 | -} |
IMLib/build/generated/source/buildConfig/debug/io/rong/imlib/BuildConfig.java deleted
100644 → 0
| 1 | -/** | ||
| 2 | - * Automatically generated file. DO NOT MODIFY | ||
| 3 | - */ | ||
| 4 | -package io.rong.imlib; | ||
| 5 | - | ||
| 6 | -public final class BuildConfig { | ||
| 7 | - public static final boolean DEBUG = Boolean.parseBoolean("true"); | ||
| 8 | - public static final String APPLICATION_ID = "io.rong.imlib"; | ||
| 9 | - public static final String BUILD_TYPE = "debug"; | ||
| 10 | - public static final String FLAVOR = ""; | ||
| 11 | - public static final int VERSION_CODE = 1; | ||
| 12 | - public static final String VERSION_NAME = "2.8.5"; | ||
| 13 | -} |
IMLib/build/generated/source/r/androidTest/debug/io/rong/imlib/R.java deleted
100644 → 0
| 1 | -/* AUTO-GENERATED FILE. DO NOT MODIFY. | ||
| 2 | - * | ||
| 3 | - * This class was automatically generated by the | ||
| 4 | - * aapt tool from the resource data it found. It | ||
| 5 | - * should not be modified by hand. | ||
| 6 | - */ | ||
| 7 | -package io.rong.imlib; | ||
| 8 | - | ||
| 9 | -public final class R { | ||
| 10 | - public static final class bool { | ||
| 11 | - public static final int rc_extension_history = 0x7f030000; | ||
| 12 | - public static final int rc_typing_status = 0x7f030001; | ||
| 13 | - } | ||
| 14 | - public static final class integer { | ||
| 15 | - public static final int rc_audio_encoding_bit_rate = 0x7f040000; | ||
| 16 | - public static final int rc_image_quality = 0x7f040001; | ||
| 17 | - public static final int rc_image_size = 0x7f040002; | ||
| 18 | - } | ||
| 19 | - public static final class string { | ||
| 20 | - public static final int rc_init_failed = 0x7f020000; | ||
| 21 | - public static final int rc_location_sharing_ended = 0x7f020001; | ||
| 22 | - public static final int rc_media_message_default_save_path = 0x7f020006; | ||
| 23 | - public static final int rc_notification_new_msg = 0x7f020002; | ||
| 24 | - public static final int rc_notification_new_plural_msg = 0x7f020003; | ||
| 25 | - public static final int rc_notification_ticker_text = 0x7f020004; | ||
| 26 | - public static final int rc_quit_custom_service = 0x7f020005; | ||
| 27 | - } | ||
| 28 | -} |
IMLib/build/generated/source/r/androidTest/debug/io/rong/imlib/test/R.java deleted
100644 → 0
| 1 | -/* AUTO-GENERATED FILE. DO NOT MODIFY. | ||
| 2 | - * | ||
| 3 | - * This class was automatically generated by the | ||
| 4 | - * aapt tool from the resource data it found. It | ||
| 5 | - * should not be modified by hand. | ||
| 6 | - */ | ||
| 7 | - | ||
| 8 | -package io.rong.imlib.test; | ||
| 9 | - | ||
| 10 | -public final class R { | ||
| 11 | - public static final class attr { | ||
| 12 | - } | ||
| 13 | - public static final class bool { | ||
| 14 | - public static final int rc_extension_history=0x7f030000; | ||
| 15 | - public static final int rc_typing_status=0x7f030001; | ||
| 16 | - } | ||
| 17 | - public static final class integer { | ||
| 18 | - public static final int rc_audio_encoding_bit_rate=0x7f040000; | ||
| 19 | - public static final int rc_image_quality=0x7f040001; | ||
| 20 | - public static final int rc_image_size=0x7f040002; | ||
| 21 | - } | ||
| 22 | - public static final class string { | ||
| 23 | - public static final int rc_init_failed=0x7f020000; | ||
| 24 | - public static final int rc_location_sharing_ended=0x7f020001; | ||
| 25 | - public static final int rc_media_message_default_save_path=0x7f020006; | ||
| 26 | - public static final int rc_notification_new_msg=0x7f020002; | ||
| 27 | - public static final int rc_notification_new_plural_msg=0x7f020003; | ||
| 28 | - public static final int rc_notification_ticker_text=0x7f020004; | ||
| 29 | - public static final int rc_quit_custom_service=0x7f020005; | ||
| 30 | - } | ||
| 31 | -} |
IMLib/build/generated/source/r/debug/io/rong/imlib/R.java deleted
100644 → 0
| 1 | -/* AUTO-GENERATED FILE. DO NOT MODIFY. | ||
| 2 | - * | ||
| 3 | - * This class was automatically generated by the | ||
| 4 | - * aapt tool from the resource data it found. It | ||
| 5 | - * should not be modified by hand. | ||
| 6 | - */ | ||
| 7 | - | ||
| 8 | -package io.rong.imlib; | ||
| 9 | - | ||
| 10 | -public final class R { | ||
| 11 | - public static final class attr { | ||
| 12 | - } | ||
| 13 | - public static final class bool { | ||
| 14 | - public static int rc_extension_history=0x7f030000; | ||
| 15 | - public static int rc_typing_status=0x7f030001; | ||
| 16 | - } | ||
| 17 | - public static final class integer { | ||
| 18 | - public static int rc_audio_encoding_bit_rate=0x7f040000; | ||
| 19 | - public static int rc_image_quality=0x7f040001; | ||
| 20 | - public static int rc_image_size=0x7f040002; | ||
| 21 | - } | ||
| 22 | - public static final class string { | ||
| 23 | - public static int rc_init_failed=0x7f020000; | ||
| 24 | - public static int rc_location_sharing_ended=0x7f020001; | ||
| 25 | - public static int rc_media_message_default_save_path=0x7f020006; | ||
| 26 | - public static int rc_notification_new_msg=0x7f020002; | ||
| 27 | - public static int rc_notification_new_plural_msg=0x7f020003; | ||
| 28 | - public static int rc_notification_ticker_text=0x7f020004; | ||
| 29 | - public static int rc_quit_custom_service=0x7f020005; | ||
| 30 | - } | ||
| 31 | -} |
IMLib/build/intermediates/bundles/debug/AndroidManifest.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | - package="io.rong.imlib" | 3 | + package="com.cnlive.libs.chat" |
| 4 | android:versionCode="1" | 4 | android:versionCode="1" |
| 5 | - android:versionName="2.8.5" > | 5 | + android:versionName="1.0" > |
| 6 | 6 | ||
| 7 | <uses-sdk | 7 | <uses-sdk |
| 8 | android:minSdkVersion="9" | 8 | android:minSdkVersion="9" |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | 23 | ||
| 24 | <application> | 24 | <application> |
| 25 | 25 | ||
| 26 | - <!-- imlib config begin --> | 26 | + <!-- com.cnlive.libs.chat config begin --> |
| 27 | <meta-data | 27 | <meta-data |
| 28 | android:name="RONG_CLOUD_APP_KEY" | 28 | android:name="RONG_CLOUD_APP_KEY" |
| 29 | android:value="此处添加APP_KEY" /> | 29 | android:value="此处添加APP_KEY" /> |
| @@ -42,21 +42,19 @@ | @@ -42,21 +42,19 @@ | ||
| 42 | <receiver | 42 | <receiver |
| 43 | android:name="io.rong.imlib.HeartbeatReceiver" | 43 | android:name="io.rong.imlib.HeartbeatReceiver" |
| 44 | android:process=":ipc" /> | 44 | android:process=":ipc" /> |
| 45 | - <!-- imlib config end --> | 45 | + <!-- com.cnlive.libs.chat config end --> |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | <!-- 必选: SDK 核心功能 --> | 48 | <!-- 必选: SDK 核心功能 --> |
| 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> | 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> |
| 50 | <service | 50 | <service |
| 51 | android:name="io.rong.push.core.PushRegistrationService" | 51 | android:name="io.rong.push.core.PushRegistrationService" |
| 52 | - android:exported="false" > | ||
| 53 | - </service> | 52 | + android:exported="false" /> |
| 54 | 53 | ||
| 55 | <!-- 处理 push 消息相关的服务 --> | 54 | <!-- 处理 push 消息相关的服务 --> |
| 56 | <service | 55 | <service |
| 57 | android:name="io.rong.push.core.MessageHandleService" | 56 | android:name="io.rong.push.core.MessageHandleService" |
| 58 | - android:exported="true" > | ||
| 59 | - </service> | 57 | + android:exported="true" /> |
| 60 | 58 | ||
| 61 | <!-- push服务 --> | 59 | <!-- push服务 --> |
| 62 | <service | 60 | <service |
IMLib/build/intermediates/bundles/release/AndroidManifest.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | - package="io.rong.imlib" | 3 | + package="com.cnlive.libs.chat" |
| 4 | android:versionCode="1" | 4 | android:versionCode="1" |
| 5 | - android:versionName="2.8.5" > | 5 | + android:versionName="1.0" > |
| 6 | 6 | ||
| 7 | <uses-sdk | 7 | <uses-sdk |
| 8 | android:minSdkVersion="9" | 8 | android:minSdkVersion="9" |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | 23 | ||
| 24 | <application> | 24 | <application> |
| 25 | 25 | ||
| 26 | - <!-- imlib config begin --> | 26 | + <!-- com.cnlive.libs.chat config begin --> |
| 27 | <meta-data | 27 | <meta-data |
| 28 | android:name="RONG_CLOUD_APP_KEY" | 28 | android:name="RONG_CLOUD_APP_KEY" |
| 29 | android:value="此处添加APP_KEY" /> | 29 | android:value="此处添加APP_KEY" /> |
| @@ -42,21 +42,19 @@ | @@ -42,21 +42,19 @@ | ||
| 42 | <receiver | 42 | <receiver |
| 43 | android:name="io.rong.imlib.HeartbeatReceiver" | 43 | android:name="io.rong.imlib.HeartbeatReceiver" |
| 44 | android:process=":ipc" /> | 44 | android:process=":ipc" /> |
| 45 | - <!-- imlib config end --> | 45 | + <!-- com.cnlive.libs.chat config end --> |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | <!-- 必选: SDK 核心功能 --> | 48 | <!-- 必选: SDK 核心功能 --> |
| 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> | 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> |
| 50 | <service | 50 | <service |
| 51 | android:name="io.rong.push.core.PushRegistrationService" | 51 | android:name="io.rong.push.core.PushRegistrationService" |
| 52 | - android:exported="false" > | ||
| 53 | - </service> | 52 | + android:exported="false" /> |
| 54 | 53 | ||
| 55 | <!-- 处理 push 消息相关的服务 --> | 54 | <!-- 处理 push 消息相关的服务 --> |
| 56 | <service | 55 | <service |
| 57 | android:name="io.rong.push.core.MessageHandleService" | 56 | android:name="io.rong.push.core.MessageHandleService" |
| 58 | - android:exported="true" > | ||
| 59 | - </service> | 57 | + android:exported="true" /> |
| 60 | 58 | ||
| 61 | <!-- push服务 --> | 59 | <!-- push服务 --> |
| 62 | <service | 60 | <service |
IMLib/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
IMLib/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
IMLib/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
IMLib/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
IMLib/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | - package="io.rong.imlib.test" > | 3 | + package="com.cnlive.libs.chat.test" > |
| 4 | 4 | ||
| 5 | <uses-sdk | 5 | <uses-sdk |
| 6 | android:minSdkVersion="9" | 6 | android:minSdkVersion="9" |
| @@ -10,8 +10,8 @@ | @@ -10,8 +10,8 @@ | ||
| 10 | android:name="android.test.InstrumentationTestRunner" | 10 | android:name="android.test.InstrumentationTestRunner" |
| 11 | android:functionalTest="false" | 11 | android:functionalTest="false" |
| 12 | android:handleProfiling="false" | 12 | android:handleProfiling="false" |
| 13 | - android:label="Tests for io.rong.imlib.test" | ||
| 14 | - android:targetPackage="io.rong.imlib.test" /> | 13 | + android:label="Tests for com.cnlive.libs.chat.test" |
| 14 | + android:targetPackage="com.cnlive.libs.chat.test" /> | ||
| 15 | 15 | ||
| 16 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> | 16 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> |
| 17 | <uses-permission android:name="android.permission.INTERNET" /> | 17 | <uses-permission android:name="android.permission.INTERNET" /> |
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | 28 | ||
| 29 | <application> | 29 | <application> |
| 30 | <uses-library android:name="android.test.runner" /> | 30 | <uses-library android:name="android.test.runner" /> |
| 31 | - <!-- imlib config begin --> | 31 | + <!-- com.cnlive.libs.chat config begin --> |
| 32 | <meta-data | 32 | <meta-data |
| 33 | android:name="RONG_CLOUD_APP_KEY" | 33 | android:name="RONG_CLOUD_APP_KEY" |
| 34 | android:value="此处添加APP_KEY" /> | 34 | android:value="此处添加APP_KEY" /> |
| @@ -46,17 +46,15 @@ | @@ -46,17 +46,15 @@ | ||
| 46 | android:exported="true" /> | 46 | android:exported="true" /> |
| 47 | <receiver | 47 | <receiver |
| 48 | android:name="io.rong.imlib.HeartbeatReceiver" | 48 | android:name="io.rong.imlib.HeartbeatReceiver" |
| 49 | - android:process=":ipc" /> <!-- imlib config end --> | 49 | + android:process=":ipc" /> <!-- com.cnlive.libs.chat config end --> |
| 50 | <!-- 必选: SDK 核心功能 --> | 50 | <!-- 必选: SDK 核心功能 --> |
| 51 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> | 51 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> |
| 52 | <service | 52 | <service |
| 53 | android:name="io.rong.push.core.PushRegistrationService" | 53 | android:name="io.rong.push.core.PushRegistrationService" |
| 54 | - android:exported="false" > | ||
| 55 | - </service> <!-- 处理 push 消息相关的服务 --> | 54 | + android:exported="false" /> <!-- 处理 push 消息相关的服务 --> |
| 56 | <service | 55 | <service |
| 57 | android:name="io.rong.push.core.MessageHandleService" | 56 | android:name="io.rong.push.core.MessageHandleService" |
| 58 | - android:exported="true" > | ||
| 59 | - </service> <!-- push服务 --> | 57 | + android:exported="true" /> <!-- push服务 --> |
| 60 | <service | 58 | <service |
| 61 | android:name="io.rong.push.PushService" | 59 | android:name="io.rong.push.PushService" |
| 62 | android:exported="true" | 60 | android:exported="true" |
IMLib/build/intermediates/manifests/aapt/debug/AndroidManifest.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | - package="io.rong.imlib" | 3 | + package="com.cnlive.libs.chat" |
| 4 | android:versionCode="1" | 4 | android:versionCode="1" |
| 5 | - android:versionName="2.8.5" > | 5 | + android:versionName="1.0" > |
| 6 | 6 | ||
| 7 | <uses-sdk | 7 | <uses-sdk |
| 8 | android:minSdkVersion="9" | 8 | android:minSdkVersion="9" |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | 23 | ||
| 24 | <application> | 24 | <application> |
| 25 | 25 | ||
| 26 | - <!-- imlib config begin --> | 26 | + <!-- com.cnlive.libs.chat config begin --> |
| 27 | <meta-data | 27 | <meta-data |
| 28 | android:name="RONG_CLOUD_APP_KEY" | 28 | android:name="RONG_CLOUD_APP_KEY" |
| 29 | android:value="此处添加APP_KEY" /> | 29 | android:value="此处添加APP_KEY" /> |
| @@ -42,21 +42,19 @@ | @@ -42,21 +42,19 @@ | ||
| 42 | <receiver | 42 | <receiver |
| 43 | android:name="io.rong.imlib.HeartbeatReceiver" | 43 | android:name="io.rong.imlib.HeartbeatReceiver" |
| 44 | android:process=":ipc" /> | 44 | android:process=":ipc" /> |
| 45 | - <!-- imlib config end --> | 45 | + <!-- com.cnlive.libs.chat config end --> |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | <!-- 必选: SDK 核心功能 --> | 48 | <!-- 必选: SDK 核心功能 --> |
| 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> | 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> |
| 50 | <service | 50 | <service |
| 51 | android:name="io.rong.push.core.PushRegistrationService" | 51 | android:name="io.rong.push.core.PushRegistrationService" |
| 52 | - android:exported="false" > | ||
| 53 | - </service> | 52 | + android:exported="false" /> |
| 54 | 53 | ||
| 55 | <!-- 处理 push 消息相关的服务 --> | 54 | <!-- 处理 push 消息相关的服务 --> |
| 56 | <service | 55 | <service |
| 57 | android:name="io.rong.push.core.MessageHandleService" | 56 | android:name="io.rong.push.core.MessageHandleService" |
| 58 | - android:exported="true" > | ||
| 59 | - </service> | 57 | + android:exported="true" /> |
| 60 | 58 | ||
| 61 | <!-- push服务 --> | 59 | <!-- push服务 --> |
| 62 | <service | 60 | <service |
IMLib/build/intermediates/manifests/aapt/release/AndroidManifest.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | - package="io.rong.imlib" | 3 | + package="com.cnlive.libs.chat" |
| 4 | android:versionCode="1" | 4 | android:versionCode="1" |
| 5 | - android:versionName="2.8.5" > | 5 | + android:versionName="1.0" > |
| 6 | 6 | ||
| 7 | <uses-sdk | 7 | <uses-sdk |
| 8 | android:minSdkVersion="9" | 8 | android:minSdkVersion="9" |
| @@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
| 23 | 23 | ||
| 24 | <application> | 24 | <application> |
| 25 | 25 | ||
| 26 | - <!-- imlib config begin --> | 26 | + <!-- com.cnlive.libs.chat config begin --> |
| 27 | <meta-data | 27 | <meta-data |
| 28 | android:name="RONG_CLOUD_APP_KEY" | 28 | android:name="RONG_CLOUD_APP_KEY" |
| 29 | android:value="此处添加APP_KEY" /> | 29 | android:value="此处添加APP_KEY" /> |
| @@ -42,21 +42,19 @@ | @@ -42,21 +42,19 @@ | ||
| 42 | <receiver | 42 | <receiver |
| 43 | android:name="io.rong.imlib.HeartbeatReceiver" | 43 | android:name="io.rong.imlib.HeartbeatReceiver" |
| 44 | android:process=":ipc" /> | 44 | android:process=":ipc" /> |
| 45 | - <!-- imlib config end --> | 45 | + <!-- com.cnlive.libs.chat config end --> |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | <!-- 必选: SDK 核心功能 --> | 48 | <!-- 必选: SDK 核心功能 --> |
| 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> | 49 | <!-- 第三方相关,向第三方推送服务请求 token 的服务 --> |
| 50 | <service | 50 | <service |
| 51 | android:name="io.rong.push.core.PushRegistrationService" | 51 | android:name="io.rong.push.core.PushRegistrationService" |
| 52 | - android:exported="false" > | ||
| 53 | - </service> | 52 | + android:exported="false" /> |
| 54 | 53 | ||
| 55 | <!-- 处理 push 消息相关的服务 --> | 54 | <!-- 处理 push 消息相关的服务 --> |
| 56 | <service | 55 | <service |
| 57 | android:name="io.rong.push.core.MessageHandleService" | 56 | android:name="io.rong.push.core.MessageHandleService" |
| 58 | - android:exported="true" > | ||
| 59 | - </service> | 57 | + android:exported="true" /> |
| 60 | 58 | ||
| 61 | <!-- push服务 --> | 59 | <!-- push服务 --> |
| 62 | <service | 60 | <service |
IMLib/build/intermediates/res/resources-debug-androidTest.ap_
No preview for this file type
IMLib/build/outputs/aar/IMLib-debug.aar
No preview for this file type
IMLib/build/outputs/aar/IMLib-release.aar
No preview for this file type
IMLib/src/main/java/io.rong.imlib/Chat.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/Chat.java
| 1 | -package io.rong.imlib; | 1 | +package com.cnlive.libs.chat; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | import android.net.Uri; | 4 | import android.net.Uri; |
| @@ -6,31 +6,25 @@ import android.telephony.TelephonyManager; | @@ -6,31 +6,25 @@ import android.telephony.TelephonyManager; | ||
| 6 | import android.text.TextUtils; | 6 | import android.text.TextUtils; |
| 7 | import android.util.Log; | 7 | import android.util.Log; |
| 8 | 8 | ||
| 9 | +import com.cnlive.libs.chat.base.IChat; | ||
| 10 | +import com.cnlive.libs.chat.model.CNMessage; | ||
| 11 | +import com.cnlive.libs.chat.model.CNUserInfo; | ||
| 12 | +import com.cnlive.libs.chat.model.ConnectionStatus; | ||
| 13 | +import com.cnlive.libs.chat.model.DataEntity; | ||
| 14 | +import com.cnlive.libs.chat.network.HttpRequest; | ||
| 9 | import com.cnlive.libs.util.Config; | 15 | import com.cnlive.libs.util.Config; |
| 10 | import com.cnlive.libs.util.NetUtil; | 16 | import com.cnlive.libs.util.NetUtil; |
| 11 | import com.cnlive.libs.util.data.okhttp3.Call; | 17 | import com.cnlive.libs.util.data.okhttp3.Call; |
| 12 | import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback; | 18 | import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback; |
| 13 | 19 | ||
| 14 | -import org.apache.http.HttpResponse; | ||
| 15 | -import org.json.JSONException; | ||
| 16 | -import org.json.JSONObject; | ||
| 17 | - | ||
| 18 | -import java.lang.annotation.Target; | ||
| 19 | import java.util.ArrayList; | 20 | import java.util.ArrayList; |
| 20 | import java.util.List; | 21 | import java.util.List; |
| 21 | -import java.util.UUID; | ||
| 22 | 22 | ||
| 23 | -import io.rong.imlib.base.IChat; | ||
| 24 | -import io.rong.imlib.model.CNMessage; | ||
| 25 | -import io.rong.imlib.model.CNUserInfo; | ||
| 26 | -import io.rong.imlib.model.ConnectionStatus; | 23 | +import io.rong.imlib.RongIMClient; |
| 27 | import io.rong.imlib.model.Conversation; | 24 | import io.rong.imlib.model.Conversation; |
| 28 | -import io.rong.imlib.model.DataEntity; | ||
| 29 | import io.rong.imlib.model.Message; | 25 | import io.rong.imlib.model.Message; |
| 30 | import io.rong.imlib.model.MessageContent; | 26 | import io.rong.imlib.model.MessageContent; |
| 31 | import io.rong.imlib.model.UserInfo; | 27 | import io.rong.imlib.model.UserInfo; |
| 32 | -import io.rong.imlib.network.HttpRequest; | ||
| 33 | -import io.rong.imlib.network.HttpUtil; | ||
| 34 | import io.rong.message.TextMessage; | 28 | import io.rong.message.TextMessage; |
| 35 | 29 | ||
| 36 | /** | 30 | /** |
IMLib/src/main/java/io.rong.imlib/ChatUtil.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/ChatUtil.java
| 1 | -package io.rong.imlib; | 1 | +package com.cnlive.libs.chat; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | 4 | ||
| 5 | -import io.rong.imlib.base.IChat; | ||
| 6 | -import io.rong.imlib.model.CNUserInfo; | ||
| 7 | -import io.rong.imlib.model.ConnectionStatus; | ||
| 8 | -import io.rong.imlib.model.UserInfo; | 5 | +import com.cnlive.libs.chat.base.IChat; |
| 6 | +import com.cnlive.libs.chat.model.CNUserInfo; | ||
| 7 | +import com.cnlive.libs.chat.model.ConnectionStatus; | ||
| 9 | 8 | ||
| 10 | /** | 9 | /** |
| 11 | * Created by Lynn on 2/10/2017. | 10 | * Created by Lynn on 2/10/2017. |
IMLib/src/main/java/io.rong.imlib/base/IChat.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/base/IChat.java
| 1 | -package io.rong.imlib.base; | 1 | +package com.cnlive.libs.chat.base; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | 4 | ||
| 5 | +import com.cnlive.libs.chat.model.CNMessage; | ||
| 6 | +import com.cnlive.libs.chat.model.CNUserInfo; | ||
| 7 | +import com.cnlive.libs.chat.model.ConnectionStatus; | ||
| 8 | + | ||
| 5 | import java.util.List; | 9 | import java.util.List; |
| 6 | 10 | ||
| 7 | -import io.rong.imlib.model.CNMessage; | ||
| 8 | -import io.rong.imlib.model.CNUserInfo; | ||
| 9 | -import io.rong.imlib.model.ConnectionStatus; | ||
| 10 | -import io.rong.imlib.model.UserInfo; | ||
| 11 | 11 | ||
| 12 | /** | 12 | /** |
| 13 | * Created by Lynn on 2/9/2017. | 13 | * Created by Lynn on 2/9/2017. |
IMLib/src/main/java/io.rong.imlib/model/CNMessage.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/model/CNMessage.java
IMLib/src/main/java/io.rong.imlib/model/CNNotificationMessage.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/model/CNNotificationMessage.java
IMLib/src/main/java/io.rong.imlib/model/CNUserInfo.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/model/CNUserInfo.java
IMLib/src/main/java/io.rong.imlib/model/ConnectionStatus.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/model/ConnectionStatus.java
IMLib/src/main/java/io.rong.imlib/model/DataEntity.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/model/DataEntity.java
IMLib/src/main/java/io.rong.imlib/model/ErrorMessage.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/model/ErrorMessage.java
IMLib/src/main/java/io.rong.imlib/network/HttpRequest.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/network/HttpRequest.java
| 1 | -package io.rong.imlib.network; | 1 | +package com.cnlive.libs.chat.network; |
| 2 | 2 | ||
| 3 | -import android.util.Log; | ||
| 4 | 3 | ||
| 4 | +import com.cnlive.libs.chat.model.CNUserInfo; | ||
| 5 | +import com.cnlive.libs.chat.model.DataEntity; | ||
| 5 | import com.cnlive.libs.util.Config; | 6 | import com.cnlive.libs.util.Config; |
| 6 | import com.cnlive.libs.util.HttpUtils; | 7 | import com.cnlive.libs.util.HttpUtils; |
| 7 | import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback; | 8 | import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback; |
| @@ -9,9 +10,6 @@ import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback; | @@ -9,9 +10,6 @@ import com.cnlive.libs.util.data.okhttpUtil.callback.GenericsCallback; | ||
| 9 | import java.util.HashMap; | 10 | import java.util.HashMap; |
| 10 | import java.util.Map; | 11 | import java.util.Map; |
| 11 | 12 | ||
| 12 | -import io.rong.imlib.model.CNUserInfo; | ||
| 13 | -import io.rong.imlib.model.DataEntity; | ||
| 14 | - | ||
| 15 | /** | 13 | /** |
| 16 | * Created by Lynn on 3/2/2017. | 14 | * Created by Lynn on 3/2/2017. |
| 17 | */ | 15 | */ |
IMLib/src/main/java/io.rong.imlib/network/HttpUtil.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/network/HttpUtil.java
IMLib/src/main/java/io.rong.imlib/receiver/SealNotificationReceiver.java renamed to IMLib/src/main/java/com.cnlive.libs.chat/receiver/SealNotificationReceiver.java
| 1 | -package io.rong.imlib.receiver; | 1 | +package com.cnlive.libs.chat.receiver; |
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | 4 | ||
| 5 | -import io.rong.imlib.model.CNNotificationMessage; | 5 | +import com.cnlive.libs.chat.model.CNNotificationMessage; |
| 6 | + | ||
| 6 | import io.rong.push.notification.PushMessageReceiver; | 7 | import io.rong.push.notification.PushMessageReceiver; |
| 7 | import io.rong.push.notification.PushNotificationMessage; | 8 | import io.rong.push.notification.PushNotificationMessage; |
| 8 | 9 |
app/src/main/java/com/cnlive/chat/CNLiveApplication.java
| @@ -2,10 +2,9 @@ package com.cnlive.chat; | @@ -2,10 +2,9 @@ package com.cnlive.chat; | ||
| 2 | 2 | ||
| 3 | import android.app.Application; | 3 | import android.app.Application; |
| 4 | 4 | ||
| 5 | +import com.cnlive.libs.chat.ChatUtil; | ||
| 5 | import com.cnlive.libs.util.Config; | 6 | import com.cnlive.libs.util.Config; |
| 6 | 7 | ||
| 7 | -import io.rong.imlib.ChatUtil; | ||
| 8 | - | ||
| 9 | /** | 8 | /** |
| 10 | * Created by Lynn on 2/10/2017. | 9 | * Created by Lynn on 2/10/2017. |
| 11 | */ | 10 | */ |
app/src/main/java/com/cnlive/chat/adapter/ChatListAdapter.java
| @@ -8,11 +8,11 @@ import android.widget.BaseAdapter; | @@ -8,11 +8,11 @@ import android.widget.BaseAdapter; | ||
| 8 | import android.widget.TextView; | 8 | import android.widget.TextView; |
| 9 | 9 | ||
| 10 | import com.cnlive.chat.R; | 10 | import com.cnlive.chat.R; |
| 11 | +import com.cnlive.libs.chat.model.CNMessage; | ||
| 12 | + | ||
| 11 | import java.util.ArrayList; | 13 | import java.util.ArrayList; |
| 12 | import java.util.List; | 14 | import java.util.List; |
| 13 | 15 | ||
| 14 | -import io.rong.imlib.model.CNMessage; | ||
| 15 | - | ||
| 16 | /** | 16 | /** |
| 17 | * Created by Lynn on 2/13/2017. | 17 | * Created by Lynn on 2/13/2017. |
| 18 | */ | 18 | */ |
app/src/main/java/com/cnlive/chat/receiver/CNPushMessageReceiver.java
| @@ -2,8 +2,8 @@ package com.cnlive.chat.receiver; | @@ -2,8 +2,8 @@ package com.cnlive.chat.receiver; | ||
| 2 | 2 | ||
| 3 | import android.content.Context; | 3 | import android.content.Context; |
| 4 | 4 | ||
| 5 | -import io.rong.imlib.model.CNNotificationMessage; | ||
| 6 | -import io.rong.imlib.receiver.SealNotificationReceiver; | 5 | +import com.cnlive.libs.chat.model.CNNotificationMessage; |
| 6 | +import com.cnlive.libs.chat.receiver.SealNotificationReceiver; | ||
| 7 | 7 | ||
| 8 | /** | 8 | /** |
| 9 | * Created by Lynn on 2/17/2017. | 9 | * Created by Lynn on 2/17/2017. |
app/src/main/java/com/cnlive/chat/ui/ChatRoomActivity.java
| @@ -16,14 +16,13 @@ import android.widget.Toast; | @@ -16,14 +16,13 @@ import android.widget.Toast; | ||
| 16 | 16 | ||
| 17 | import com.cnlive.chat.R; | 17 | import com.cnlive.chat.R; |
| 18 | import com.cnlive.chat.adapter.ChatListAdapter; | 18 | import com.cnlive.chat.adapter.ChatListAdapter; |
| 19 | +import com.cnlive.libs.chat.ChatUtil; | ||
| 20 | +import com.cnlive.libs.chat.base.IChat; | ||
| 21 | +import com.cnlive.libs.chat.model.CNMessage; | ||
| 22 | +import com.cnlive.libs.chat.model.CNUserInfo; | ||
| 19 | 23 | ||
| 20 | import java.util.ArrayList; | 24 | import java.util.ArrayList; |
| 21 | 25 | ||
| 22 | -import io.rong.imlib.model.CNMessage; | ||
| 23 | -import io.rong.imlib.ChatUtil; | ||
| 24 | -import io.rong.imlib.base.IChat; | ||
| 25 | -import io.rong.imlib.model.CNUserInfo; | ||
| 26 | - | ||
| 27 | public class ChatRoomActivity extends AppCompatActivity implements View.OnClickListener { | 26 | public class ChatRoomActivity extends AppCompatActivity implements View.OnClickListener { |
| 28 | 27 | ||
| 29 | private static final String TAG = "ChatRoomActivity"; | 28 | private static final String TAG = "ChatRoomActivity"; |
| @@ -57,8 +56,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | @@ -57,8 +56,7 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | ||
| 57 | // ChatUtil.connect(null); | 56 | // ChatUtil.connect(null); |
| 58 | 57 | ||
| 59 | mHandler = new Handler(this.getMainLooper()); | 58 | mHandler = new Handler(this.getMainLooper()); |
| 60 | - ChatUtil.setOnErrorListener(onErrorListener); | ||
| 61 | - ChatUtil.setOnInfoListener(onInfoListener); | 59 | + ChatUtil.setOnCNChatListener(onCNChatListener); |
| 62 | ChatUtil.setOnSendMessageListener(onSendMessageListener); | 60 | ChatUtil.setOnSendMessageListener(onSendMessageListener); |
| 63 | ChatUtil.setOnOperationListener(onOperationListener); | 61 | ChatUtil.setOnOperationListener(onOperationListener); |
| 64 | ChatUtil.setOnResultListener(onResultListener); | 62 | ChatUtil.setOnResultListener(onResultListener); |
| @@ -286,17 +284,43 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | @@ -286,17 +284,43 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL | ||
| 286 | } | 284 | } |
| 287 | }; | 285 | }; |
| 288 | 286 | ||
| 289 | - private IChat.OnErrorListener onErrorListener = new IChat.OnErrorListener() { | 287 | + private IChat.OnCNChatListener onCNChatListener = new IChat.OnCNChatListener() { |
| 290 | @Override | 288 | @Override |
| 291 | public void onError(int what, String extra) { | 289 | public void onError(int what, String extra) { |
| 292 | - Log.e("DemoView", what + " : " + extra); | 290 | + Log.e(TAG, what + " : " + extra); |
| 291 | + switch (what) { | ||
| 292 | + case IChat.ERROR_CHECK_AUTH: | ||
| 293 | + //鉴权失败 | ||
| 294 | + break; | ||
| 295 | + case IChat.ERROR_CHECK_AUTH_NETWORK: | ||
| 296 | + //鉴权时网络出错 | ||
| 297 | + break; | ||
| 298 | + case IChat.ERROR_CHECK_AUTH_OTHER: | ||
| 299 | + //鉴权时内部出现错误 | ||
| 300 | + break; | ||
| 301 | + case IChat.ERROR_GET_TOKEN: | ||
| 302 | + //获取token失败 | ||
| 303 | + break; | ||
| 304 | + case IChat.ERROR_GET_TOKEN_NETWORK: | ||
| 305 | + //获取token时网络错误 | ||
| 306 | + break; | ||
| 307 | + case IChat.ERROR_GET_TOKEN_OTHER: | ||
| 308 | + //获取token时内部出现错误 | ||
| 309 | + break; | ||
| 310 | + } | ||
| 293 | } | 311 | } |
| 294 | - }; | ||
| 295 | 312 | ||
| 296 | - private IChat.OnInfoListener onInfoListener = new IChat.OnInfoListener() { | ||
| 297 | @Override | 313 | @Override |
| 298 | public void onInfo(int what, String extra) { | 314 | public void onInfo(int what, String extra) { |
| 299 | - Log.e("DemoView", what + " : " + extra); | 315 | + Log.e(TAG, what + " : " + extra); |
| 316 | + switch (what) { | ||
| 317 | + case IChat.SUCCESS_CHECK_AUTH: | ||
| 318 | + //鉴权成功 | ||
| 319 | + break; | ||
| 320 | + case IChat.SUCCESS_GET_TOKEN: | ||
| 321 | + //获取token成功 | ||
| 322 | + break; | ||
| 323 | + } | ||
| 300 | } | 324 | } |
| 301 | }; | 325 | }; |
| 302 | 326 |
app/src/main/java/com/cnlive/chat/ui/MainActivity.java
| @@ -10,11 +10,6 @@ import android.widget.Button; | @@ -10,11 +10,6 @@ import android.widget.Button; | ||
| 10 | 10 | ||
| 11 | import com.cnlive.chat.R; | 11 | import com.cnlive.chat.R; |
| 12 | 12 | ||
| 13 | -import io.rong.imlib.ChatUtil; | ||
| 14 | -import io.rong.imlib.base.IChat; | ||
| 15 | -import io.rong.imlib.model.CNUserInfo; | ||
| 16 | -import io.rong.imlib.model.UserInfo; | ||
| 17 | - | ||
| 18 | public class MainActivity extends AppCompatActivity implements View.OnClickListener { | 13 | public class MainActivity extends AppCompatActivity implements View.OnClickListener { |
| 19 | 14 | ||
| 20 | private static final String TAG = "MainActivity"; | 15 | private static final String TAG = "MainActivity"; |
app/src/main/java/com/cnlive/chat/ui/PrivateChatActivity.java
| @@ -12,16 +12,15 @@ import android.widget.Toast; | @@ -12,16 +12,15 @@ import android.widget.Toast; | ||
| 12 | 12 | ||
| 13 | import com.cnlive.chat.R; | 13 | import com.cnlive.chat.R; |
| 14 | import com.cnlive.chat.adapter.ChatListAdapter; | 14 | import com.cnlive.chat.adapter.ChatListAdapter; |
| 15 | +import com.cnlive.libs.chat.ChatUtil; | ||
| 16 | +import com.cnlive.libs.chat.base.IChat; | ||
| 17 | +import com.cnlive.libs.chat.model.CNMessage; | ||
| 18 | +import com.cnlive.libs.chat.model.CNUserInfo; | ||
| 15 | 19 | ||
| 16 | import java.util.ArrayList; | 20 | import java.util.ArrayList; |
| 17 | import java.util.Collections; | 21 | import java.util.Collections; |
| 18 | import java.util.List; | 22 | import java.util.List; |
| 19 | 23 | ||
| 20 | -import io.rong.imlib.model.CNMessage; | ||
| 21 | -import io.rong.imlib.ChatUtil; | ||
| 22 | -import io.rong.imlib.base.IChat; | ||
| 23 | -import io.rong.imlib.model.CNUserInfo; | ||
| 24 | - | ||
| 25 | public class PrivateChatActivity extends AppCompatActivity implements View.OnClickListener { | 24 | public class PrivateChatActivity extends AppCompatActivity implements View.OnClickListener { |
| 26 | 25 | ||
| 27 | private static final String TAG = "PrivateChatActivity"; | 26 | private static final String TAG = "PrivateChatActivity"; |