更新

cleven1 · Apr 9, 2019 · dba1692 · dba1692
1 parent 8e4910c
commit dba1692
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 65 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/AndroidAudioConverter_lib/build.gradle b/AndroidAudioConverter_lib/build.gradle
@@ -20,5 +20,5 @@ android {
 }
 
 dependencies {
-    compile 'com.github.adrielcafe:ffmpeg-android-java:2a627f6ecd@aar'
+    implementation 'com.github.adrielcafe:ffmpeg-android-java:2a627f6ecd@aar'
 }
diff --git a/LQRAudioRecord_library/build.gradle b/LQRAudioRecord_library/build.gradle
@@ -24,11 +24,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
 //        exclude group: 'com.android.support', module: 'support-annotations'
 //    })
-    compile 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
 //    testCompile 'junit:junit:4.12'
 }
 

diff --git a/LQRImagePicker_library/build.gradle b/LQRImagePicker_library/build.gradle
@@ -31,13 +31,13 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
 //        exclude group: 'com.android.support', module: 'support-annotations'
 //    })
-    compile 'com.android.support:appcompat-v7:27.1.1'
-    compile 'com.github.chrisbanes.photoview:library:1.2.4'
-    testCompile 'junit:junit:4.12'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.github.chrisbanes.photoview:library:1.2.4'
+    testImplementation 'junit:junit:4.12'
 }
 
 ////项目主页

diff --git a/WaveSideBar_app/build.gradle b/WaveSideBar_app/build.gradle
@@ -20,13 +20,13 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
 //        exclude group: 'com.android.support', module: 'support-annotations'
 //    })
-    compile 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
 //    testCompile 'junit:junit:4.12'
-    compile project(':WaveSideBar_library')
-    compile 'com.android.support:recyclerview-v7:27.1.1'
-    compile 'com.android.support:design:27.1.1'
+    implementation project(':WaveSideBar_library')
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
 }
diff --git a/WaveSideBar_library/build.gradle b/WaveSideBar_library/build.gradle
@@ -25,11 +25,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 //    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
 //        exclude group: 'com.android.support', module: 'support-annotations'
 //    })
-    compile 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
 //    testCompile 'junit:junit:4.12'
 }
 

diff --git a/XhsEmoticonsKeyboard_library/build.gradle b/XhsEmoticonsKeyboard_library/build.gradle
@@ -20,5 +20,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -49,30 +49,30 @@ dependencies {
     }
     implementation 'com.android.support:recyclerview-v7:27.1.1'
     /// 网络请求库
-    compile 'com.lzy.net:okgo:3.0.4'
+    implementation 'com.lzy.net:okgo:3.0.4'
     /// 布局适配
     implementation 'me.jessyan:autosize:1.1.1'
-    compile 'com.github.w446108264:AndroidEmoji:1.0.0'
+    implementation 'com.github.w446108264:AndroidEmoji:1.0.0'
     /// 图片加载
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
     implementation 'com.github.bumptech.glide:okhttp3-integration:4.8.0'
     /// HUD
     implementation 'com.kaopiz:kprogresshud:1.2.0'
     /// json解析
-    compile 'com.alibaba:fastjson:1.1.70.android'
+    implementation 'com.alibaba:fastjson:1.1.70.android'
     /// titleBar
-    compile 'com.wuhenzhizao:titlebar:1.1.3'
+    implementation 'com.wuhenzhizao:titlebar:1.1.3'
     /// emptyView
-    compile 'com.github.nukc.stateview:library:1.5.4'
+    implementation 'com.github.nukc.stateview:library:1.5.4'
     // animator providers
-    compile 'com.github.nukc.stateview:animations:1.0.1'
+    implementation 'com.github.nukc.stateview:animations:1.0.1'
     ///图片浏览
     implementation 'com.github.SherlockGougou:BigImageViewPager:v4_3.1.0'
-    compile('org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2') {
+    implementation('org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2') {
         exclude module: 'support-v4'
     }
-    compile('org.eclipse.paho:org.eclipse.paho.android.service:1.0.2') {
+    implementation('org.eclipse.paho:org.eclipse.paho.android.service:1.0.2') {
         exclude module: 'support-v4'
     }
     implementation project(':easypermissions')

diff --git a/...uild/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar b/...uild/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar
diff --git a/easypermissions/build/intermediates/incremental/debug-mergeJniLibs/merge-state b/easypermissions/build/intermediates/incremental/debug-mergeJniLibs/merge-state
diff --git a/easypermissions/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/easypermissions/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/debug/jniLibs"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/debug/jniLibs"/></dataSet></merger>
diff --git a/easypermissions/build/intermediates/incremental/mergeDebugShaders/merger.xml b/easypermissions/build/intermediates/incremental/mergeDebugShaders/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/debug/shaders"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/debug/shaders"/></dataSet></merger>
diff --git a/easypermissions/build/intermediates/incremental/packageDebugAssets/merger.xml b/easypermissions/build/intermediates/incremental/packageDebugAssets/merger.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/assets"/><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/debug/assets"/></dataSet></merger>
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/assets"/><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/build/intermediates/shader_assets/debug/compileDebugShaders/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/debug/assets"/></dataSet></merger>
diff --git a/...issions/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/...issions/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Tue Apr 02 18:40:38 CST 2019
+#Tue Apr 09 15:50:31 CST 2019
diff --git a/easypermissions/build/intermediates/incremental/packageDebugResources/merger.xml b/easypermissions/build/intermediates/incremental/packageDebugResources/merger.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/res"/><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/build/generated/res/rs/debug"/><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/res"><file path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/res/values/colors.xml" qualifiers=""><color name="colorPrimary">#ff212121</color><color name="colorPrimaryDark">@android:color/black</color><color name="colorAccent">#ff80cbc4</color></file><file path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/res/values/styles.xml" qualifiers=""><style name="EasyPermissions" parent="Theme.AppCompat.DayNight.DarkActionBar">
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/res"/><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/build/generated/res/rs/debug"/><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/res"><file path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/res/values/colors.xml" qualifiers=""><color name="colorPrimary">#ff212121</color><color name="colorPrimaryDark">@android:color/black</color><color name="colorAccent">#ff80cbc4</color></file><file path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/res/values/styles.xml" qualifiers=""><style name="EasyPermissions" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -10,7 +10,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:backgroundDimEnabled">false</item>
-    </style></file><file path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/main/res/values/strings.xml" qualifiers=""><string name="rationale_ask">This app may not work correctly without the requested permissions.</string><string name="rationale_ask_again">
+    </style></file><file path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/main/res/values/strings.xml" qualifiers=""><string name="rationale_ask">This app may not work correctly without the requested permissions.</string><string name="rationale_ask_again">
         This app may not work correctly without the requested permissions.
         Open the app settings screen to modify app permissions.
-    </string><string name="title_settings_dialog">Permissions Required</string></file></source><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/build/generated/res/rs/debug"/><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/fultterTest/CLChat/easypermissions/src/debug/res"/></dataSet><mergedItems/></merger>
+    </string><string name="title_settings_dialog">Permissions Required</string></file></source><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/build/generated/res/rs/debug"/><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/cleven/Desktop/android_fultter/CLChat-Android/easypermissions/src/debug/res"/></dataSet><mergedItems/></merger>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#Tue Apr 02 18:40:38 CST 2019
		#Tue Apr 09 15:50:31 CST 2019