Skip to content

Commit de6907b

Browse files
alxgarcialxgarci
committed
+ funcionandoTodo
1 parent 8d02759 commit de6907b

File tree

5 files changed

+99
-23
lines changed

5 files changed

+99
-23
lines changed

‎pom.xml

+33-9
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<groupId>org.example</groupId>
88
<artifactId>ProyInformaticaBETA</artifactId>
99
<version>1.0-SNAPSHOT</version>
10+
<packaging>jar</packaging>
1011

1112
<name>ProyInformaticaBETA</name>
1213
<!-- FIXME change it to the project's website -->
@@ -23,7 +24,6 @@
2324
<groupId>junit</groupId>
2425
<artifactId>junit</artifactId>
2526
<version>4.11</version>
26-
<scope>test</scope>
2727
</dependency>
2828
<dependency>
2929
<!-- jsoup HTML parser library @ https://jsoup.org/ -->
@@ -32,15 +32,10 @@
3232
<version>1.14.3</version>
3333
</dependency>
3434
<dependency>
35-
<groupId>io.github.shashankn</groupId>
36-
<artifactId>qr-terminal</artifactId>
37-
<version>1.0.0</version>
35+
<groupId>com.google.zxing</groupId>
36+
<artifactId>core</artifactId>
37+
<version>3.3.0</version>
3838
</dependency>
39-
<dependency>
40-
<groupId>org.eclipse.jgit</groupId>
41-
<artifactId>org.eclipse.jgit</artifactId>
42-
<version>3.5.0.201409260305-r</version>
43-
</dependency>
4439
</dependencies>
4540

4641
<build>
@@ -65,13 +60,41 @@
6560
<version>2.22.1</version>
6661
</plugin>
6762
<!-- Plugin para compilar como jar, View->Tool Windows->Maven->package->Run MavenBuild -->
63+
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-assembly-plugin</artifactId>
67+
<version>3.3.0</version>
68+
<configuration>
69+
<archive>
70+
<manifest>
71+
<mainClass>org.example.mainMenu</mainClass>
72+
</manifest>
73+
</archive>
74+
<descriptorRefs>
75+
<descriptorRef>jar-with-dependencies</descriptorRef>
76+
</descriptorRefs>
77+
</configuration>
78+
<executions>
79+
<execution>
80+
<id>make-assembly</id>
81+
<phase>package</phase>
82+
<goals>
83+
<goal>single</goal>
84+
</goals>
85+
</execution>
86+
</executions>
87+
88+
</plugin>
89+
6890
<plugin>
6991
<artifactId>maven-jar-plugin</artifactId>
7092
<version>3.2.0</version>
7193
<configuration>
7294
<finalName>ProyInformaticaBETA</finalName>
7395
<archive>
7496
<manifest>
97+
<addClasspath>true</addClasspath>
7598
<mainClass>org.example.mainMenu</mainClass>
7699
</manifest>
77100
</archive>
@@ -94,6 +117,7 @@
94117
<artifactId>maven-project-info-reports-plugin</artifactId>
95118
<version>3.0.0</version>
96119
</plugin>
120+
97121
</plugins>
98122
</pluginManagement>
99123
</build>

‎src/main/java/org/example/interfaces/Admin.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public static void buscarPromociones() {
2525
for (Promo p : promos) {
2626
System.out.println(" " + p.toStringAdmin());
2727
}
28+
enterContinuar();
2829

2930
}
3031
public static void altaPromociones() {
@@ -66,10 +67,14 @@ public static void consultarLog() {
6667
} catch (IOException e) {
6768
e.printStackTrace();
6869
}
70+
enterContinuar();
71+
72+
}
73+
74+
public static void enterContinuar(){
6975
System.out.println("[SYSTEM] Pulsa ENTER para continuar");
7076
Scanner sc = new Scanner(System.in);
7177
sc.nextLine();
72-
7378
}
7479

7580
private static void promoDBWrite(File dbCsv, Promo promo) {

‎src/main/java/org/example/interfaces/User.java

+4-13
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.example.interfaces;
22

33
import com.google.zxing.WriterException;
4-
import io.github.shashankn.qrterminal.QRCode;
54
import org.example.App;
65
import org.example.mainMenu;
76
import org.example.obj.ItemListaCompra;
87
import org.example.obj.Product;
98
import org.example.obj.Promo;
9+
import org.example.tools.QRPrinter;
1010
import org.example.tools.WriteToLog;
1111

1212
import java.io.BufferedReader;
@@ -32,6 +32,7 @@ public static void buscarPromociones() {
3232
System.out.println(" [SYS] Codigo de promocion: " + p.getPromoCode());
3333
}
3434
}
35+
Admin.enterContinuar();
3536

3637
}
3738

@@ -67,18 +68,12 @@ public static void verListaDeLaCompra() {
6768
} else {
6869
System.out.println("[ERROR] Sin elementos en la lista de la compra");
6970
}
70-
71+
Admin.enterContinuar();
7172

7273
}
7374

7475
private static void qrPrinter(String code) {
75-
try {
76-
System.out.println(QRCode.from(code).generate());
77-
System.out.println(code);
78-
} catch (WriterException e) {
79-
e.printStackTrace();
80-
WriteToLog.writeLogFile("[ERROR] Creando QR con codigo " + code);
81-
}
76+
System.out.println(QRPrinter.getQr(code));
8277
}
8378

8479
public static ArrayList<Promo> getPromosMatching(File dbPromos, String promo) {
@@ -100,10 +95,6 @@ public static ArrayList<Promo> getPromosMatching(File dbPromos, String promo) {
10095
for (String string : set) {
10196
if (string.contains(promo)) {
10297
aux = Arrays.asList(string.split(Admin.PROMO_DATABASE_SEPARATOR));
103-
for (String a :
104-
aux) {
105-
System.out.println(a);
106-
}
10798
promosArray.add(new Promo(aux.get(0), aux.get(1), aux.get(2), aux.get(3), aux.get(4)));
10899
}
109100
}

‎src/main/java/org/example/tools/QRPrinter.java

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
package org.example.tools;
2+
3+
import com.google.zxing.BarcodeFormat;
4+
import com.google.zxing.EncodeHintType;
5+
import com.google.zxing.MultiFormatWriter;
6+
import com.google.zxing.WriterException;
7+
import com.google.zxing.common.BitMatrix;
8+
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
9+
10+
import java.util.Hashtable;
11+
12+
public class QRPrinter {
13+
14+
public static String getQr(String text) {
15+
String s = "Cant generate QR";
16+
int width = 40;
17+
int height = 40;
18+
Hashtable<EncodeHintType, Object> qrParam = new Hashtable<EncodeHintType, Object>();
19+
20+
qrParam.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.L);
21+
qrParam.put(EncodeHintType.CHARACTER_SET, "utf-8");
22+
BitMatrix bitMatrix = null;
23+
try {
24+
bitMatrix = new MultiFormatWriter().encode(text, BarcodeFormat.QR_CODE, width, height, qrParam);
25+
} catch (WriterException e) {
26+
e.printStackTrace();
27+
}
28+
s = toAscii(bitMatrix);
29+
30+
return s;
31+
}
32+
33+
public static String toAscii(BitMatrix bitMatrix) {
34+
StringBuilder sb = new StringBuilder();
35+
for (int rows = 0; rows < bitMatrix.getHeight(); rows++) {
36+
for (int cols = 0; cols < bitMatrix.getWidth(); cols++) {
37+
boolean x = bitMatrix.get(rows, cols);
38+
if (!x) {
39+
// white
40+
sb.append("\033[47m \033[0m");
41+
} else {
42+
sb.append("\033[40m \033[0m");
43+
}
44+
}
45+
sb.append("\n");
46+
}
47+
return sb.toString();
48+
}
49+
50+
public static void main(String[] args) throws Exception {
51+
String text = "https://github.com/zhangshanhai/java-qrcode-terminal ";
52+
53+
System.out.println(getQr(text));
54+
}
55+
56+
}

‎target/test-classes/org/example/AppTest.class

-469 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)