Merge branch 'private_beta'

Oliver-WJ · Oliver-WJ · commit bc18d8dc5c40 · 2024-01-25T17:09:59.000+08:00
# Conflicts:
#	OpenIM-SDK/libs/v3.5.1-alpha.7-e-v1.1.4.aar
diff --git a/OpenIM-SDK/src/main/java/io/openim/android/sdk/OpenIMClient.java b/OpenIM-SDK/src/main/java/io/openim/android/sdk/OpenIMClient.java
@@ -223,8 +223,8 @@ public void uploadFile(OnBase<String> base, OnPutFileListener listener,
      * @param base
      * @param params
      */
-    public void uploadLogs(OnBase<String> base, List<String> params, UploadLogProgress progress) {
-        Open_im_sdk.uploadLogs(BaseImpl.stringBase(base),ParamsUtil.buildOperationID(),progress);
+    public void uploadLogs(OnBase<String> base, List<String> params,String ex, UploadLogProgress progress) {
+        Open_im_sdk.uploadLogs(BaseImpl.stringBase(base),ParamsUtil.buildOperationID(),ex,progress);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -223,8 +223,8 @@ public void uploadFile(OnBase<String> base, OnPutFileListener listener,`
`223`	`223`	`* @param base`
`224`	`224`	`* @param params`
`225`	`225`	`*/`
`226`		`- public void uploadLogs(OnBase<String> base, List<String> params, UploadLogProgress progress) {`
`227`		`- Open_im_sdk.uploadLogs(BaseImpl.stringBase(base),ParamsUtil.buildOperationID(),progress);`
	`226`	`+ public void uploadLogs(OnBase<String> base, List<String> params,String ex, UploadLogProgress progress) {`
	`227`	`+ Open_im_sdk.uploadLogs(BaseImpl.stringBase(base),ParamsUtil.buildOperationID(),ex,progress);`
`228`	`228`	`}`
`229`	`229`
`230`	`230`