yinds vor 6 Tagen
Ursprung
Commit
ebe861eab8

+ 30 - 21
app/src/main/java/com/hw/nativeapp/config/exceptions/CrashHandler.java

@@ -1,15 +1,22 @@
 package com.hw.nativeapp.config.exceptions;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.Environment;
 import android.os.Process;
+import android.provider.Settings;
 import android.util.Log;
 
+import com.alibaba.fastjson.JSONObject;
+import com.hw.nativeapp.MApplication;
+import com.hw.nativeapp.httpnet.ErrorConsumer;
+import com.hw.nativeapp.httpnet.ResponseConsumer;
 import com.hw.nativeapp.utils.DateUtils;
 import com.hw.nativeapp.utils.LogUtils;
+import com.hw.nativeapp.utils.RxUtil;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -141,26 +148,28 @@ public class CrashHandler implements Thread.UncaughtExceptionHandler{
         sb.append("</body>").append("</html>");
 
         LogUtils.d("aleyds->" + sb.toString());
-//        OKHttpUtils.newBuilder().url("http://172.16.90.39:5003/email/send")
-//                .postJson()
-//                .addParam("subject", "APP异常:" + DateUtils.getDateString(new Date(), "yyyy-MM-dd HH:mm:ss"))
-//                .addParam("contnet", sb.toString())
-//                .addParam("to", "237836617@qq.com")
-//                .build()
-//                .enqueue(new OKHttpCallBack<JSONObject>() {
-//                    @Override
-//                    public void onSuccess(JSONObject res) {
-//                    }
-//
-//                    @Override
-//                    public void onError(int code) {
-//                        LogUtils.d("aleyds->错误:" + code );
-//                    }
-//
-//                    @Override
-//                    public void onFailure(Call call, IOException e) {
-//                        LogUtils.d("aleyds->错误222:" );
-//                    }
-//                });
+        logReport(sb.toString());
+    }
+
+    @SuppressLint("CheckResult")
+    private void logReport(String content){
+        JSONObject options = new JSONObject();
+        String deviceId = "";
+        options.put("apkId", "1");
+        options.put("apkTag", deviceId);
+        options.put("content", content);
+        MApplication.getApiService().apkLog( options, System.currentTimeMillis() / 1000)
+                .compose(RxUtil.applyObservableAsync())
+                .subscribe(new ResponseConsumer<JSONObject>() {
+                    @Override
+                    public void onSuccess(JSONObject data) {
+
+                    }
+
+                    @Override
+                    public void onFailed(int code, String msg) {
+
+                    }
+                }, new ErrorConsumer());
     }
 }

+ 8 - 0
app/src/main/java/com/hw/nativeapp/httpnet/ApiService.java

@@ -132,4 +132,12 @@ public interface ApiService {
             @Query("t") Long currtime
     );
 
+
+    //APK日志上报
+    @POST(COMMON + "/system/common/apkLog")
+    Observable<ResponseData<JSONObject>> apkLog(
+            @Body JSONObject bean,
+            @Query("t") Long currtime
+    );
+
 }

+ 107 - 28
app/src/main/java/com/hw/nativeapp/ui/activity/IssueTicketsActivity.java

@@ -9,6 +9,7 @@ import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.IBinder;
 import android.os.RemoteException;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
@@ -18,7 +19,6 @@ import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.blankj.utilcode.util.ToastUtils;
 import com.hjq.bar.OnTitleBarListener;
 import com.hjq.bar.TitleBar;
 import com.hw.nativeapp.MApplication;
@@ -27,6 +27,7 @@ import com.hw.nativeapp.httpnet.ErrorConsumer;
 import com.hw.nativeapp.httpnet.ResponseConsumer;
 import com.hw.nativeapp.utils.RxUtil;
 import com.hw.nativeapp.utils.StringUtils;
+import com.hw.nativeapp.utils.ToastUtils;
 import com.sunmi.extprinterservice.ExtPrinterService;
 
 import java.util.List;
@@ -89,11 +90,13 @@ public class IssueTicketsActivity extends BaseActivity  {
         selfIndex();
         getPageTransmitParams();
         bindExtPrinterService();
+        logReport("onCreate");
 //        initPageView();
     }
     @Override
     protected void onStop() {
         super.onStop();
+        logReport("onStop ");
         if (serviceConnection != null) {
             try {
                 unbindService(serviceConnection);
@@ -102,10 +105,12 @@ public class IssueTicketsActivity extends BaseActivity  {
                 e.printStackTrace();
             }
         }
+        logReport("onStop 2");
     }
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        logReport("onDestroy 1");
         if (serviceConnection != null) {
             try {
                 unbindService(serviceConnection);
@@ -114,6 +119,7 @@ public class IssueTicketsActivity extends BaseActivity  {
             }
             serviceConnection = null;
         }
+        logReport("onDestroy 2");
     }
     //获取页面传递参数
     private void getPageTransmitParams(){
@@ -133,24 +139,39 @@ public class IssueTicketsActivity extends BaseActivity  {
     // 出票完成
     private void finishView( boolean isSuccess) {
         if (isSuccess){
-            Toast.makeText(IssueTicketsActivity.this, "出票完成!", Toast.LENGTH_SHORT).show();
-            tx_issue_status_text.setText("出票完成~");
-            tx_issue_txt.setText("请取票!");
+            runOnUiThread(() -> {
+                // 更新用户界面
+                ToastUtils.showShortToast(this, "出票完成!");
+                tx_issue_status_text.setVisibility(View.VISIBLE);
+                tx_issue_txt.setVisibility(View.VISIBLE);
+                tx_issue_status_text.setText("出票完成~");
+                tx_issue_txt.setText("请取票!");
+            });
+            logReport("出票完成");
         }else {
-            Toast.makeText(IssueTicketsActivity.this, "出票失败!", Toast.LENGTH_SHORT).show();
+            runOnUiThread(() -> {
+                // 更新用户界面
+                ToastUtils.showShortToast(this, "出票失败!");
+            });
 //            tx_issue_status_text.setText("出票失败~");
 //            tx_issue_txt.setText("即将退出!");
+            logReport("出票失败");
             finish();
         }
     }
 
+    @SuppressLint("CheckResult")
     private void selfIndex(){
         MApplication.getApiService().selfIndex(  System.currentTimeMillis() / 1000)
                 .compose(RxUtil.applyObservableAsync())
                 .subscribe(new ResponseConsumer<JSONObject>() {
                     @Override
                     public void onSuccess(JSONObject data) {
-                        tx_customerMobile.setText("客服电话:" + data.getString("customerMobile"));
+                        runOnUiThread(() -> {
+                            // 更新用户界面
+                            tx_customerMobile.setText("客服电话:" + data.getString("customerMobile"));
+                        });
+
                     }
 
                     @Override
@@ -207,27 +228,36 @@ public class IssueTicketsActivity extends BaseActivity  {
          * 4 打印机过热
          * */
         int printerStatus = ext.getPrinterStatus(); //
-        Toast.makeText(IssueTicketsActivity.this, "printerStatus=" + printerStatus, Toast.LENGTH_SHORT).show();
+        runOnUiThread(() -> {
+            // 更新用户界面
+            ToastUtils.showShortToast(IssueTicketsActivity.this, "打印机状态:" + printerStatus);
+        });
+
         if(printerStatus == 2) {
-            tx_issue_not.setVisibility(View.VISIBLE);
-            tx_issue_txt.setVisibility(View.GONE);
-            img_issue_tickets.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.take_not));
+            runOnUiThread(() -> {
+                // 更新用户界面
+                tx_issue_not.setVisibility(View.VISIBLE);
+                tx_issue_txt.setVisibility(View.GONE);
+                img_issue_tickets.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.take_not));
+            });
+
         }
         if(printerStatus != 0 && printerStatus != 3){
-            String msg = printerStatus == -1 ? "打印机脱机或打印服务还未连接打印机" : printerStatus == 1 ? "打印机开盖" : printerStatus == 2 ? "打印机缺纸" : printerStatus == 3 ? "打印机即将缺纸" : "打印机过热";
-            ToastUtils Toast = new ToastUtils();
-            Toast.setGravity(Gravity.TOP, 0, 200);
-            Toast.setTextSize(32);
-            Toast.setGravity(Gravity.CENTER_VERTICAL, 0, 0);
-            Toast.show(msg);
+            String msg = printerStatus == -1 ? "打印机脱机或打印服务还未连接打印机" : printerStatus == 1 ? "打印机开盖" : printerStatus == 2
+                    ? "打印机缺纸" : printerStatus == 3 ? "打印机即将缺纸" : "打印机过热";
+            runOnUiThread(() -> {
+                // 更新用户界面
+                ToastUtils.showShortToast(this, msg);
+            });
             return;
         }
         try {
             ext.startTransBuffer(); //启⽤事务模式
             int index = 1;
             for (JSONObject it : printList){
-                Toast.makeText(IssueTicketsActivity.this, "开始打印:" + index, Toast.LENGTH_SHORT).show();
+                logReport("开始打印:" + index);
                 printExecute(it);
+                logReport("打印结束:" + index);
                 index++;
             }
             ext.endTransBuffer(); //结束事务模式
@@ -243,64 +273,82 @@ public class IssueTicketsActivity extends BaseActivity  {
                     .toJavaList(JSONObject.class);
             if (rowItem != null && !rowItem.isEmpty()){
                 for (JSONObject itemJson : rowItem){
+                    logReport("打印中:ITEM:" + itemJson.toJSONString());
                     // 打印文本
                     String printType = itemJson.getString("printType");
                     if(!StringUtils.isEmpty(printType) && printType.equals("text")){
                         int hori = itemJson.get("hori") == null ? 1 : itemJson.getInteger("hori");
                         int veri = itemJson.get("veri")== null ? 1 : itemJson.getInteger("veri");
+                        int alignMode =itemJson.get("alignMode") == null ? 1 : itemJson.getInteger("alignMode");
+                        String printContent = itemJson.containsKey("printContent")?itemJson.getString("printContent"):"";
+                        logReport("文本打印开始::hori:" + hori + " veri:" + veri + " alignMode:" + alignMode + " printContent:" + printContent);
                         ext.setFontZoom(hori, veri);
                         // 对其方式
-                        int alignMode =itemJson.get("alignMode") == null ? 1 : itemJson.getInteger("alignMode");
                         ext.setAlignMode(alignMode);
-                        String printContent = itemJson.containsKey("printContent")?itemJson.getString("printContent"):"";
                         ext.printText(printContent);
+                        logReport("文本打印结束");
                     }
                     // 打印二维码
                     if(!StringUtils.isEmpty(printType) &&  printType.equals("qrcode")){
                         // 对其方式
                         int alignMode = itemJson.get("alignMode") == null ? 1 : itemJson.getInteger("alignMode");
-                        ext.setAlignMode(alignMode);
-
                         String eqCode = itemJson.get("printContent") == null ? "" : itemJson.getString("printContent");
                         int qrcodeSize = itemJson.get("qrcodeSize") == null ? 0 : itemJson.getInteger("qrcodeSize");
+                        logReport("二维码打印开始::alignMode:" + alignMode + " eqCode:" + eqCode + " qrcodeSize:" + qrcodeSize );
+                        ext.setAlignMode(alignMode);
                         ext.printQrCode(eqCode, qrcodeSize, 0);
+                        logReport("二维码打印结束");
                     }
                     // 打印条形码
                     if(!StringUtils.isEmpty(printType) &&  printType.equals("barCode")){
                         // 对其方式
                         int alignMode = itemJson.get("alignMode") == null ? 0 : itemJson.getInteger("alignMode");
-                        ext.setAlignMode(alignMode);
-
                         String barCode = itemJson.get("printContent") == null ? "" :  itemJson.getString("printContent");
                         int barCodeType = itemJson.get("barCodeType") == null ? 0 :  itemJson.getInteger("barCodeType");
                         int width =itemJson.get("width") == null ? 0 :  itemJson.getInteger("width");
                         int height = itemJson.get("height") == null ? 0 :  itemJson.getInteger("height");
+                        logReport("条形码打印开始::alignMode:" + alignMode + " barCode:" + barCode + " barCodeType:" + barCodeType +
+                                " width:" + width + " height:" + height);
+                        ext.setAlignMode(alignMode);
                         ext.printBarCode(barCode, barCodeType, width, height, 1);
+                        logReport("条形码打印结束");
                     }
                     // 打印走纸
                     if(!StringUtils.isEmpty(printType) &&  printType.equals("wrpe")){
                         // 走纸类型: 1-按行 2-按像素
                         int wrapType = itemJson.get("wrapType") == null ? 0 : itemJson.getInteger("wrapType");
                         int wrapLen = itemJson.get("wrapLen") == null ? 0 :  itemJson.getInteger("wrapLen");
+                        logReport("打印走纸开始::wrapType:" + wrapType + " wrapLen:" + wrapLen );
                         if(wrapType == 1) {
                             ext.lineWrap(wrapLen);
                         } else if (wrapType == 2) {
                             ext.pixelWrap(wrapLen);
                         }
+                        logReport("打印走纸结束");
                     }
                     // 打印切纸
                     if(!StringUtils.isEmpty(printType) &&  printType.equals("cut")){
                         int cutPx = itemJson.get("cutPx") == null ? 0 : itemJson.getInteger("cutPx");
                         int cutType = itemJson.get("cutType") == null ? 0 : itemJson.getInteger("cutType");
+                        logReport("打印切纸开始::cutPx:" + cutPx + " cutType:" + cutType );
                         ext.cutPaper(cutType, cutPx);
+                        logReport("打印走纸结束");
                     }
                 }
             }else {
-                Toast.makeText(IssueTicketsActivity.this, "打印数据为空", Toast.LENGTH_SHORT).show();
+                logReport("打印数据为空");
+                runOnUiThread(() -> {
+                    // 更新用户界面
+                    ToastUtils.showShortToast(this, "打印数据为空");
+                });
                 finishView(true);
             }
         }else {
-            Toast.makeText(IssueTicketsActivity.this, "打印数据不存在", Toast.LENGTH_SHORT).show();
+            logReport("打印数据不存在");
+            runOnUiThread(() -> {
+                // 更新用户界面
+                ToastUtils.showShortToast(this, "打印数据不存在");
+            });
             finishView(true);
         }
     }
@@ -319,9 +367,40 @@ public class IssueTicketsActivity extends BaseActivity  {
             ext = ExtPrinterService.Stub.asInterface(service);
             initPageView();
         }
-        @Override public void onServiceDisconnected(ComponentName name) {}
-        @Override public void onBindingDied(ComponentName name) {}
-        @Override public void onNullBinding(ComponentName name) {}
+        @Override public void onServiceDisconnected(ComponentName name) {
+            logReport("onServiceDisconnected");
+        }
+        @Override public void onBindingDied(ComponentName name) {
+            logReport("onBindingDied");
+        }
+        @Override public void onNullBinding(ComponentName name) {
+            logReport("onNullBinding");
+        }
     };
 
+
+    @SuppressLint("CheckResult")
+    private void logReport(String content){
+        JSONObject options = new JSONObject();
+        String deviceId = "";
+        try {
+            deviceId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+        }catch (Exception ignored){}
+        options.put("apkId", "1");
+        options.put("apkTag", deviceId);
+        options.put("content", content);
+        MApplication.getApiService().apkLog( options, System.currentTimeMillis() / 1000)
+                .compose(RxUtil.applyObservableAsync())
+                .subscribe(new ResponseConsumer<JSONObject>() {
+                    @Override
+                    public void onSuccess(JSONObject data) {
+
+                    }
+
+                    @Override
+                    public void onFailed(int code, String msg) {
+
+                    }
+                }, new ErrorConsumer());
+    }
 }

+ 6 - 6
app/src/main/java/com/hw/nativeapp/ui/activity/TakeActivity.java

@@ -121,17 +121,17 @@ public class TakeActivity extends BaseActivity  {
         super.onDestroy();
         stopCountDownTimer();
         if (receiver != null){
-            if (receiver != null){
-                try {
-                    unregisterReceiver(receiver);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
+            try {
+                unregisterReceiver(receiver);
+                receiver = null;
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
         if (mConnection != null) {
             try {
                 unbindService(mConnection);
+                mConnection = null;
             } catch (Exception e) {
                 e.printStackTrace();
             }

+ 149 - 138
app/src/main/res/layout/activity_issue_tickets.xml

@@ -5,166 +5,177 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/main_img"
+        android:layout_height="match_parent">
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="550dp"
-            android:scaleType="fitXY"
-            android:src="@mipmap/main_top" />
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:orientation="vertical">
 
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="550dp">
-        <com.hjq.bar.TitleBar
-            android:id="@+id/tb_main_bar"
-            android:layout_width="match_parent"
-            android:layout_height="80dp"
-            android:background="@color/login_bk"
-            app:leftColor="@color/white"
-            app:leftIcon="@mipmap/left_44_icon"
-            app:leftSize="@dimen/inedx_btn_size"
-            app:leftTitle="返回"
-            app:rightColor="@color/white"
-            app:rightSize="@dimen/inedx_btn_size"
-            app:title="自助取票"
-            app:titleColor="@color/white"
-            app:titleSize="@dimen/text_30dp_size" />
-    </LinearLayout>
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:layout_marginTop="620sp"
-        android:orientation="vertical"
-        android:padding="60sp">
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center"
-            android:background="@drawable/bg_take"
-            android:padding="30sp">
+                <ImageView
+                    android:id="@+id/main_img"
+                    android:layout_width="match_parent"
+                    android:layout_height="550dp"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/main_top" />
 
+            </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="10sp">
-                <TextView
-                    android:id="@+id/tx_issue_status_text"
+                android:layout_height="wrap_content">
+                <com.hjq.bar.TitleBar
+                    android:id="@+id/tb_main_bar"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="门票正在打印中,请稍后......"
-                    android:textColor="@color/login_bk"
-                    android:textFontWeight="800"
-                    android:textSize="@dimen/text_30dp_size" />
+                    android:layout_height="80dp"
+                    android:background="@color/login_bk"
+                    app:leftColor="@color/white"
+                    app:leftIcon="@mipmap/left_44_icon"
+                    app:leftSize="@dimen/inedx_btn_size"
+                    app:leftTitle="返回"
+                    app:rightColor="@color/white"
+                    app:rightSize="@dimen/inedx_btn_size"
+                    app:title="自助取票"
+                    app:titleColor="@color/white"
+                    app:titleSize="@dimen/text_30dp_size" />
             </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="60sp"
-            android:layout_weight="1"
-            android:background="@drawable/bg_take"
-            android:orientation="vertical"
-            android:padding="60dp">
-
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
                 android:orientation="vertical"
-                android:paddingBottom="30sp">
-
-                <TextView
-                    android:id="@+id/tx_issue_txt"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingBottom="10dp"
-                    android:paddingTop="10dp"
-                    android:paddingLeft="100dp"
-                    android:paddingRight="100dp"
-                    android:background="@drawable/bg_btn_01"
-                    android:gravity="center"
-                    android:text="注意出票"
-                    android:textColor="@color/white"
-                    android:textFontWeight="800"
-                    android:textSize="@dimen/text_30dp_size" />
-
-                <ImageView
-                    android:id="@+id/img_issue_tickets"
-                    android:layout_width="400dp"
-                    android:layout_height="250dp"
-                    android:layout_marginTop="50sp"
-                    android:scaleType="fitXY"
-                    android:src="@mipmap/issue_tickets" />
+                android:padding="60sp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_marginTop="40dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="正在为您打印,"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/inedx_btn_size" />
-
-<!--                    <TextView-->
-<!--                        android:id="@+id/print_num"-->
-<!--                        android:layout_width="wrap_content"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:text="1/8"-->
-<!--                        android:textColor="@color/login_bk"-->
-<!--                        android:textSize="13sp" />-->
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="注意下方出票口取票"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/inedx_btn_size" />
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:background="@drawable/bg_take"
+                    android:padding="30sp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:padding="10sp">
+                        <TextView
+                            android:id="@+id/tx_issue_status_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:text="门票正在打印中,请稍后......"
+                            android:textColor="@color/login_bk"
+                            android:textFontWeight="800"
+                            android:textSize="@dimen/text_30dp_size" />
+                    </LinearLayout>
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="20dp"
-                    android:gravity="center"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/tx_issue_not"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="本机小票不足,请联系工作人员"
-                        android:textColor="@color/black"
-                        android:textSize="@dimen/inedx_btn_size" />
-
-                    <TextView
-                        android:id="@+id/tx_customerMobile"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:text="客服电话:400-992-1888"
-                        android:textColor="@color/login_bk"
-                        android:textSize="@dimen/inedx_btn_size" />
+                    android:layout_gravity="center"
+                    android:layout_marginTop="60sp"
+                    android:layout_weight="1"
+                    android:background="@drawable/bg_take"
+                    android:orientation="vertical"
+                    android:padding="60dp">
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:paddingBottom="30sp">
+
+                        <TextView
+                            android:id="@+id/tx_issue_txt"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:paddingBottom="10dp"
+                            android:paddingTop="10dp"
+                            android:paddingLeft="100dp"
+                            android:paddingRight="100dp"
+                            android:background="@drawable/bg_btn_01"
+                            android:gravity="center"
+                            android:text="注意出票"
+                            android:textColor="@color/white"
+                            android:textFontWeight="800"
+                            android:textSize="@dimen/text_30dp_size" />
+
+                        <ImageView
+                            android:id="@+id/img_issue_tickets"
+                            android:layout_width="400dp"
+                            android:layout_height="250dp"
+                            android:layout_marginTop="50sp"
+                            android:scaleType="fitXY"
+                            android:src="@mipmap/issue_tickets" />
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center"
+                            android:layout_marginTop="40dp">
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="正在为您打印,"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/inedx_btn_size" />
+
+                            <!--                    <TextView-->
+                            <!--                        android:id="@+id/print_num"-->
+                            <!--                        android:layout_width="wrap_content"-->
+                            <!--                        android:layout_height="wrap_content"-->
+                            <!--                        android:text="1/8"-->
+                            <!--                        android:textColor="@color/login_bk"-->
+                            <!--                        android:textSize="13sp" />-->
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="注意下方出票口取票"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/inedx_btn_size" />
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="20dp"
+                            android:gravity="center"
+                            android:orientation="vertical">
+
+                            <TextView
+                                android:id="@+id/tx_issue_not"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="本机小票不足,请联系工作人员"
+                                android:textColor="@color/black"
+                                android:textSize="@dimen/inedx_btn_size" />
+
+                            <TextView
+                                android:id="@+id/tx_customerMobile"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="20dp"
+                                android:text="客服电话:400-992-1888"
+                                android:textColor="@color/login_bk"
+                                android:textSize="@dimen/inedx_btn_size" />
+                        </LinearLayout>
+                    </LinearLayout>
+
                 </LinearLayout>
             </LinearLayout>
-
         </LinearLayout>
-    </LinearLayout>
+    </ScrollView>
+
+
 
 </RelativeLayout>

+ 1 - 1
config.gradle

@@ -2,7 +2,7 @@ ext {
 
     version = [
             applicationId: "com.hw.great.self",
-            versionCode  : 1,
+            versionCode  : 3,
             versionName  : "1.0.1"
     ]