Merge pull request #151 from jinfengf/develop

Develop
jpush · May 15, 2019 · 671d65b · 671d65b
2 parents 458fc34 + 5d4cd2a
commit 671d65b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/chatapp/ChangeLog.md b/chatapp/ChangeLog.md
@@ -0,0 +1,10 @@
+### JChat v2.3.0
+
+#### ChangeLog
+
+##### BugFix:
++ 修复表情库无法使用问题
++ 修复用户反馈的一些其他bug
+
+##### NewFeature
++ 新增聊天室功能
diff --git a/chatapp/src/main/java/jiguang/chat/activity/MainActivity.java b/chatapp/src/main/java/jiguang/chat/activity/MainActivity.java
@@ -62,7 +62,6 @@ private void requestPermission() {
  Manifest.permission.ACCESS_FINE_LOCATION,
  Manifest.permission.ACCESS_WIFI_STATE,
  Manifest.permission.RECORD_AUDIO)
- .rationale(rationaleListener)
  .callback(listener)
  .start();
  }
@@ -111,15 +110,15 @@ public void onFailed(int requestCode, List<String> deniedPermissions) {
  }
  };
 
- private RationaleListener rationaleListener = (requestCode, rationale) -> {
- AlertDialog.newBuilder(this)
- .setMessage("正常使用JChat需要您打开相关权限.")
- .setPositiveButton("是", (dialog, which) -> {
- rationale.resume();
- })
- .setNegativeButton("否", (dialog, which) -> {
- rationale.cancel();
- }).show();
- };
+// private RationaleListener rationaleListener = (requestCode, rationale) -> {
+// AlertDialog.newBuilder(this)
+// .setMessage("正常使用JChat需要您打开相关权限.")
+// .setPositiveButton("是", (dialog, which) -> {
+// rationale.resume();
+// })
+// .setNegativeButton("否", (dialog, which) -> {
+// rationale.cancel();
+// }).show();
+// };
 
 }