Merge pull request #19 from MJLblabla/main

升级sdk 修护bug 防反复进入崩溃
pili-engineering · Dec 23, 2021 · e9d1019 · e9d1019
2 parents 427f3d1 + bd7b291
commit e9d1019
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 7 deletions.
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.bin b/.gradle/6.7.1/executionHistory/executionHistory.bin
diff --git a/.gradle/6.7.1/executionHistory/executionHistory.lock b/.gradle/6.7.1/executionHistory/executionHistory.lock
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.bin b/.gradle/6.7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/6.7.1/javaCompile/classAnalysis.bin b/.gradle/6.7.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/6.7.1/javaCompile/javaCompile.lock b/.gradle/6.7.1/javaCompile/javaCompile.lock
diff --git a/.gradle/6.7.1/javaCompile/taskHistory.bin b/.gradle/6.7.1/javaCompile/taskHistory.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.idea/modules/app/WhiteBoard-SDK.app.iml b/.idea/modules/app/WhiteBoard-SDK.app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -101,7 +101,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.12.0'
     implementation("com.squareup.okhttp3:okhttp:4.8.1")
     implementation ('com.qiniu:happy-dns:0.2.17')
-    implementation (name:'qndroid-whiteboard-1.1.7',ext:"aar")
+    implementation (name:'qndroid-whiteboard-1.1.8',ext:"aar")
    // implementation project(":qiniuwhiteboard")
     implementation ('com.aliyun.dpa:oss-android-sdk:2.9.6')
     implementation 'cn.yipianfengye.android:zxing-library:2.2'

diff --git a/app/libs/qndroid-whiteboard-1.1.7.aar → app/libs/qndroid-whiteboard-1.1.8.aar b/app/libs/qndroid-whiteboard-1.1.7.aar → app/libs/qndroid-whiteboard-1.1.8.aar
diff --git a/app/src/main/res/layout/activity_room.xml b/app/src/main/res/layout/activity_room.xml
@@ -2,8 +2,6 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-
-
     <data>
         <import type="com.qiniu.droid.whiteboard.type.WidgetType" />
 
@@ -14,8 +12,6 @@
             type="com.qiniu.whiteboard.example.RoomViewModel" />
     </data>
 
-
-
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"