+ flavorDimensions "default"
productFlavors.all {
flavor->flavor.manifestPlaceholders=[CHANNEL_NAME:name]
}
@@ -79,10 +80,10 @@ android {
dependencies {
compile project(path: ':common')
compile project(path: ':views')
- compile project(path: ':ryc')
+ implementation project(path: ':ryc', configuration: 'default')
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.jakewharton:butterknife:8.2.1'
- apt 'com.jakewharton:butterknife-compiler:8.2.1'
+ annotationProcessor 'com.jakewharton:butterknife-compiler:8.2.1'
compile 'com.google.code.gson:gson:2.7'
compile files('libs/universal-image-loader-1.9.4.jar')
compile files('libs/commons-lang-2.6.jar')
@@ -0,0 +1 @@ |
||
| 1 |
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1040,"versionName":"1.0.40","enabled":true,"outputFile":"app-guanwang-release.apk","fullName":"guanwangRelease","baseName":"guanwang-release"},"path":"app-guanwang-release.apk","properties":{}}]
|
@@ -21,7 +21,9 @@ import com.remoteyourcam.usb.ptp.model.ObjectInfo; |
||
| 21 | 21 |
|
| 22 | 22 |
import java.io.File; |
| 23 | 23 |
import java.io.FileOutputStream; |
| 24 |
+import java.text.SimpleDateFormat; |
|
| 24 | 25 |
import java.util.ArrayList; |
| 26 |
+import java.util.Date; |
|
| 25 | 27 |
|
| 26 | 28 |
import ai.pai.lensman.db.Preferences; |
| 27 | 29 |
|
@@ -123,7 +125,7 @@ public class CameraService extends Service implements Handler.Callback, Camera.C |
||
| 123 | 125 |
public void startCapture() {
|
| 124 | 126 |
stopCapture(); |
| 125 | 127 |
mainHandler.sendEmptyMessage(MSG_CHECK_STORAGE); |
| 126 |
- camera.capture(); |
|
| 128 |
+// camera.capture(); |
|
| 127 | 129 |
} |
| 128 | 130 |
|
| 129 | 131 |
public void stopCapture() {
|
@@ -341,7 +343,7 @@ public class CameraService extends Service implements Handler.Callback, Camera.C |
||
| 341 | 343 |
if(!dir.exists()){
|
| 342 | 344 |
dir.mkdir(); |
| 343 | 345 |
} |
| 344 |
- filename = handle +".jpg"; |
|
| 346 |
+ filename = new Date().getTime() +".jpg"; |
|
| 345 | 347 |
File file = new File(dir,filename); |
| 346 | 348 |
FileOutputStream fos = new FileOutputStream(file); |
| 347 | 349 |
bitmap.compress(Bitmap.CompressFormat.JPEG,100,fos); |
@@ -7,10 +7,11 @@ buildscript {
|
||
| 7 | 7 |
maven {
|
| 8 | 8 |
url 'https://maven.google.com' |
| 9 | 9 |
} |
| 10 |
+ google() |
|
| 10 | 11 |
} |
| 11 | 12 |
dependencies {
|
| 12 |
- classpath 'com.android.tools.build:gradle:2.3.3' |
|
| 13 |
- classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' |
|
| 13 |
+ classpath 'com.android.tools.build:gradle:3.4.1' |
|
| 14 |
+// classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' |
|
| 14 | 15 |
// NOTE: Do not place your application dependencies here; they belong |
| 15 | 16 |
// in the individual module build.gradle files |
| 16 | 17 |
} |
@@ -1,6 +1,6 @@ |
||
| 1 |
-#Sun Mar 05 10:19:46 CST 2017 |
|
| 1 |
+#Sun Jun 16 10:56:07 CST 2019 |
|
| 2 | 2 |
distributionBase=GRADLE_USER_HOME |
| 3 | 3 |
distributionPath=wrapper/dists |
| 4 | 4 |
zipStoreBase=GRADLE_USER_HOME |
| 5 | 5 |
zipStorePath=wrapper/dists |
| 6 |
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip |
|
| 6 |
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip |