1.升级调试

朱显松
1 parent baaac59f
Showing 9 changed files with 20 additions and 45 deletions
.idea/misc.xml
.idea/modules.xml
app/build.gradle
app/libs/libcnliveutil.jar
app/note/聊天SDK文档.pdf
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/im/adapter/CommentAdapter.java
app/src/main/java/com/cnlive/im/ui/CommentActivity.java
build.gradle
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,17 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <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">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -2,12 +2,10 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/CNChatNDemo.iml" filepath="$PROJECT_DIR$/CNChatNDemo.iml" />
+      <module fileurl="file://D:\AndroidStudiopro\CNIMDemo\CNChatNDemo.iml" filepath="D:\AndroidStudiopro\CNIMDemo\CNChatNDemo.iml" />
       <module fileurl="file://$PROJECT_DIR$/CNIMDemo.iml" filepath="$PROJECT_DIR$/CNIMDemo.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNIMDemo.iml" filepath="$PROJECT_DIR$/CNIMDemo.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNIMDemo23.iml" filepath="$PROJECT_DIR$/CNIMDemo23.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNIMDemo5.iml" filepath="$PROJECT_DIR$/CNIMDemo5.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://D:\AndroidStudiopro\CNIMDemo\CNIMDemo23.iml" filepath="D:\AndroidStudiopro\CNIMDemo\CNIMDemo23.iml" />
+      <module fileurl="file://D:\AndroidStudiopro\CNIMDemo\CNIMDemo5.iml" filepath="D:\AndroidStudiopro\CNIMDemo\CNIMDemo5.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "25.0.0"
     defaultConfig {
         applicationId "com.cnlive.im"
-        minSdkVersion 15
+        minSdkVersion 16
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
@@ -38,12 +38,11 @@ android {
  
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
+    compile 'com.inthecheesefactory.thecheeselibrary:fb-like:1.0.1'
     compile 'com.android.support:appcompat-v7:23.4.0'
     compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9'
     compile 'com.android.support:recyclerview-v7:23.0.0'
     compile 'com.github.bumptech.glide:glide:3.7.0'
-    testCompile 'junit:junit:4.12'
+//    compile 'com.cnlive:lib_cnutil:3.0.0'
+    compile 'com.cnlive:lib_cnchat_rc:2.0.2'
 }
@@ -46,21 +46,6 @@
         <activity android:name=".ui.PrivateActivity"
             android:screenOrientation="portrait"/>
  
-        <service
-            android:name="io.rong.imlib.ipc.RongService"
-            android:exported="true"
-            android:process=":ipc" />
-        <service
-            android:name="io.rong.imlib.ReConnectService"
-            android:exported="true" />
-
-        <receiver
-            android:name="io.rong.imlib.ConnectChangeReceiver"
-            android:exported="true" />
-        <receiver
-            android:name="io.rong.imlib.HeartbeatReceiver"
-            android:process=":ipc" />
-
     </application>
  
 </manifest>
 \ No newline at end of file
@@ -10,7 +10,7 @@ import android.widget.TextView;
  
 import com.bumptech.glide.Glide;
 import com.cnlive.im.R;
-import com.cnlive.libs.util.model.CommentItem;
+import com.cnlive.libs.util.comment.model.CommentItem;
  
 import java.util.ArrayList;
 import java.util.List;
@@ -13,14 +13,14 @@ import android.widget.Toast;
  
 import com.cnlive.im.R;
 import com.cnlive.im.adapter.CommentAdapter;
-import com.cnlive.libs.util.chat.model.ErrorMessage;
 import com.cnlive.libs.util.comment.CommentUtil;
 import com.cnlive.libs.util.comment.base.CommentCallback;
 import com.cnlive.libs.util.comment.base.CommentListCallback;
 import com.cnlive.libs.util.comment.base.CommentProgramCallback;
-import com.cnlive.libs.util.model.CommentItem;
-import com.cnlive.libs.util.model.CommentPage;
-import com.cnlive.libs.util.model.CommentProgram;
+import com.cnlive.libs.util.comment.model.CommentItem;
+import com.cnlive.libs.util.comment.model.CommentPage;
+import com.cnlive.libs.util.comment.model.CommentProgram;
+import com.cnlive.libs.util.comment.model.ErrorMessage;
  
 import java.util.List;
  
@@ -3,10 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://dl.bintray.com/granzon/cnlive/'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
-
+//        compile 'com.inthecheesefactory.thecheeselibrary:fb-like:0.9.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -15,6 +18,9 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://dl.bintray.com/granzon/cnlive/'
+        }
     }
 }