Merge pull request #44 from MJLblabla/main

MJLblabla · web-flow · commit 1adc01c0078b · 2022-12-03T16:15:19.000+08:00
sdk 切换java8编译
diff --git a/app-sdk/qlive-sdk-uikit/qlive-uikit-1.0.5.aar b/app-sdk/qlive-sdk-uikit/qlive-uikit-1.0.5.aar
diff --git a/app-sdk/qlive-sdk/qlive-sdk-1.0.5.aar b/app-sdk/qlive-sdk/qlive-sdk-1.0.5.aar
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
diff --git a/doc/sdkbuilder/build.gradle b/doc/sdkbuilder/build.gradle
@@ -27,8 +27,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-core/build.gradle b/liveroom-core/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-libs/comp_imadapter/build.gradle b/liveroom-libs/comp_imadapter/build.gradle
@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-libs/comp_imadapter/src/main/java/com/qlive/qnim/QNIMAdapter.kt b/liveroom-libs/comp_imadapter/src/main/java/com/qlive/qnim/QNIMAdapter.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import com.qlive.rtm.RtmCallBack
 import com.qlive.rtm.RtmAdapter
 import com.qiniu.droid.imsdk.QNIMClient
+import com.qlive.liblog.QLiveLogUtil
 import com.qlive.rtm.RtmDadaCallBack
 import com.qlive.rtm.msg.TextMsg
 import im.floo.BMXCallBack
@@ -345,13 +346,20 @@ class QNIMAdapter : RtmAdapter {
                 )
                 return@openConversation
             }
-            QNIMClient.getChatManager().retrieveHistoryMessages(p1,refMsgId, size.toLong()) { code, msgList ->
+            val lastId = if(refMsgId==-1L){
+               // p1.lastMsg().msgId()
+                refMsgId
+            }else{
+                refMsgId
+            }
+            QLiveLogUtil.d("getHistoryTextMsg", "  p1.lastMsg().msgId() $lastId")
+            QNIMClient.getChatManager().retrieveHistoryMessages(p1,lastId, size.toLong()) { code, msgList ->
                 if (code != BMXErrorCode.NoError) {
                     call.onFailure(code.swigValue(), code.name)
                     return@retrieveHistoryMessages
                 }
                 val textMsgList = LinkedList<TextMsg>()
-
+                QLiveLogUtil.d("getHistoryTextMsg", " msgList.size()() ${msgList.size()}")
                 for (i in 0 until msgList.size()) {
                     val message = msgList.get(i.toInt())
                     val targetId = message.toId().toString()
diff --git a/liveroom-libs/comp_player/build.gradle b/liveroom-libs/comp_player/build.gradle
@@ -23,8 +23,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-libs/comp_rtclive/build.gradle b/liveroom-libs/comp_rtclive/build.gradle
@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-libs/comp_rtm/build.gradle b/liveroom-libs/comp_rtm/build.gradle
@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-libs/lib_json/build.gradle b/liveroom-libs/lib_json/build.gradle
@@ -22,8 +22,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-libs/lib_log/build.gradle b/liveroom-libs/lib_log/build.gradle
@@ -22,8 +22,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-libs/sensehook/build.gradle b/liveroom-libs/sensehook/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/chatservice/build.gradle b/liveroom-service/chatservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/danmakuservice/build.gradle b/liveroom-service/danmakuservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/giftservice/build.gradle b/liveroom-service/giftservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/ktvservice/build.gradle b/liveroom-service/ktvservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/likeservice/build.gradle b/liveroom-service/likeservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/linkmicservice/build.gradle b/liveroom-service/linkmicservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/pkservice/build.gradle b/liveroom-service/pkservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/publicchatservice/build.gradle b/liveroom-service/publicchatservice/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/roomservice/build.gradle b/liveroom-service/roomservice/build.gradle
@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-service/shoppingservice/build.gradle b/liveroom-service/shoppingservice/build.gradle
@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/liveroom-uikit-core/build.gradle b/liveroom-uikit-core/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-beauty/build.gradle b/qlive-uicomponnets/uikit-beauty/build.gradle
@@ -21,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-danmaku/build.gradle b/qlive-uicomponnets/uikit-danmaku/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-gift/build.gradle b/qlive-uicomponnets/uikit-gift/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-like/build.gradle b/qlive-uicomponnets/uikit-like/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-linkmic/build.gradle b/qlive-uicomponnets/uikit-linkmic/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-pk/build.gradle b/qlive-uicomponnets/uikit-pk/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-publicchat/build.gradle b/qlive-uicomponnets/uikit-publicchat/build.gradle
@@ -20,8 +20,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'
diff --git a/qlive-uicomponnets/uikit-publicchat/src/main/java/com/qlive/uikitpublicchat/PublicChatView.kt b/qlive-uicomponnets/uikit-publicchat/src/main/java/com/qlive/uikitpublicchat/PublicChatView.kt
diff --git a/qlive-uicomponnets/uikit-shopping/build.gradle b/qlive-uicomponnets/uikit-shopping/build.gradle
diff --git a/qlive-uicomponnets/uikit-user/build.gradle b/qlive-uicomponnets/uikit-user/build.gradle
diff --git a/qlive-uicomponnets/uikitktv/build.gradle b/qlive-uicomponnets/uikitktv/build.gradle
diff --git a/qlive-uicomponnets/uiwidget-input/build.gradle b/qlive-uicomponnets/uiwidget-input/build.gradle
diff --git a/qlive-uikit/build.gradle b/qlive-uikit/build.gradle
diff --git a/qlivesdk/build.gradle b/qlivesdk/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ android {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`compileOptions {`
`31`		`- sourceCompatibility JavaVersion.VERSION_11`
`32`		`- targetCompatibility JavaVersion.VERSION_11`
	`31`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`32`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ android {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`compileOptions {`
`30`		`- sourceCompatibility JavaVersion.VERSION_11`
`31`		`- targetCompatibility JavaVersion.VERSION_11`
	`30`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`31`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`32`	`32`	`}`
`33`	`33`	`kotlinOptions {`
`34`	`34`	`jvmTarget = '1.8'`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ android {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`compileOptions {`
`23`		`- sourceCompatibility JavaVersion.VERSION_11`
`24`		`- targetCompatibility JavaVersion.VERSION_11`
	`23`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`24`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`25`	`25`	`}`
`26`	`26`	`kotlinOptions {`
`27`	`27`	`jvmTarget = '1.8'`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ android {`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`	`compileOptions {`
`24`		`- sourceCompatibility JavaVersion.VERSION_11`
`25`		`- targetCompatibility JavaVersion.VERSION_11`
	`24`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`25`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`26`	`26`	`}`
`27`	`27`	`kotlinOptions {`
`28`	`28`	`jvmTarget = '1.8'`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@ android {`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`compileOptions {`
`26`		`- sourceCompatibility JavaVersion.VERSION_11`
`27`		`- targetCompatibility JavaVersion.VERSION_11`
	`26`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`27`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`28`	`28`	`}`
`29`	`29`	`kotlinOptions {`
`30`	`30`	`jvmTarget = '1.8'`