更新demo

陈硕
1 parent 93daa41a
Showing 11 changed files with 20 additions and 87 deletions
.idea/modules.xml
app/libs/libcnliveutil.jar
app/src/main/AndroidManifest.xml
app/src/main/java/com/cnlive/im/ui/ChatRoomActivity.java
app/src/main/java/com/cnlive/im/ui/LoGinActivity.java
app/src/main/java/com/cnlive/im/ui/MainActivity.java
app/src/main/java/com/cnlive/im/ui/PrivateChatActivity.java
app/src/main/jniLibs/arm64-v8a/libRongIMLib.so
app/src/main/jniLibs/armeabi-v7a/libRongIMLib.so
app/src/main/jniLibs/armeabi/libRongIMLib.so
app/src/main/jniLibs/x86/libRongIMLib.so
@@ -4,6 +4,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNChatNDemo.iml" filepath="$PROJECT_DIR$/CNChatNDemo.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" />
     </modules>
@@ -34,8 +34,6 @@
         <activity
             android:name="com.cnlive.im.ui.ChatRoomActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             >
@@ -43,102 +41,35 @@
         <activity
             android:name="com.cnlive.im.ui.LoGinActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
+             />
         <activity
             android:name=".ui.UserLoginActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
+              />
         <activity
             android:name="com.cnlive.im.ui.PrivateChatActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
+              />
         <activity
             android:name="com.cnlive.im.ui.CommentActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
+            />
-        <activity
-            android:name=".ui.ChatItemActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"  />
         <service
             android:name="io.rong.imlib.ipc.RongService"
             android:exported="true"
             android:process=":ipc" />
-        <service
-            android:name="io.rong.imlib.ReConnectService"
-            android:exported="true" />
+        <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.ConnectChangeReceiver"
+            android:exported="true"/>
         <receiver
             android:name="io.rong.imlib.HeartbeatReceiver"
             android:process=":ipc" />
-        <!-- com.cnlive.libs.chat config end -->
-
-
-        <!--必选： SDK 核心功能-->
-        <!--第三方相关,向第三方推送服务请求 token 的服务 -->
-        <service
-            android:name="io.rong.push.core.PushRegistrationService"
-            android:exported="false"></service>
-
-        <!-- 处理 push 消息相关的服务 -->
-        <service
-            android:name="io.rong.push.core.MessageHandleService"
-            android:exported="true"></service>
-
-        <!-- push服务 -->
-        <service
-            android:name="io.rong.push.PushService"
-            android:exported="true"
-            android:process="io.rong.push">  <!-- push进程，可以改名 -->
-        </service>
-
-        <!-- push 相关事件接收器 -->
-        <receiver
-            android:name="io.rong.push.PushReceiver"
-            android:process="io.rong.push">   <!-- 此处进程可以改名，名称需要和PushService所在进程统一 -->
-            <!-- 心跳事件 -->
-            <intent-filter>
-                <action android:name="io.rong.push.intent.action.HEART_BEAT" />
-            </intent-filter>
-            <!-- 网络变动事件 -->
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-            <!-- 部分用户事件 -->
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.USER_PRESENT" />
-                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
-                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
-            </intent-filter>
-        </receiver>
-
-        <!--必选： SDK 核心功能-->
-
-        <!-- end -->
     </application>
 </manifest>
 \ No newline at end of file
@@ -68,12 +68,13 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         ChatUtil.setOnReceiveMessageListener(receiveMessageListener);
         ChatUtil.setKickedOfflineListener(onKickedOfflineListener);
+
         Intent intent = getIntent();
         user_name_string = intent.getStringExtra("user_name_string");
         String user_id_string = intent.getStringExtra("user_id_string");
         if (user_name_string != null)
-            ChatUtil.login(new CNUserInfo(user_id_string, user_name_string, ""), connectListener);
-        else ChatUtil.logOut(connectListener);
+            ChatUtil.login(new CNUserInfo(user_id_string, user_name_string, ""));
+        else ChatUtil.logOut();
     }
@@ -317,22 +318,20 @@ public class ChatRoomActivity extends AppCompatActivity implements View.OnClickL
         @Override
         public void onTokenIncorrect(String s) {
             Log.e(TAG, "ConnectListener TokenIncorrect");
-            Toast.makeText(ChatRoomActivity.this, "TokenIncorrect", Toast.LENGTH_SHORT).show();
-            finish();
+
         }
         @Override
-        public void onSuccess(String s) {
+        public void onSuccess(final String s) {
             Log.e(TAG, "ConnectListener 连接监听" + s);
-            Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
         }
         @Override
-        public void onError(int i, String s) {
+        public void onError(int i, final String s) {
             Log.e(TAG, "ConnectListener errorCode : " + i + " : errorMessage : " + s);
-            Toast.makeText(ChatRoomActivity.this, s, Toast.LENGTH_SHORT).show();
-            finish();
+
+
         }
     };
@@ -42,6 +42,7 @@ public class LoGinActivity extends AppCompatActivity implements View.OnClickList
             case R.id.vis_login:
                 Intent intent = new Intent(LoGinActivity.this, ChatRoomActivity.class);
                 startActivity(intent);
+
                 break;
             case R.id.user_logOut:
                 ChatUtil.disconnect(false);
@@ -50,6 +50,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         public void onSuccess(String s) {
             Intent intent = new Intent(MainActivity.this,LoGinActivity.class);
             startActivity(intent);
+
         }
         @Override
@@ -139,7 +139,7 @@ public class PrivateChatActivity extends AppCompatActivity implements View.OnCli
                     edit_layout.setVisibility(View.VISIBLE);
                     chatListView.setVisibility(View.VISIBLE);
                     CNUserInfo cnName = new CNUserInfo(user_id_string, user_name_string, "");
-                    ChatUtil.login(cnName, connectListener);
+                    ChatUtil.login(cnName);
                 }