Bläddra i källkod

升级版本号

songw 5 månader sedan
förälder
incheckning
a311becd96

+ 1 - 0
app/src/main/java/com/uas/hystorage/util/PrintUtils.java

@@ -40,6 +40,7 @@ public class PrintUtils {
             //la_h    横向分辨率
             //la_h    横向分辨率
             //la_y   纵向分辨率
             //la_y   纵向分辨率
             //la_height  最大高度
             //la_height  最大高度
+            //la_qty 重复打印次数
             int la_offset = FastjsonUtil.getInt(templateObj, "LA_OFFSET") == 0 ? 6 : FastjsonUtil.getInt(templateObj, "LA_OFFSET");
             int la_offset = FastjsonUtil.getInt(templateObj, "LA_OFFSET") == 0 ? 6 : FastjsonUtil.getInt(templateObj, "LA_OFFSET");
             int la_h = FastjsonUtil.getInt(templateObj, "LA_H") == 0 ? 400 : FastjsonUtil.getInt(templateObj, "LA_H");
             int la_h = FastjsonUtil.getInt(templateObj, "LA_H") == 0 ? 400 : FastjsonUtil.getInt(templateObj, "LA_H");
             int la_y = FastjsonUtil.getInt(templateObj, "LA_Y") == 0 ? 800 : FastjsonUtil.getInt(templateObj, "LA_Y");
             int la_y = FastjsonUtil.getInt(templateObj, "LA_Y") == 0 ? 800 : FastjsonUtil.getInt(templateObj, "LA_Y");

+ 0 - 6
app/src/main/res/layout/fra_report_page.xml

@@ -65,7 +65,6 @@
 
 
             </LinearLayout>
             </LinearLayout>
 
 
-
             <TextView
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
@@ -78,7 +77,6 @@
                 android:id="@+id/rv_qc_fujian"
                 android:id="@+id/rv_qc_fujian"
                 android:layout_width="match_parent"
                 android:layout_width="match_parent"
                 android:layout_height="80dp"
                 android:layout_height="80dp"
-
                 />
                 />
 
 
             <ImageView
             <ImageView
@@ -158,7 +156,6 @@
                 android:textColor="@color/red"
                 android:textColor="@color/red"
                 />
                 />
 
 
-
             <Button
             <Button
                 android:layout_marginTop="10dp"
                 android:layout_marginTop="10dp"
                 android:id="@+id/bt_gengxin"
                 android:id="@+id/bt_gengxin"
@@ -170,9 +167,6 @@
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentBottom="true"
                 android:text="更新" />
                 android:text="更新" />
 
 
-
-
-
         </LinearLayout>
         </LinearLayout>
 
 
     </android.support.v4.widget.NestedScrollView>
     </android.support.v4.widget.NestedScrollView>

+ 2 - 2
build.gradle

@@ -58,8 +58,8 @@ ext {
             targetSdkVersion : 28,
             targetSdkVersion : 28,
             compileSdkVersion: 28,
             compileSdkVersion: 28,
             buildToolsVersion: "28.0.3",
             buildToolsVersion: "28.0.3",
-            versionCode      : 35,
-            versionName      : "v1.2.5"
+            versionCode      : 36,
+            versionName      : "v1.2.6"
     ]
     ]
 
 
     depsVersion = [
     depsVersion = [