调试bug修改

app/src/main/AndroidManifest.xml

@@ -44,7 +44,6 @@
     <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" />
-
     <!-- 开机启动 -->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -58,9 +57,9 @@
     <application
         android:allowBackup="true"
         android:name="com.hw.nativeapp.MApplication"
-        android:icon="@mipmap/icon"
+        android:icon="@mipmap/icon_wdzz"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/icon"
+        android:roundIcon="@mipmap/icon_wdzz"
         android:supportsRtl="true"
         android:usesCleartextTraffic="true"
         android:theme="@style/Theme.airport"
@@ -77,6 +76,14 @@
             </intent-filter>
         </activity>
 
+        <receiver android:name="com.hw.nativeapp.ui.receiver.BootBroadcastReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
+
         <!--  首页  -->
         <activity android:name="com.hw.nativeapp.ui.activity.MainActivity"
             android:configChanges="orientation|screenSize"

app/src/main/java/com/hw/nativeapp/ui/activity/InfoEnterActivity.java

@@ -86,11 +86,12 @@ public class InfoEnterActivity extends BaseActivity  {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_info_enter);
-        bindIDCardService();
+//        bindIDCardService();
     }
     @Override
     protected void onStart() {
         super.onStart();
+        bindIDCardService();
         hasPermission = ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
         if (!hasPermission) {
             ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 101);

app/src/main/java/com/hw/nativeapp/ui/activity/IssueTicketsActivity.java

@@ -196,7 +196,7 @@ public class IssueTicketsActivity extends BaseActivity  {
             tx_issue_txt.setVisibility(View.GONE);
             img_issue_tickets.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.take_not));
         }
-        if(printerStatus != 0){
+        if(printerStatus != 0 && printerStatus != 3){
             String msg = printerStatus == -1 ? "打印机脱机或打印服务还未连接打印机" : printerStatus == 1 ? "打印机开盖" : printerStatus == 2 ? "打印机缺纸" : printerStatus == 3 ? "打印机即将缺纸" : "打印机过热";
             Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
             return;
@@ -206,33 +206,36 @@ public class IssueTicketsActivity extends BaseActivity  {
         for (int i = 0; i < rowItem.size(); i++) {
             // 打印文本
             if(rowItem.getJSONObject(i).getString("printType").equals("text")){
-                ext.printText(rowItem.getJSONObject(i).getString("printContent"));
                 int hori = rowItem.getJSONObject(i).getInteger("hori");
                 int veri = rowItem.getJSONObject(i).getInteger("veri");
                 ext.setFontZoom(hori, veri);
                 // 对其方式
                 int alignMode = rowItem.getJSONObject(i).getInteger("alignMode");
                 ext.setAlignMode(alignMode);
+
+                ext.printText(rowItem.getJSONObject(i).getString("printContent"));
             }
             // 打印二维码
             if(rowItem.getJSONObject(i).getString("printType").equals("qrcode")){
-                String eqCode = rowItem.getJSONObject(i).getString("printContent");
-                int qrcodeSize = rowItem.getJSONObject(i).getInteger("qrcodeSize");
-                ext.printQrCode(eqCode, qrcodeSize, 0);
                 // 对其方式
                 int alignMode = rowItem.getJSONObject(i).getInteger("alignMode");
                 ext.setAlignMode(alignMode);
+
+                String eqCode = rowItem.getJSONObject(i).getString("printContent");
+                int qrcodeSize = rowItem.getJSONObject(i).getInteger("qrcodeSize");
+                ext.printQrCode(eqCode, qrcodeSize, 0);
             }
             // 打印条形码
             if(rowItem.getJSONObject(i).getString("printType").equals("barCode")){
+                // 对其方式
+                int alignMode = rowItem.getJSONObject(i).getInteger("alignMode");
+                ext.setAlignMode(alignMode);
+
                 String barCode = rowItem.getJSONObject(i).getString("printContent");
                 int barCodeType = rowItem.getJSONObject(i).getInteger("barCodeType");
                 int width = rowItem.getJSONObject(i).getInteger("width");
                 int height = rowItem.getJSONObject(i).getInteger("height");
                 ext.printBarCode(barCode, barCodeType, width, height, 1);
-                // 对其方式
-                int alignMode = rowItem.getJSONObject(i).getInteger("alignMode");
-                ext.setAlignMode(alignMode);
             }
             // 打印走纸
             if(rowItem.getJSONObject(i).getString("printType").equals("wrpe")){

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

@@ -11,6 +11,7 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.IBinder;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
@@ -96,12 +97,27 @@ public class TakeActivity extends BaseActivity  {
                 e.printStackTrace();
             }
         }
+        if (receiver != null){
+            if (receiver != null){
+                try {
+                    unregisterReceiver(receiver);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
     }
     @Override
     protected void onDestroy() {
         super.onDestroy();
         if (receiver != null){
-            unregisterReceiver(receiver);
+            if (receiver != null){
+                try {
+                    unregisterReceiver(receiver);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
         }
         if (mConnection != null) {
             try {
@@ -124,6 +140,10 @@ public class TakeActivity extends BaseActivity  {
     public void onClick(View v){
         switch (v.getId()){
             case R.id.purchase_btn:
+                if (TextUtils.isEmpty(et_modify_quantity.getText().toString())) {
+                    Toast.makeText(TakeActivity.this, "请输入取票码/手机号", Toast.LENGTH_SHORT).show();
+                    return;
+                }
                 Bundle bundle = new Bundle();
                 bundle.putString("qrcodeNo", et_modify_quantity.getText().toString());
                 ActivityUtils.launchActivity(this, TicketCollectionActivity.class, bundle);
@@ -167,9 +187,15 @@ public class TakeActivity extends BaseActivity  {
                 break;
             case R.id.img_idcard_btn:
                 if (receiver != null){
-                    unregisterReceiver(receiver);
+                    try {
+                        unregisterReceiver(receiver);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+                if (mConnection == null) {
+                    bindIDCardService();
                 }
-                bindIDCardService();
                 break;
             case R.id.img_code_btn:
                 if (mConnection != null) {
@@ -180,7 +206,9 @@ public class TakeActivity extends BaseActivity  {
                     }
                     mService = null;
                 }
-                registerReceiver();
+                if (receiver == null){
+                    registerReceiver();
+                }
                 break;
         }
     }

app/src/main/java/com/hw/nativeapp/ui/activity/TicketPurchaseActivity.java

@@ -60,8 +60,6 @@ public class TicketPurchaseActivity extends BaseActivity {
 
     private JSONArray dataList = new JSONArray();
 
-    private ProgressDialog progressDialog;
-
     @Override
     void initView() {
         titleBar = findViewById(R.id.tb_main_bar);

app/src/main/java/com/hw/nativeapp/ui/receiver/BootBroadcastReceiver.java

@@ -3,15 +3,17 @@ package com.hw.nativeapp.ui.receiver;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.util.Log;
 
 import com.hw.nativeapp.ui.activity.SplashActivity;
 
 public class BootBroadcastReceiver extends BroadcastReceiver {
     static final String ACTION = "android.intent.action.BOOT_COMPLETED";
 
-
     @Override
     public void onReceive(Context context, Intent intent) {
+        Log.d("BootBroadcastReceiver", "onReceive");
+        // 判断是否是开机广播
         if (intent.getAction().equals(ACTION)) {
             Intent bootMainIntent = new Intent(context, SplashActivity.class);
             // 这里必须为FLAG_ACTIVITY_NEW_TASK

app/src/main/res/layout/activity_info_enter.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_info_input.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"
@@ -58,7 +58,7 @@
                         android:textSize="14sp" />
                     <EditText
                         android:id="@+id/et_name"
-                        android:text="殷登顺"
+                        android:text=""
                         android:layout_width="match_parent"
                         android:layout_height="40sp"
                         android:textSize="14sp"
@@ -87,7 +87,7 @@
                         android:layout_height="40sp"
                         android:digits="0123456789 X"
                         android:textSize="14sp"
-                        android:text="520112198903170617"
+                        android:text=""
                         android:background="@android:drawable/edit_text"
                         android:hint="请输入" />
                 </LinearLayout>

app/src/main/res/layout/activity_issue_tickets.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_main.xml

@@ -22,6 +22,7 @@
                 android:layout_height="match_parent"
                 android:scaleType="fitXY"
                 android:src="@mipmap/main_top" />
+
         </LinearLayout>
         <LinearLayout
             android:layout_width="120dp"

app/src/main/res/layout/activity_payment_method.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_purchase_info.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_scan_code_pay.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_select_info.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_take.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"
@@ -74,7 +74,7 @@
                     android:paddingLeft="10dp"
                     android:background="@android:drawable/edit_text"
                     android:hint="取票码/手机号取票"
-                    android:text="0076425742"
+                    android:text=""
                     android:inputType="number" />
 
             </LinearLayout>
@@ -298,7 +298,7 @@
                     android:layout_height="30dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:text="立即购票"
+                    android:text="立即取票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
                     android:textSize="13sp" />

app/src/main/res/layout/activity_take_user_info.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_ticket_collection.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"

app/src/main/res/layout/activity_ticket_purchase.xml

@@ -10,7 +10,7 @@
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/title_bg"
+        android:background="@color/login_bk"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
         app:leftSize="15sp"