添加素材

MaZhengKe · Mar 11, 2019 · b680bb9 · b680bb9
1 parent bb5391d
commit b680bb9
Show file tree

Hide file tree

Showing 54 changed files with 128 additions and 1,972 deletions.
diff --git a/pic/1m.png b/pic/1m.png
diff --git a/pic/1p.png b/pic/1p.png
diff --git a/pic/1s.png b/pic/1s.png
diff --git a/pic/1z.png b/pic/1z.png
diff --git a/pic/2m.png b/pic/2m.png
diff --git a/pic/2p.png b/pic/2p.png
diff --git a/pic/2s.png b/pic/2s.png
diff --git a/pic/2z.png b/pic/2z.png
diff --git a/pic/3m.png b/pic/3m.png
diff --git a/pic/3p.png b/pic/3p.png
diff --git a/pic/3s.png b/pic/3s.png
diff --git a/pic/3z.png b/pic/3z.png
diff --git a/pic/4m.png b/pic/4m.png
diff --git a/pic/4p.png b/pic/4p.png
diff --git a/pic/4s.png b/pic/4s.png
diff --git a/pic/4z.png b/pic/4z.png
diff --git a/pic/5m.png b/pic/5m.png
diff --git a/pic/5p.png b/pic/5p.png
diff --git a/pic/5s.png b/pic/5s.png
diff --git a/pic/5z.png b/pic/5z.png
diff --git a/pic/6m.png b/pic/6m.png
diff --git a/pic/6p.png b/pic/6p.png
diff --git a/pic/6s.png b/pic/6s.png
diff --git a/pic/6z.png b/pic/6z.png
diff --git a/pic/7m.png b/pic/7m.png
diff --git a/pic/7p.png b/pic/7p.png
diff --git a/pic/7s.png b/pic/7s.png
diff --git a/pic/7z.png b/pic/7z.png
diff --git a/pic/8m.png b/pic/8m.png
diff --git a/pic/8p.png b/pic/8p.png
diff --git a/pic/8s.png b/pic/8s.png
diff --git a/pic/9m.png b/pic/9m.png
diff --git a/pic/9p.png b/pic/9p.png
diff --git a/pic/9s.png b/pic/9s.png
diff --git a/pic/hu.png b/pic/hu.png
diff --git a/pic/lizhi.png b/pic/lizhi.png
diff --git a/pic/over.png b/pic/over.png
diff --git a/pic/s5m.png b/pic/s5m.png
diff --git a/pic/s5p.png b/pic/s5p.png
diff --git a/pic/s5s.png b/pic/s5s.png
diff --git a/pom.xml b/pom.xml
@@ -33,6 +33,7 @@
         <dependency>
             <groupId>opencv</groupId>
             <artifactId>opencv</artifactId>
+            <version>3.4.1</version>
             <scope>system</scope>
             <systemPath>${basedir}/lib/opencv-341.jar</systemPath>
         </dependency>

diff --git a/src/main/java/com/mk/Image.java b/src/main/java/com/mk/Image.java
diff --git a/src/main/java/com/mk/Main.java b/src/main/java/com/mk/Main.java
@@ -1,14 +1,10 @@
 package com.mk;
 
-import com.mk.util.Shoupai;
 
-import java.util.ArrayList;
+import com.mk.util.CaptureScreen;
 
 public class Main {
     public static void main(String [] args){
-        long now =System.currentTimeMillis();
-        Shoupai shoupai = new Shoupai("1468m24667889p1s1z");
-        System.out.println(shoupai.getRes());
-        System.out.println(System.currentTimeMillis() - now);
+        CaptureScreen.main(args);
     }
 }
diff --git a/src/main/java/com/mk/Pai.java b/src/main/java/com/mk/Pai.java