解决冲突

王琳
2 parents 7031d75c 6d5652cc
Showing 5 changed files with 32 additions and 4 deletions
.idea/gradle.xml
.idea/modules.xml
README.md
app/src/main/java/com/cnlive/im/ui/MainActivity.java
build.gradle
@@ -3,9 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="LOCAL" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Android\Android Studio1\gradle\gradle-3.3" />
+        <option name="gradleHome" value="C:/Program Files/Android/Android Studio1/gradle/gradle-3.3" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -4,9 +4,11 @@
     <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$/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://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
 </project>
 \ No newline at end of file
+视讯云聊天sdk
+====
+#### CNChat 2.0 Android SDK是视讯云推出的 Android平台上使用的软件开发工具包(SDK),负责聊天室的加入发消息等。使用文档详见 [聊天sdk文档wiki](http://bj.gitlab.cnlive.com/cnlive-team/CNIMDemo/wikis/home)
 \ No newline at end of file
 package com.cnlive.im.ui;
  
+import android.Manifest;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
+import android.widget.Toast;
  
 import com.cnlive.im.R;
 import com.cnlive.libs.util.chat.ChatUtil;
@@ -14,6 +20,7 @@ import com.cnlive.libs.util.chat.base.IChat;
 public class MainActivity extends AppCompatActivity implements View.OnClickListener {
  
  
+    private static final int PERMISSION_REQUEST_CODE = 0x1001;
     private Button connectedBtn;
     private Button commentBtn;
  
@@ -63,7 +70,23 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
  
     @Override
     public void onClick(View v) {
-        ChatUtil.connect(connectListener);
+        int checkCallPhonePermission = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_PHONE_STATE);
+        if (Build.VERSION.SDK_INT >= 23 && checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE}, PERMISSION_REQUEST_CODE);
+        }else{
+            ChatUtil.connect(connectListener);
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if(requestCode == PERMISSION_REQUEST_CODE)
+        if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            ChatUtil.connect(connectListener);
+        } else {
+            Toast.makeText(this, "权限已被禁止，请打开读取手机状态权限，再使用此功能", Toast.LENGTH_LONG).show();
+        }
     }
 }
  
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.3'
  
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files