Huis Verkennen Help
Registreer Inloggen
chengzhenyu
/
lensman
Volgen 1
Ster 0
Vork 0

Bladeren bron
解决重复问题

ffib 6 jaren geleden
bovenliggende
81f5835a44
commit
d7a4b811bf
10 gewijzigde bestanden met toevoegingen van 32 en 14 verwijderingen
Toon Diff Stats
  1. BIN
      .idea/caches/gradle_models.ser
  2. 3 0
      .idea/gradle.xml
  3. 14 3
      .idea/misc.xml
  4. 0 1
      .idea/modules.xml
  5. 1 1
      .idea/vcs.xml
  6. 4 3
      app/build.gradle
  7. 1 0
      app/guanwang/release/output.json
  8. 4 2
      app/src/main/java/ai/pai/lensman/dslr/CameraService.java
  9. 3 2
      build.gradle
  10. 2 2
      gradle/wrapper/gradle-wrapper.properties

BIN
.idea/caches/gradle_models.ser
Bestand weergeven


+ 3 - 0
.idea/gradle.xml
Bestand weergeven 

@@ -3,6 +3,9 @@
3 3 
   <component name="GradleSettings">
4 4 
     <option name="linkedExternalProjectsSettings">
5 5 
       <GradleProjectSettings>
6 
+        <compositeConfiguration>
7 
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
8 
+        </compositeConfiguration>
6 9 
         <option name="distributionType" value="LOCAL" />
7 10 
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
8 11 
         <option name="gradleHome" value="C:/Android/gradle-3.5" />

+ 14 - 3
.idea/misc.xml
Bestand weergeven 

@@ -5,26 +5,37 @@
5 5 
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
6 6 
     <option name="myNullables">
7 7 
       <value>
8 
-        <list size="4">
8 
+        <list size="10">
9 9 
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
10 10 
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
11 11 
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
12 12 
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
13 
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
14 
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
15 
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
16 
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
17 
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
18 
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
13 19 
         </list>
14 20 
       </value>
15 21 
     </option>
16 22 
     <option name="myNotNulls">
17 23 
       <value>
18 
-        <list size="4">
24 
+        <list size="9">
19 25 
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
20 26 
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
21 27 
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
22 28 
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
29 
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
30 
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
31 
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
32 
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
33 
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
23 34 
         </list>
24 35 
       </value>
25 36 
     </option>
26 37 
   </component>
27 
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
38 
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
28 39 
     <output url="file://$PROJECT_DIR$/build/classes" />
29 40 
   </component>
30 41 
   <component name="ProjectType">

+ 0 - 1
.idea/modules.xml
Bestand weergeven 

@@ -5,7 +5,6 @@
5 5 
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
6 6 
       <module fileurl="file://$PROJECT_DIR$/common/common.iml" filepath="$PROJECT_DIR$/common/common.iml" />
7 7 
       <module fileurl="file://$PROJECT_DIR$/lensman.iml" filepath="$PROJECT_DIR$/lensman.iml" />
8 
-      <module fileurl="file://$PROJECT_DIR$/lensman_ssh.iml" filepath="$PROJECT_DIR$/lensman_ssh.iml" />
9 8 
       <module fileurl="file://$PROJECT_DIR$/ryc/ryc.iml" filepath="$PROJECT_DIR$/ryc/ryc.iml" />
10 9 
       <module fileurl="file://$PROJECT_DIR$/views/views.iml" filepath="$PROJECT_DIR$/views/views.iml" />
11 10 
     </modules>

+ 1 - 1
.idea/vcs.xml
Bestand weergeven 

@@ -1,6 +1,6 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 2 
 <project version="4">
3 3 
   <component name="VcsDirectoryMappings">
4 
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
4 
+    <mapping directory="" vcs="Git" />
5 5 
   </component>
6 6 
 </project>

+ 4 - 3
app/build.gradle
Bestand weergeven 

@@ -1,5 +1,5 @@
1 1 
 apply plugin: 'com.android.application'
2 
-apply plugin: 'android-apt'
2 
+//apply plugin: 'android-apt'
3 3
4 4 
 android {
5 5 
     compileSdkVersion COMPILE_SDK_VERSION as int
 
@@ -36,6 +36,7 @@ android {
36 36 
         }
37 37 
     }
38 38
39 
+    flavorDimensions "default"
39 40 
     productFlavors.all {
40 41 
         flavor->flavor.manifestPlaceholders=[CHANNEL_NAME:name]
41 42 
     }
 
@@ -79,10 +80,10 @@ android {
79 80 
 dependencies {
80 81 
     compile project(path: ':common')
81 82 
     compile project(path: ':views')
82 
-    compile project(path: ':ryc')
83 
+    implementation project(path: ':ryc', configuration: 'default')
83 84 
     compile fileTree(include: ['*.jar'], dir: 'libs')
84 85 
     compile 'com.jakewharton:butterknife:8.2.1'
85 
-    apt 'com.jakewharton:butterknife-compiler:8.2.1'
86 
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.2.1'
86 87 
     compile 'com.google.code.gson:gson:2.7'
87 88 
     compile files('libs/universal-image-loader-1.9.4.jar')
88 89 
     compile files('libs/commons-lang-2.6.jar')

+ 1 - 0
app/guanwang/release/output.json
Bestand weergeven 

@@ -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":{}}]

+ 4 - 2
app/src/main/java/ai/pai/lensman/dslr/CameraService.java
Bestand weergeven 

@@ -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);

+ 3 - 2
build.gradle
Bestand weergeven 

@@ -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 
     }

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties
Bestand weergeven 

@@ -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