6.0聊天室权限认证，添加签名信息，更新Jar

朱显松
1 parent 6c56b92a
Showing 6 changed files with 40 additions and 7 deletions
app/build.gradle
app/cnlive_app.jks
app/libs/libcnlivelive.jar
app/libs/libcnliveutil.jar
app/src/main/java/com/cnlive/gundam/video/fragment/chat/ChatRoomFragment.java
app/src/main/res/layout/fragment_player_ugc_live.xml
@@ -11,13 +11,28 @@ android {
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+
     dataBinding {
         enabled true
     }
+
+    signingConfigs {
+        myConfig {
+            storeFile file("cnlive_app.jks")
+            storePassword "000000"
+            keyAlias "CNliveApp"
+            keyPassword "000000"
+        }
+    }
+
     buildTypes {
+        debug{
+            signingConfig signingConfigs.myConfig
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.myConfig
         }
     }
 }
 package com.cnlive.gundam.video.fragment.chat;
+import android.Manifest;
+import android.content.pm.PackageManager;
 import android.databinding.BindingAdapter;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
@@ -20,6 +24,7 @@ import com.cnlive.gundam.databinding.FragmentChatBinding;
 import com.cnlive.gundam.user.auth.UserService;
 import com.cnlive.gundam.user.model.User;
 import com.cnlive.gundam.user.util.InputUtil;
+import com.cnlive.gundam.user.util.ToastUtil;
 import com.cnlive.gundam.video.adpter.CommonAdapter;
 import com.cnlive.gundam.video.adpter.GiftAdapter;
 import com.cnlive.gundam.video.barrage.BarrageBaseMessage;
@@ -42,6 +47,8 @@ import java.util.ArrayList;
  */
 public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback, MessageContentInfo.OnChatListener {
+    private final int PERMISSION_REQUEST_CODE = 0x1001;
+
     private FragmentChatBinding fragmentChatBinding;
     private ArrayList<GiftModle> giftArray;
     private CommonAdapter<MessageContent> messageContentCommonAdapter;
@@ -77,9 +84,24 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         initListener();
         initDate();
         initGift();
-        initChat();
+        int checkCallPhonePermission = ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_PHONE_STATE);
+        if (checkCallPhonePermission != PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(new String[]{Manifest.permission.READ_PHONE_STATE}, PERMISSION_REQUEST_CODE);
+        }else{
+            initChat();
+        }
+    }
+    @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) {
+                initChat();
+            } else {
+                ToastUtil.show(getActivity(),"使用聊天功能,请通过权限审核");
+            }
+        }
     }
-
     private void barrageBottom() {
         switchCompatBottom = fragmentChatBinding.barrage;
@@ -135,15 +157,11 @@ public class ChatRoomFragment extends Fragment implements InputUtil.SendCallback
         final int uid = activeAccountInfo.getUid();
         if (uid != 0) {
-
             ChatUtil.connect(new CNUserInfo(uid + "", nickname, faceurl), messageContentInfo.onConnectListener);
         } else {
-
             ChatUtil.connect(messageContentInfo.onConnectListener);
-
         }
-
         ChatUtil.setOnReceiveMessageListener(messageContentInfo.onReceiveMessageListener);
     }
@@ -25,7 +25,7 @@
         <RelativeLayout
             android:id="@+id/contentLayout"
             android:layout_width="match_parent"
-            android:layout_height="240dp"
+            android:layout_height="200dp"
             android:layout_alignParentBottom="true">
         </RelativeLayout>