mtfos/ble-android-demo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修正addHR文字大小問題

Browse Source
This commit is contained in:
Jay 2017-09-03 10:34:04 +08:00
parent 41d7a1c4a3
commit 2197e6ab98
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/modules.xml
View File

@ -3,9 +3,10 @@
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://D:\Project\ble-android-demo\BTDemo.iml" filepath="D:\Project\ble-android-demo\BTDemo.iml" /> <module fileurl="file://D:\Project\ble-android-demo\BTDemo.iml" filepath="D:\Project\ble-android-demo\BTDemo.iml" />
<module fileurl="file://$PROJECT_DIR$/BTDemo.iml" filepath="$PROJECT_DIR$/BTDemo.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://D:\Project\ble-android-demo\app\app.iml" filepath="D:\Project\ble-android-demo\app\app.iml" />
<module fileurl="file://$PROJECT_DIR$/ble-android-demo.iml" filepath="$PROJECT_DIR$/ble-android-demo.iml" /> <module fileurl="file://$PROJECT_DIR$/ble-android-demo.iml" filepath="$PROJECT_DIR$/ble-android-demo.iml" />
<module fileurl="file://D:\Project\ble-android-demo\ble-android-demo.iml" filepath="D:\Project\ble-android-demo\ble-android-demo.iml" />
</modules> </modules>
</component> </component>
</project> </project>

13
app/src/main/java/xyz/mtfos/btdemo/PrinterBle.java
View File

@ -59,6 +59,8 @@ public class PrinterBle {
final public static int ALIGN_RIGHT = 0x02; final public static int ALIGN_RIGHT = 0x02;
private int lastAlign = 0x00; private int lastAlign = 0x00;
private int lastWidth = 1;
private int lastHeigh = 1;
// 藍芽狀態 // 藍芽狀態
public int mState = 0x00; public int mState = 0x00;
@ -412,20 +414,29 @@ public class PrinterBle {
public PrinterBle setSize(int w, int h) { public PrinterBle setSize(int w, int h) {
if (w < 1 || h < 1 || w > 3 || h > 3) return this; if (w < 1 || h < 1 || w > 3 || h > 3) return this;
lastWidth = w;
lastHeigh = h;
return addText(String.format("__&s%d,%d__", w, h)); return addText(String.format("__&s%d,%d__", w, h));
} }
public PrinterBle addHR() { public PrinterBle addHR() {
int align = this.lastAlign; int align = this.lastAlign;
int w = lastWidth;
int h = lastHeigh;
setAlign(ALIGN_CENTER); setAlign(ALIGN_CENTER);
resetSize();
textNewLine(); textNewLine();
addTextln(StringUtils.repeat('-', 20)); addTextln(StringUtils.repeat('-', 20));
setAlign(align); setAlign(align);
setSize(w, h);
return this; return this;
} }
public void resetSize() { public PrinterBle resetSize() {
lastHeigh = 1;
lastWidth = 1;
setSize(1, 1); setSize(1, 1);
return this;
} }
public ArrayList<String> getDataQueue() { public ArrayList<String> getDataQueue() {

2
build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.0-beta2' classpath 'com.android.tools.build:gradle:3.0.0-beta4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Aug 07 11:04:39 CST 2017 #Sun Sep 03 09:43:10 CST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip