Merge pull request #61 from MJLblabla/dev

【bug修护】修护切换账号后群操作失败

app-sdk/depends_sdk_qnim/build.gradle

@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('qndroid-imsdk-1.0.9.aar'))
+artifacts.add("default", file('qndroid-imsdk-1.1.1.aar'))

app-sdk/qlive-sdk-uikit/build.gradle

@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('qlive-uikit-1.0.7.aar'))
+artifacts.add("default", file('qlive-uikit-1.0.8.aar'))

app-sdk/qlive-sdk/build.gradle

@@ -1,2 +1,2 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('qlive-sdk-1.0.7.aar'))
+artifacts.add("default", file('qlive-sdk-1.0.8.aar'))

app/src/main/AndroidManifest.xml

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.qlive.qnlivekit">
     <!-- 系统悬浮窗权限 -->
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.REORDER_TASKS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
+    <uses-permission android:name= "android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".App"

app/src/main/java/com/qlive/qnlivekit/App.kt

@@ -78,6 +78,7 @@ class App : Application() {
         LiveRecordListView.onClickFinishedRoomCall = { context, roomInfo ->
             DemoLiveFinishedActivity.checkStart(context, roomInfo)
         }
+
     }
 
     override fun onTrimMemory(level: Int) {

app/src/main/java/com/qlive/qnlivekit/MainActivity.kt

@@ -1,5 +1,6 @@
 package com.qlive.qnlivekit
 
+import android.Manifest
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.Typeface
@@ -21,6 +22,8 @@ import com.qlive.qnlivekit.databinding.ActivityMainBinding
 import com.qlive.qnlivekit.uitil.*
 import com.qlive.uikitcore.activity.BaseBindingActivity
 import com.qlive.uikitcore.dialog.LoadingDialog
+import com.qlive.uikitcore.ext.permission.PermissionAnywhere
+import com.qlive.uikitcore.ext.permission.PermissionCallback
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -34,6 +37,12 @@ import kotlin.coroutines.suspendCoroutine
 class MainActivity : BaseBindingActivity<ActivityMainBinding>() {
 
     override fun init() {
+        PermissionAnywhere.requestPermission(this, arrayOf(
+            Manifest.permission.READ_EXTERNAL_STORAGE,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+        )
+        ) { _, _, _ -> }
+
         //登陆按钮
         binding.btLoginLogin.setOnClickListener {
 

doc/sdkbuilder/build.gradle

@@ -66,8 +66,8 @@ android {
 fataar {
     transitive = true
 }
-def uikitversion = 'qlive-uikit-1.0.7'
-def qliveversion = 'qlive-sdk-1.0.7'
+def uikitversion = 'qlive-uikit-1.0.8'
+def qliveversion = 'qlive-sdk-1.0.8'
 
 task makeAAR(type: Copy) {
     def localProperties = new Properties()

liveroom-libs/comp_imadapter/src/main/java/com/qlive/qnim/QNIMAdapter.kt

@@ -147,17 +147,27 @@ class QNIMAdapter : RtmAdapter {
             QNIMClient.getUserManager()?.removeUserListener(mBMXUserServiceListener)
             QNIMClient.getChatManager()?.removeChatListener(mChatListener)
         }
+        QNIMClient.delete()
         QNIMClient.init(config)
         mContext = context
         isInit = true
         QNIMClient.getUserManager().addUserListener(mBMXUserServiceListener)
         QNIMClient.getChatManager().addChatListener(mChatListener)
     }
 
-    fun loginOut(callBack: BMXCallBack) {
-        QNIMClient.getUserManager().signOut {
-            isLogin = false
-            callBack.onResult(it)
+    private fun loginOut(callBack: BMXCallBack) {
+        if(loginImUid.isNotEmpty()){
+            QNIMClient.getUserManager().signOut(loginImUid.toLong()){
+                QNIMClient.getUserManager().signOut {
+                    isLogin = false
+                    callBack.onResult(it)
+                }
+            }
+        }else{
+            QNIMClient.getUserManager().signOut {
+                isLogin = false
+                callBack.onResult(it)
+            }
         }
     }
 

liveroom-libs/comp_imadapter/src/main/java/com/qlive/qnim/QNIMConfig.kt

@@ -1,6 +1,8 @@
 package com.qlive.qnim
 
 import android.content.Context
+import android.os.Build
+import android.os.Environment
 import com.qlive.liblog.QLiveLogUtil
 import im.floo.floolib.BMXClientType
 import im.floo.floolib.BMXLogLevel
@@ -12,17 +14,34 @@ import java.io.File
  *用户自定义im初始化
  */
 object QNIMConfig {
+    private fun getFilesPath(context: Context): String {
+        val filePath: String =
+            if ((Environment.MEDIA_MOUNTED == Environment.getExternalStorageState() || !Environment.isExternalStorageRemovable())
+            ) {
+                QLiveLogUtil.d("data_dir", "外部存储可用")
+                //外部存储可用
+                context.getExternalFilesDir(null)!!.path
+            } else {
+                QLiveLogUtil.d("data_dir", "外部存储不可用")
+                //外部存储不可用
+                context.filesDir.path
+
+            }
+        return filePath
+    }
+
     /**
      * 自定义初始化
      * 如果需要自定义初始化参数
      */
     var imSDKConfigGetter: (appId: String, context: Context) -> BMXSDKConfig =
         { appId: String, context: Context ->
-            val appPath = context.filesDir.path
+            val appPath = getFilesPath(context)
             val dataPath = File("$appPath/data_dir")
             val cachePath = File("$appPath/cache_dir")
             dataPath.mkdirs()
             cachePath.mkdirs()
+            QLiveLogUtil.d("data_dir", dataPath.absolutePath)
             // 配置sdk config
             BMXSDKConfig(
                 BMXClientType.Android, "1", dataPath.absolutePath,

qlivesdk/src/main/java/com/qlive/pushclient/QPusherClient.java

@@ -157,8 +157,17 @@ public interface QPusherClient extends QLiveClient {
      */
     void setDefaultBeauty(QBeautySetting beautySetting);
 
+    /**
+     * 耳返
+     * @param isEnable
+     */
     void enableEarMonitor(boolean isEnable);
     boolean isEarMonitorEnable();
+
+    /**
+     * 音量大小
+     * @param volume
+     */
     void setMicrophoneVolume(double volume);
     double getMicrophoneVolume();
 }