布局按1080*1980处理和处理打印功能

app/build.gradle

@@ -19,10 +19,10 @@ android {
     }
     signingConfigs {
         release {
-            storeFile file('airport.jks')
-            keyAlias 'airport'
-            keyPassword 'airport@123'
-            storePassword 'airport@123'
+            storeFile file('greatself.jks')
+            keyAlias 'great'
+            keyPassword 'great123456'
+            storePassword 'great123456'
         }
     }
 

app/src/main/java/com/hw/nativeapp/httpnet/entity/handleBean.java

@@ -8,6 +8,7 @@ public class handleBean {
     public String orderId;
     public String idcard;
     public String name;
+    public String goodsName;
     public String performName;
     public String performDate;
     public String performStart;

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

@@ -190,14 +190,14 @@ public class InfoEnterActivity extends BaseActivity  {
         public void onServiceConnected(ComponentName name, IBinder service) {
             mService = IDCardServiceAidl.Stub.asInterface(service);
             Log.e("id_card", " 服务已连接");
-//            Toast.makeText(InfoEnterActivity.this, "服务已连接", Toast.LENGTH_SHORT).show();
+            Toast.makeText(InfoEnterActivity.this, "请将身份证放置到指示位置！", Toast.LENGTH_SHORT).show();
+
         }
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
             mService = null;
             Log.e("id_card", "服务已断开");
-            Toast.makeText(InfoEnterActivity.this, "服务已断开", Toast.LENGTH_SHORT).show();
         }
     };
     public void auto(View view) {

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

@@ -3,12 +3,14 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -45,12 +47,20 @@ public class IssueTicketsActivity extends BaseActivity  {
     TextView print_num;
     @BindView(R.id.tx_customerMobile)
     TextView tx_customerMobile;
+    @BindView(R.id.tx_issue_status_text)
+    TextView tx_issue_status_text;
+    @BindView(R.id.img_issue_tickets)
+    ImageView img_issue_tickets;
+    @BindView(R.id.tx_issue_txt)
+    TextView tx_issue_txt;
+    @BindView(R.id.tx_issue_not)
+    TextView tx_issue_not;
 
     private ExtPrinterService ext;
     private int printNum = 1;
 
     private JSONArray viewerList = new JSONArray();
-    private JSONArray dataList = new JSONArray();
+    private JSONArray printInfo = new JSONArray();
     @Override
     void initView() {
         titleBar = findViewById(R.id.tb_main_bar);
@@ -76,9 +86,11 @@ public class IssueTicketsActivity extends BaseActivity  {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_issue_tickets);
+
+        tx_issue_not.setVisibility(View.GONE);
         selfIndex();
-        bindExtPrinterService();
         getPageTransmitParams();
+        bindExtPrinterService();
     }
     @Override
     protected void onStop() {
@@ -108,12 +120,22 @@ public class IssueTicketsActivity extends BaseActivity  {
         Intent transmitIntent = getIntent();
         viewerList = JSONArray.parseArray(transmitIntent.getStringExtra("viewerList"));
         print_num.setText(printNum +"/"+viewerList.size());
-        Log.e("serviceConnection","---------------serviceConnection--------------"+ (serviceConnection));
+        String [] list = new String[viewerList.size()];
+        for (int i = 0; i < viewerList.size(); i++) {
+            list[i] =  viewerList.getJSONObject(i).getString("id");
+        }
     }
 
     private void initPageView() {
         print_num.setText(printNum +"/"+viewerList.size());
-        getTicketOut(viewerList.getJSONObject(printNum - 1));
+        getTicketOut();
+    }
+
+    // 出票完成
+    private void finishView() {
+        tx_issue_status_text.setText("出票完成～");
+        tx_issue_txt.setText("请取票！");
+        img_issue_tickets.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.ticket_collection));
     }
 
     private void selfIndex(){
@@ -131,20 +153,22 @@ public class IssueTicketsActivity extends BaseActivity  {
                 }, new ErrorConsumer());
     }
 
-    private void getTicketOut(JSONObject obj){
-        JSONObject options = new  JSONObject();
-        options.put("orderId", obj.getString("orderId"));
-        String [] list = new String[1];
-        list[0] = obj.getString("id");
+    private void getTicketOut(){
+        JSONObject options = new JSONObject();
+        options.put("source", "1");
+        String [] list = new String[viewerList.size()];
+        for (int i = 0; i < viewerList.size(); i++) {
+            list[i] =  viewerList.getJSONObject(i).getString("id");
+        }
         options.put("viewerList", list);
         MApplication.getApiService().ticketout( options, System.currentTimeMillis() / 1000)
                 .compose(RxUtil.applyObservableAsync())
                 .subscribe(new ResponseConsumer<JSONObject>() {
                     @Override
                     public void onSuccess(JSONObject data) throws RemoteException {
-                        JSONArray rows = data.getJSONArray("rows");
-                        dataList = rows;
-                        startPrinting();
+                        JSONArray rows = data.getJSONArray("printInfo");
+                        printInfo = rows;
+                        startPrinting(printInfo.getJSONObject(printNum - 1));
                     }
 
                     @Override
@@ -155,7 +179,7 @@ public class IssueTicketsActivity extends BaseActivity  {
     }
 
     // 开始打印
-    private void startPrinting() throws RemoteException {
+    private void startPrinting(JSONObject obj) throws RemoteException {
         /*
         * 打印机状态
         * -1 打印机脱机或打印服务还未连接打印机
@@ -167,21 +191,82 @@ public class IssueTicketsActivity extends BaseActivity  {
         * */
         int printerStatus = ext.getPrinterStatus(); //
         Log.e("printerStatus","---------------printerStatus--------------"+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));
+        }
         if(printerStatus != 0){
             String msg = printerStatus == -1 ? "打印机脱机或打印服务还未连接打印机" : printerStatus == 1 ? "打印机开盖" : printerStatus == 2 ? "打印机缺纸" : printerStatus == 3 ? "打印机即将缺纸" : "打印机过热";
             Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
             return;
         }
         ext.startTransBuffer(); //启⽤事务模式
-        ext.printText("测试");
-        ext.printText("测试");
-        ext.printText("测试");
-        ext.endTransBuffer(); //结束事务模式
+        JSONArray rowItem = obj.getJSONArray("printList");
+        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);
+            }
+            // 打印二维码
+            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);
+            }
+            // 打印条形码
+            if(rowItem.getJSONObject(i).getString("printType").equals("barCode")){
+                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")){
+                // 走纸类型: 1-按行 2-按像素
+                int wrapType = rowItem.getJSONObject(i).getInteger("wrapType");
+                int wrapLen = rowItem.getJSONObject(i).getInteger("wrapLen");
+                if(wrapType == 1) {
+                    ext.lineWrap(wrapLen);
+                } else if (wrapType == 2) {
+                    ext.pixelWrap(wrapLen);
+                }
+            }
+            // 打印切纸
+            if(rowItem.getJSONObject(i).getString("printType").equals("cut")){
+                int wrapLen = rowItem.getJSONObject(i).getInteger("wrapLen");
+                ext.cutPaper(wrapLen, 0);
+            }
+        }
+        Boolean endTransBuffer = ext.endTransBuffer(); //结束事务模式
+
+        if(!endTransBuffer){
+            tx_issue_status_text.setText("打印失败,请检查打印机请联系工作人员");
+            tx_issue_txt.setText("打印失败");
+            Toast.makeText(IssueTicketsActivity.this, "打印失败", Toast.LENGTH_SHORT).show();
+            return;
+        }
+
         //  打印完成，开始打印下一张
         printNum++;
-
         if(printNum < viewerList.size()){
-            getTicketOut(viewerList.getJSONObject(printNum - 1));
+            print_num.setText(printNum +"/"+viewerList.size());
+            startPrinting(viewerList.getJSONObject(printNum - 1));
+        } else {
+            finishView();
         }
     }
 

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

@@ -1,5 +1,14 @@
 package com.hw.nativeapp.ui.activity;
+import android.annotation.SuppressLint;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.os.IBinder;
+import android.os.RemoteException;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -21,6 +30,7 @@ import com.hw.nativeapp.httpnet.entity.LoginBean;
 import com.hw.nativeapp.httpnet.entity.LoginRequestBean;
 import com.hw.nativeapp.ui.dialogs.DialogInputDevice;
 import com.hw.nativeapp.ui.dialogs.DialogModifyText;
+import com.hw.nativeapp.ui.dialogs.DialogQuantity;
 import com.hw.nativeapp.utils.ActivityUtils;
 import com.hw.nativeapp.utils.DeviceUtils;
 import com.hw.nativeapp.utils.LogUtils;
@@ -28,6 +38,7 @@ import com.hw.nativeapp.utils.RxUtil;
 import com.hw.nativeapp.utils.StringUtils;
 import com.hw.nativeapp.utils.ToastUtils;
 import com.squareup.picasso.Picasso;
+import com.sunmi.extprinterservice.ExtPrinterService;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -37,15 +48,23 @@ import butterknife.OnClick;
 
 
 public class MainActivity extends BaseActivity  {
+    public static final Integer COUNTDOWN_TIME = 15000;
+    private CountDownTimer timer;
 
     private Long exitTemptime = 0L;
 
     private TextView paper_text;
 
     private String deviceId = "";
+    private int closeNum = 0;
 
     @BindView(R.id.tx_customerMobile)
     TextView tx_customerMobile;
+    @BindView(R.id.tx_top_hide)
+    TextView tx_top_hide;
+    @BindView(R.id.tx_hide)
+    TextView tx_hide;
+
     @BindView(R.id.main_img)
     ImageView main_img;
 
@@ -53,7 +72,7 @@ public class MainActivity extends BaseActivity  {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        selfIndex();
+//        bindExtPrinterService();
     }
 
     @Override
@@ -101,10 +120,32 @@ public class MainActivity extends BaseActivity  {
         }
         return super.onKeyDown(keyCode, event);
     }
-
+    @Override
+    protected void onStop() {
+        super.onStop();
+//        if (serviceConnection != null) {
+//            try {
+//                unbindService(serviceConnection);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+//        if (serviceConnection != null) {
+//            try {
+//                unbindService(serviceConnection);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//            serviceConnection = null;
+//        }
+    }
     // take_btn 自助取票
     // purchase_btn 自助购票
-    @OnClick({R.id.take_btn,R.id.purchase_btn})
+    @OnClick({R.id.take_btn, R.id.purchase_btn, R.id.tx_customerMobile, R.id.tx_top_hide, R.id.tx_hide})
     public void onClick(View v){
         switch (v.getId()){
             case R.id.take_btn:
@@ -113,20 +154,55 @@ public class MainActivity extends BaseActivity  {
             case R.id.purchase_btn:
                 ActivityUtils.launchActivity(this,TicketPurchaseActivity.class);
                 break;
+            case R.id.tx_customerMobile: // 第一位置点击
+                if(closeNum <= 5 ){
+                    closeNum ++;
+                    if (timer == null){
+                        startCountDownTimer();
+                    }
+                } else {
+                    closeNum = 0;
+                }
+                break;
+            case R.id.tx_top_hide: // 第二位置次点击
+                if(closeNum >= 5 &&  closeNum <= 10){
+                    closeNum++;
+                } else {
+                    closeNum = 0;
+                }
+                break;
+            case R.id.tx_hide: // 第三位置次点击
+                if(closeNum >= 10){
+                    closeNum++;
+                    closeEven();
+                } else {
+                    closeNum = 0;
+                }
+                break;
+        }
+    }
+    // 关闭应用
+    private void closeEven() {
+        if(closeNum == 15) {
+            DialogQuantity.Builder builder = new DialogQuantity.Builder(this);
+            builder.setPositionButton("确定", (dialog, which) -> {
+                finish();
+                System.exit(0);
+            }).setNegativeButton("取消", (dialog, which) -> dialog.dismiss()).create().show();
         }
     }
-
     // 模拟登录
     private void loginIn(){
         LoginRequestBean requestBean = new LoginRequestBean();
         requestBean.deviceNo = deviceId;
-        MApplication.getApiService().login( requestBean, System.currentTimeMillis() / 1000)
+        MApplication.getApiService().login(requestBean, System.currentTimeMillis() / 1000)
                 .compose(RxUtil.applyObservableAsync())
                 .subscribe(new ResponseConsumer<LoginBean>() {
                     @Override
                     public void onSuccess(LoginBean data) {
                         //缓存token登录信息
                         SPUtils.getInstance().put(Contents.SPU_TOKEN_KEY, "Bearer " + data.getAccessToken());
+                        selfIndex();
                     }
 
                     @Override
@@ -157,4 +233,58 @@ public class MainActivity extends BaseActivity  {
                     }
                 }, new ErrorConsumer());
     }
+
+    // 打印注册
+    private void bindExtPrinterService() {
+        Intent intent = new Intent();
+        intent.setPackage("com.sunmi.extprinterservice");
+        intent.setAction("com.sunmi.extprinterservice.PrinterService");
+        bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
+    }
+
+    ServiceConnection serviceConnection = new ServiceConnection() {
+        @Override public void onServiceConnected(ComponentName name, IBinder
+                service) {
+            ExtPrinterService ext = ExtPrinterService.Stub.asInterface(service);
+            int printerStatus = 0;
+            try {
+                printerStatus = ext.getPrinterStatus();
+            } catch (RemoteException e) {
+                e.printStackTrace();
+            }
+            if(printerStatus == 2) {
+                paper_text.setText("打印纸已用尽");
+            }
+        }
+        @Override public void onServiceDisconnected(ComponentName name) {
+            Log.e("onServiceDisconnected","---------------onServiceDisconnected--------------");
+        }
+        @Override public void onBindingDied(ComponentName name) {
+            Log.e("onBindingDied","---------------onBindingDied--------------");
+        }
+        @Override public void onNullBinding(ComponentName name) {
+            Log.e("onNullBinding","---------------onNullBinding--------------");
+        }
+    };
+
+    private void stopCountDownTimer(){
+        if (timer != null){
+            timer.cancel();
+            timer = null;
+        }
+    }
+    private void startCountDownTimer(){
+        timer = new CountDownTimer(COUNTDOWN_TIME, 1000) {
+            @SuppressLint("SetTextI18n")
+            @Override
+            public void onTick(long millisUntilFinished) {}
+
+            @Override
+            public void onFinish() {
+                stopCountDownTimer();
+                closeNum = 0;
+            }
+        };
+        timer.start();
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.hw.nativeapp.ui.activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.util.Log;
@@ -96,11 +97,11 @@ public class ScanCodePayActivity extends BaseActivity  {
 
     private void initPageView(){
         if (payStatus.equals("1")){
-            im_pay_result.setBackground(getResources().getDrawable(R.mipmap.code_ok));
+            im_pay_result.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.code_ok));
             tx_pay_result.setText("支付成功");
             code_btn.setVisibility(View.VISIBLE);
         } else if (payStatus.equals("3")) {
-            im_pay_result.setBackground(getResources().getDrawable(R.mipmap.code_not));
+            im_pay_result.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.code_not));
             tx_pay_result.setText("支付失败");
             code_btn.setVisibility(View.GONE);
         }

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

@@ -110,7 +110,6 @@ public class SelectInfoActivity extends BaseActivity  {
                 bundle.putString("seatTypeId", seatTypeId);
                 bundle.putString("goodsId", goodsId);
                 bundle.putString("salePeice", salePeice);
-                Log.e("salePeice","---------------salePeice--------------"+salePeice);
                 ActivityUtils.launchActivity(this, InfoEnterActivity.class, bundle);
                 break;
         }
@@ -245,18 +244,21 @@ public class SelectInfoActivity extends BaseActivity  {
             // 设置LinearLayout的布局参数
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
 //            layoutParams.width = 380;
-            layoutParams.setMargins(0, 10, 50, 30);
-            linearLayout.setPadding(50, 30, 50, 30);
+            layoutParams.setMargins(0, 10, 50, 20);
+            linearLayout.setPadding(50, 20, 50, 20);
             linearLayout.setOrientation(LinearLayout.VERTICAL);
             linearLayout.setLayoutParams(layoutParams);
 
             // 创建天TextView对象
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
+            textView.setPadding(0,10,0,0);
+            textView.setTextSize(11);
             textView.setText(DateUtils.getWeek(list.getJSONObject(i).getString("performDate")));
             // 创建时TextView对象
             TextView textView1 = new TextView(this);
-            textView1.setPadding(0,20,0,0);
+            textView1.setTextSize(11);
+            textView1.setPadding(0,10,0,0);
             textView1.setGravity(Gravity.CENTER);
             textView1.setText(list.getJSONObject(i).getString("performDate"));
 
@@ -302,14 +304,15 @@ public class SelectInfoActivity extends BaseActivity  {
             // 设置LinearLayout的布局参数
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
 //            layoutParams.width = 420;
-            layoutParams.setMargins(0, 40, 50, 30);
-            linearLayout.setPadding(50, 30, 50, 30);
+            layoutParams.setMargins(0, 30, 50, 20);
+            linearLayout.setPadding(50, 20, 50, 20);
             linearLayout.setOrientation(LinearLayout.VERTICAL);
             linearLayout.setLayoutParams(layoutParams);
 
             // 创建天TextView对象
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
+            textView.setTextSize(11);
             textView.setText(list.getJSONObject(i).getString("performTimeStart") + " - " + list.getJSONObject(i).getString("performTimeEnd"));
             performTimeId = list.getJSONObject(0).getString("id");
             linearLayout.setTag(list.getJSONObject(i).getString("id"));
@@ -349,14 +352,15 @@ public class SelectInfoActivity extends BaseActivity  {
             // 设置LinearLayout的布局参数
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
 //            layoutParams.width = 420;
-            layoutParams.setMargins(0, 40, 50, 30);
-            linearLayout.setPadding(50, 30, 50, 30);
+            layoutParams.setMargins(0, 30, 50, 20);
+            linearLayout.setPadding(50, 20, 50, 20);
             linearLayout.setOrientation(LinearLayout.VERTICAL);
             linearLayout.setLayoutParams(layoutParams);
 
             // 创建天TextView对象
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
+            textView.setTextSize(11);
             textView.setText(list.getJSONObject(i).getString("goodsName"));
 
             if(i == 0){
@@ -396,13 +400,14 @@ public class SelectInfoActivity extends BaseActivity  {
             // 设置LinearLayout的布局参数
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
 //            layoutParams.width = 420;
-            layoutParams.setMargins(0, 40, 50, 30);
-            linearLayout.setPadding(50, 30, 50, 30);
+            layoutParams.setMargins(0, 30, 50, 20);
+            linearLayout.setPadding(50, 20, 50, 20);
             linearLayout.setOrientation(LinearLayout.VERTICAL);
             linearLayout.setLayoutParams(layoutParams);
 
             // 创建天TextView对象
             TextView textView = new TextView(this);
+            textView.setTextSize(11);
             textView.setGravity(Gravity.CENTER);
             textView.setText(list.getJSONObject(i).getString("seatTypeName") + ": " + list.getJSONObject(i).getString("salePrice") + "元");
             if(i == 0){

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

@@ -13,6 +13,7 @@ import android.os.CountDownTimer;
 import android.os.IBinder;
 import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -42,6 +43,10 @@ public class TakeActivity extends BaseActivity  {
 
     @BindView(R.id.et_modify_quantity)
     TextView et_modify_quantity;
+    @BindView(R.id.img_idcard_btn)
+    ImageView img_idcard_btn;
+    @BindView(R.id.img_code_btn)
+    ImageView img_code_btn;
 
     private IDCardServiceAidl mService;
 
@@ -115,7 +120,7 @@ public class TakeActivity extends BaseActivity  {
             hasPermission = grantResults[0] == PackageManager.PERMISSION_GRANTED;
         }
     }
-    @OnClick({R.id.purchase_btn, R.id.num_01,R.id.num_02,R.id.num_03,R.id.num_04,R.id.num_05,R.id.num_06,R.id.num_07,R.id.num_08,R.id.num_09,R.id.num_0,R.id.num_empty,R.id.num_del})
+    @OnClick({R.id.purchase_btn, R.id.num_01,R.id.num_02,R.id.num_03,R.id.num_04,R.id.num_05,R.id.num_06,R.id.num_07,R.id.num_08,R.id.num_09,R.id.num_0,R.id.num_empty,R.id.num_del, R.id.img_idcard_btn, R.id.img_code_btn})
     public void onClick(View v){
         switch (v.getId()){
             case R.id.purchase_btn:
@@ -160,6 +165,23 @@ public class TakeActivity extends BaseActivity  {
                 String str = et_modify_quantity.getText().toString();
                 et_modify_quantity.setText(str.substring(0, str.length() - 1));
                 break;
+            case R.id.img_idcard_btn:
+                if (receiver != null){
+                    unregisterReceiver(receiver);
+                }
+                bindIDCardService();
+                break;
+            case R.id.img_code_btn:
+                if (mConnection != null) {
+                    try {
+                        unbindService(mConnection);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    mService = null;
+                }
+                registerReceiver();
+                break;
         }
     }
     private void jumpToLogin(){
@@ -187,6 +209,7 @@ public class TakeActivity extends BaseActivity  {
         timer.start();
     }
 
+    // 扫码成功
     private BroadcastReceiver receiver = new BroadcastReceiver()
     {
         @Override
@@ -195,7 +218,9 @@ public class TakeActivity extends BaseActivity  {
             String code = intent.getStringExtra("data");
             if (code != null && !code.isEmpty())
             {
-//                mCode.setText(code);
+                Bundle bundle = new Bundle();
+                bundle.putString("qrcodeNo", code);
+                ActivityUtils.launchActivity(TakeActivity.this, TicketCollectionActivity.class, bundle);
             }
         }
     };
@@ -219,14 +244,13 @@ public class TakeActivity extends BaseActivity  {
         public void onServiceConnected(ComponentName name, IBinder service) {
             mService = IDCardServiceAidl.Stub.asInterface(service);
             Log.e("id_card", " 服务已连接");
-//            Toast.makeText(TakeActivity.this, "服务已连接", Toast.LENGTH_SHORT).show();
+            Toast.makeText(TakeActivity.this, "请将身份证放置到指示位置！", Toast.LENGTH_SHORT).show();
         }
 
         @Override
         public void onServiceDisconnected(ComponentName name) {
             mService = null;
             Log.e("id_card", "服务已断开");
-            Toast.makeText(TakeActivity.this, "服务已断开", Toast.LENGTH_SHORT).show();
         }
     };
     public void auto(View view) {

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

@@ -60,6 +60,8 @@ public class TicketCollectionActivity extends BaseActivity  {
     TextView tx_noDataShow;
     @BindView(R.id.all_btn)
     CheckBox all_btn;
+    @BindView(R.id.txt_btn)
+    TextView txt_btn;
 
 
     public static final Integer COUNTDOWN_TIME = 120000;
@@ -120,7 +122,7 @@ public class TicketCollectionActivity extends BaseActivity  {
         super.onDestroy();
     }
 
-    @OnClick({R.id.print_btn,R.id.all_btn})
+    @OnClick({R.id.print_btn, R.id.all_btn, R.id.txt_btn})
     public void onClick(View v){
         switch (v.getId()){
             case R.id.print_btn:
@@ -132,6 +134,15 @@ public class TicketCollectionActivity extends BaseActivity  {
                 }
                 setDataList(true);
                 break;
+            case R.id.txt_btn:
+                boolean isChecked = false;
+                for (int i = 0; i < dataList.size(); i++) {
+                    isChecked = dataList.getJSONObject(i).getBoolean("checkedStatus") ? false : true;
+                    dataList.getJSONObject(i).put("checkedStatus", isChecked);
+                }
+                all_btn.setChecked(isChecked);
+                setDataList(true);
+                break;
         }
     }
 

app/src/main/java/com/hw/nativeapp/ui/activity/adapters/TicketCollectionAdapter.java

@@ -73,6 +73,7 @@ public class TicketCollectionAdapter extends RecyclerView.Adapter<RecyclerView.V
         normalHolder.iv_performName.setText(detailBean.performName);
         normalHolder.iv_performDate.setText(detailBean.performDate + " " + detailBean.performStart.substring(11, 16) + "-" + detailBean.performEnd.substring(11, 16));
         normalHolder.cb_check.setChecked(detailBean.checkedStatus);
+        normalHolder.iv_goodsName.setText(detailBean.goodsName);
 //        normalHolder.iv_performStart_performEnd.setText("场次 " + detailBean.performStart.substring(11, 16) + "-" + detailBean.performEnd.substring(11, 16));
         normalHolder.iv_seat.setText(detailBean.seatName + "(" +  detailBean.seatTypeName  +")");
         Picasso.with(mContext).load(detailBean.showImg).into(normalHolder.iv_showImg);

app/src/main/java/com/hw/nativeapp/ui/activity/holders/TicketCollectionHolder.java

@@ -19,7 +19,7 @@ public class TicketCollectionHolder extends RecyclerView.ViewHolder{
     public TextView iv_name;
     public ImageView iv_showImg;
     public CheckBox cb_check;
-//    public TextView purchase_btn;
+    public TextView iv_goodsName;
 
     public TicketCollectionHolder(@NonNull View itemView) {
         super(itemView);
@@ -31,6 +31,6 @@ public class TicketCollectionHolder extends RecyclerView.ViewHolder{
         iv_name = (TextView) itemView.findViewById(R.id.iv_name);
         cb_check = (CheckBox) itemView.findViewById(R.id.cb_check);
         iv_showImg = (ImageView) itemView.findViewById(R.id.iv_showImg);
-//        purchase_btn = (TextView) itemView.findViewById(R.id.purchase_btn);
+        iv_goodsName = (TextView) itemView.findViewById(R.id.iv_goodsName);
     }
 }

app/src/main/java/com/hw/nativeapp/utils/ImageUtils.java

@@ -69,7 +69,6 @@ public class ImageUtils {
             // 生成二维码图片的格式，使用ARGB_8888
             Bitmap bitmap = Bitmap.createBitmap(width, height,
                     Bitmap.Config.ARGB_8888);
-            Log.e("bitmap","---------------bitmap---bitmap-----------"+bitmap);
             bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
             return bitmap;
         } catch (WriterException e) {

app/src/main/res/drawable/title_bg.xml

@@ -5,5 +5,5 @@
         android:topRightRadius="0sp"
         android:bottomRightRadius="0sp"
         android:bottomLeftRadius="0sp"/>
-    <stroke android:width="1sp" android:color="@color/white" />
+    <stroke android:width="0sp" android:color="@color/white" />
 </shape>

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="信息录入"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -38,26 +38,25 @@
             android:layout_weight="1"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="15sp">
+            android:padding="30sp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
+                android:layout_marginTop="10sp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="30sp">
+                android:paddingBottom="20sp">
 
                 <TextView
-                    android:layout_width="280sp"
-                    android:layout_height="40sp"
-                    android:layout_weight="1"
+                    android:layout_width="210sp"
+                    android:layout_height="30sp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="请将身份证放置在读卡区！"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="13sp" />
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -80,7 +79,7 @@
                         android:layout_marginTop="10sp"
                         android:text="忘带身份证？"
                         android:textColor="@color/login_bk"
-                        android:textSize="18sp" />
+                        android:textSize="14sp" />
                 </LinearLayout>
             </LinearLayout>
 

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="信息录入"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -46,7 +46,6 @@
                     android:layout_height="match_parent"
                     android:layout_marginTop="20sp"
                     android:gravity="center"
-                    android:layout_weight="1"
                     android:orientation="horizontal">
                     <TextView
                         android:id="@+id/idCard_btn"
@@ -56,12 +55,13 @@
                         android:gravity="right"
                         android:text="姓名："
                         android:textColor="@color/black"
-                        android:textSize="16sp" />
+                        android:textSize="14sp" />
                     <EditText
                         android:id="@+id/et_name"
                         android:text="殷登顺"
                         android:layout_width="match_parent"
-                        android:layout_height="50sp"
+                        android:layout_height="40sp"
+                        android:textSize="14sp"
                         android:background="@android:drawable/edit_text"
                         android:hint="请输入" />
                 </LinearLayout>
@@ -71,7 +71,6 @@
                     android:layout_height="match_parent"
                     android:layout_marginTop="20sp"
                     android:gravity="center"
-                    android:layout_weight="1"
                     android:orientation="horizontal">
                     <TextView
                         android:layout_width="100sp"
@@ -81,12 +80,13 @@
                         android:text="身份证号码："
                         android:inputType="text"
                         android:textColor="@color/black"
-                        android:textSize="16sp" />
+                        android:textSize="14sp" />
                     <EditText
                         android:id="@+id/et_idcard"
                         android:layout_width="match_parent"
-                        android:layout_height="50sp"
+                        android:layout_height="40sp"
                         android:digits="0123456789 X"
+                        android:textSize="14sp"
                         android:text="520112198903170617"
                         android:background="@android:drawable/edit_text"
                         android:hint="请输入" />
@@ -103,8 +103,8 @@
 
                 <TextView
                     android:id="@+id/input_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_width="345dp"
+                    android:layout_height="40dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
@@ -112,7 +112,7 @@
                     android:text="确定"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="20sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -13,13 +13,13 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:title="自助取票"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -41,13 +41,14 @@
                 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="20sp" />
+                    android:textSize="15sp" />
             </LinearLayout>
         </LinearLayout>
 
@@ -70,18 +71,20 @@
                 android:paddingBottom="10sp">
 
                 <TextView
-                    android:layout_width="220sp"
-                    android:layout_height="40sp"
+                    android:id="@+id/tx_issue_txt"
+                    android:layout_width="190sp"
+                    android:layout_height="30sp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="注意出票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="20sp" />
+                    android:textSize="13sp" />
 
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/img_issue_tickets"
+                    android:layout_width="260dp"
+                    android:layout_height="150dp"
                     android:layout_marginTop="20sp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/issue_tickets" />
@@ -90,14 +93,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:layout_marginTop="15sp">
+                    android:layout_marginTop="35dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="正在为您打印"
                         android:textColor="@color/black"
-                        android:textSize="16sp" />
+                        android:textSize="13sp" />
 
                     <TextView
                         android:id="@+id/print_num"
@@ -105,14 +108,14 @@
                         android:layout_height="wrap_content"
                         android:text="1/8"
                         android:textColor="@color/login_bk"
-                        android:textSize="16sp" />
+                        android:textSize="13sp" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="张，请注意下方出票口取票..."
                         android:textColor="@color/black"
-                        android:textSize="16sp" />
+                        android:textSize="13sp" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -123,11 +126,12 @@
                     android:orientation="vertical">
 
                     <TextView
+                        android:id="@+id/tx_issue_not"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="未查询到购票信息，请核实！"
+                        android:text="本机小票不足，请联系工作人员"
                         android:textColor="@color/black"
-                        android:textSize="16sp" />
+                        android:textSize="15sp" />
 
                     <TextView
                         android:id="@+id/tx_customerMobile"
@@ -136,7 +140,7 @@
                         android:layout_marginTop="10sp"
                         android:text="客服电话：400-992-1888"
                         android:textColor="@color/login_bk"
-                        android:textSize="16sp" />
+                        android:textSize="13sp" />
                 </LinearLayout>
             </LinearLayout>
 

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

@@ -4,135 +4,172 @@
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="240sp"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/main_img"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@mipmap/main_top"
-            android:scaleType="fitXY" />
-    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="30sp"
-        android:layout_marginTop="300sp"
-        android:layout_marginRight="30sp"
         android:gravity="center"
         android:orientation="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="240dp"
             android:gravity="center"
+            android:orientation="vertical">
+            <ImageView
+                android:id="@+id/main_img"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="fitXY"
+                android:src="@mipmap/main_top" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="120dp"
+            android:layout_height="40dp"
+            android:gravity="left"
             android:orientation="horizontal">
-
+            <TextView
+                android:id="@+id/tx_top_hide"
+                android:layout_width="120dp"
+                android:layout_height="40dp"
+                android:layout_marginTop="5sp"
+                android:layout_weight="2"
+                android:gravity="left"
+                android:text=""
+                android:textColor="@color/black"
+                android:textSize="15sp" />
+        </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="30sp"
+            android:layout_marginTop="40dp"
+            android:layout_marginRight="30sp"
+            android:gravity="center"
+            android:orientation="vertical">
             <LinearLayout
-                android:id="@+id/take_btn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginRight="15sp"
-                android:layout_weight="1"
-                android:background="@mipmap/take_bj"
                 android:gravity="center"
-                android:orientation="vertical"
-                android:padding="30sp">
+                android:orientation="horizontal">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                <LinearLayout
+                    android:id="@+id/take_btn"
+                    android:layout_width="180dp"
+                    android:layout_height="200dp"
+                    android:layout_gravity="center"
+                    android:layout_marginRight="15dp"
                     android:layout_weight="1"
+                    android:background="@mipmap/take_bj"
                     android:gravity="center"
-                    android:text="自助取票"
-                    android:textColor="@color/white"
-                    android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:orientation="vertical"
+                    android:padding="30dp">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="10sp"
-                    android:gravity="center">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="自助取票"
+                        android:layout_marginTop="10dp"
+                        android:textColor="@color/white"
+                        android:textFontWeight="800"
+                        android:textSize="20sp" />
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="10dp"
+                        android:gravity="center">
+
+                        <ImageView
+                            android:layout_width="73dp"
+                            android:layout_height="70dp"
+                            android:scaleType="fitXY"
+                            android:src="@mipmap/take_icon" />
+                    </RelativeLayout>
+                </LinearLayout>
 
-                    <ImageView
-                        android:layout_width="wrap_content"
+                <LinearLayout
+                    android:id="@+id/purchase_btn"
+                    android:layout_width="180dp"
+                    android:layout_height="200dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="15dp"
+                    android:layout_weight="1"
+                    android:background="@mipmap/purchase_bj"
+                    android:gravity="center"
+                    android:orientation="vertical"
+                    android:padding="30dp">
+
+                    <TextView
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:scaleType="fitXY"
-                        android:src="@mipmap/take_icon" />
-                </RelativeLayout>
+                        android:gravity="center"
+                        android:text="自助购票"
+                        android:textColor="@color/white"
+                        android:layout_marginTop="10dp"
+                        android:textFontWeight="800"
+                        android:textSize="20sp" />
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="10sp"
+                        android:gravity="center">
+
+                        <ImageView
+                            android:layout_width="73dp"
+                            android:layout_height="70dp"
+                            android:scaleType="fitXY"
+                            android:src="@mipmap/purchase_icon" />
+                    </RelativeLayout>
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/purchase_btn"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginLeft="15sp"
-                android:layout_weight="1"
-                android:background="@mipmap/purchase_bj"
+                android:layout_marginTop="50dp"
                 android:gravity="center"
-                android:orientation="vertical"
-                android:padding="30sp">
+                android:orientation="vertical">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:id="@+id/paper_text"
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:gravity="center"
-                    android:text="自助购票"
-                    android:textColor="@color/white"
-                    android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:gravity="left"
+                    android:text=""
+                    android:textColor="@color/blue"
+                    android:textSize="15sp" />
 
-                <RelativeLayout
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="10sp"
-                    android:gravity="center">
-
-                    <ImageView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:scaleType="fitXY"
-                        android:src="@mipmap/purchase_icon" />
-                </RelativeLayout>
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:id="@+id/tx_customerMobile"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginTop="5sp"
+                        android:layout_weight="1"
+                        android:gravity="left"
+                        android:text="客服电话：0851-28256633"
+                        android:textColor="@color/black"
+                        android:textSize="15sp" />
+                    <TextView
+                        android:id="@+id/tx_hide"
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:layout_marginTop="5sp"
+                        android:layout_weight="2"
+                        android:gravity="left"
+                        android:text=""
+                        android:textColor="@color/black"
+                        android:textSize="15sp" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="60sp"
-            android:gravity="center"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/paper_text"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="剩余纸张：200张"
-                android:textColor="@color/blue"
-                android:textSize="20sp" />
-
-            <TextView
-                android:id="@+id/tx_customerMobile"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="5sp"
-                android:layout_weight="1"
-                android:gravity="left"
-                android:text="客服电话：0851-28256633"
-                android:textColor="@color/black"
-                android:textSize="20sp" />
-        </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="支付方式"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -47,21 +47,21 @@
                 android:gravity="center"
                 android:orientation="vertical"
                 android:paddingBottom="30sp">
-
+<!--                选择支付方式-->
                 <TextView
                     android:layout_width="280sp"
                     android:layout_height="40sp"
                     android:layout_weight="1"
                     android:gravity="center"
-                    android:text="选择支付方式"
+                    android:text="微信扫码支付"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="22sp" />
+                    android:textSize="15sp" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="45sp"
+                    android:layout_marginTop="25sp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -72,68 +72,76 @@
                         android:layout_weight="1"
                         android:layout_marginRight="15sp"
                         android:orientation="vertical">
-                        <ImageView
-                            android:id="@+id/wechat_pay"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:scaleType="fitXY" />
                         <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_marginTop="25sp"
+                            android:layout_width="235dp"
+                            android:layout_height="235dp"
                             android:gravity="center"
+                            android:background="@mipmap/eq_code_box"
                             android:orientation="horizontal">
                             <ImageView
+                                android:id="@+id/wechat_pay"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:scaleType="fitXY"
-                                android:layout_marginRight="5sp"
-                                android:src="@mipmap/weix_icon" />
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:gravity="center"
-                                android:text="微信支付"
-                                android:textColor="@color/black"
-                                android:textFontWeight="800"
-                                android:textSize="18sp" />
+                                android:src="@mipmap/eq_code_ing"
+                                android:scaleType="fitXY" />
                         </LinearLayout>
-                    </LinearLayout>
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:gravity="center"
-                        android:layout_marginLeft="15sp"
-                        android:layout_weight="1"
-                        android:orientation="vertical">
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:scaleType="fitXY"
-                            android:src="@mipmap/qr_code" />
                         <LinearLayout
-                            android:id="@+id/test_btn"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:layout_marginTop="25sp"
+                            android:layout_marginTop="35sp"
                             android:gravity="center"
                             android:orientation="horizontal">
                             <ImageView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
+                                android:layout_width="22dp"
+                                android:layout_height="22dp"
                                 android:scaleType="fitXY"
                                 android:layout_marginRight="5sp"
-                                android:src="@mipmap/zfb_icon" />
+                                android:src="@mipmap/weix_icon" />
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
-                                android:text="支付宝支付"
+                                android:text="微信支付"
                                 android:textColor="@color/black"
                                 android:textFontWeight="800"
-                                android:textSize="18sp" />
+                                android:textSize="14sp" />
                         </LinearLayout>
                     </LinearLayout>
+<!--                    <LinearLayout-->
+<!--                        android:layout_width="match_parent"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:gravity="center"-->
+<!--                        android:layout_marginLeft="15sp"-->
+<!--                        android:layout_weight="1"-->
+<!--                        android:orientation="vertical">-->
+<!--                        <ImageView-->
+<!--                            android:layout_width="wrap_content"-->
+<!--                            android:layout_height="wrap_content"-->
+<!--                            android:scaleType="fitXY"-->
+<!--                            android:src="@mipmap/qr_code" />-->
+<!--                        <LinearLayout-->
+<!--                            android:id="@+id/test_btn"-->
+<!--                            android:layout_width="match_parent"-->
+<!--                            android:layout_height="match_parent"-->
+<!--                            android:layout_marginTop="25sp"-->
+<!--                            android:gravity="center"-->
+<!--                            android:orientation="horizontal">-->
+<!--                            <ImageView-->
+<!--                                android:layout_width="wrap_content"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:scaleType="fitXY"-->
+<!--                                android:layout_marginRight="5sp"-->
+<!--                                android:src="@mipmap/zfb_icon" />-->
+<!--                            <TextView-->
+<!--                                android:layout_width="wrap_content"-->
+<!--                                android:layout_height="wrap_content"-->
+<!--                                android:gravity="center"-->
+<!--                                android:text="支付宝支付"-->
+<!--                                android:textColor="@color/black"-->
+<!--                                android:textFontWeight="800"-->
+<!--                                android:textSize="18sp" />-->
+<!--                        </LinearLayout>-->
+<!--                    </LinearLayout>-->
                 </LinearLayout>
             </LinearLayout>
 

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="信息录入"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -55,7 +55,7 @@
                         android:layout_below="@+id/tb_main_bar"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginTop="60sp"
+                        android:layout_marginTop="40sp"
                         android:gravity="center"
                         android:visibility="gone"
                         android:text="没有对应票据"/>
@@ -94,7 +94,7 @@
                     android:text="共2张, 合计"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="16sp" />
+                    android:textSize="12sp" />
                 <TextView
                     android:id="@+id/tx_total"
                     android:layout_width="wrap_content"
@@ -102,7 +102,7 @@
                     android:text="¥488"
                     android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="22sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -125,7 +125,7 @@
                     android:text="继续添加观影人"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="16sp" />
+                    android:textSize="14sp" />
                 <TextView
                     android:id="@+id/determine_btn"
                     android:layout_width="match_parent"
@@ -138,7 +138,7 @@
                     android:layout_marginLeft="20sp"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="16sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="扫码支付"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -59,7 +59,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="25sp"
+                    android:layout_marginTop="35sp"
                     android:gravity="center"
                     android:orientation="vertical">
                     <TextView
@@ -68,7 +68,7 @@
                         android:layout_height="wrap_content"
                         android:text="支付成功"
                         android:textColor="@color/login_bk"
-                        android:textSize="22sp" />
+                        android:textSize="15sp" />
                     <TextView
                         android:id="@+id/tx_pay_result_money"
                         android:layout_marginTop="10sp"
@@ -76,20 +76,19 @@
                         android:layout_height="wrap_content"
                         android:text="共2张，合计¥488"
                         android:textColor="@color/black"
-                        android:textSize="18sp" />
+                        android:textSize="12sp" />
                 </LinearLayout>
                 <TextView
                     android:id="@+id/code_btn"
                     android:layout_marginTop="30sp"
-                    android:layout_width="220sp"
-                    android:layout_height="40sp"
-                    android:layout_weight="1"
+                    android:layout_width="150sp"
+                    android:layout_height="30sp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="打印小票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="20sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
 
         </LinearLayout>

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

@@ -13,14 +13,15 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="选择信息"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
+
     <ScrollView
         android:id="@+id/sv"
         android:layout_width="match_parent"
@@ -35,6 +36,7 @@
             android:background="@drawable/bg_take"
             android:orientation="vertical"
             android:padding="15sp">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -43,7 +45,7 @@
                 android:text="演出信息"
                 android:textColor="@color/black"
                 android:textFontWeight="800"
-                android:textSize="22sp" />
+                android:textSize="15sp" />
 
             <!--演出时间-->
             <LinearLayout
@@ -51,6 +53,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20sp"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -58,16 +61,18 @@
                     android:gravity="left"
                     android:text="演出时间"
                     android:textColor="@color/black"
-                    android:textSize="18sp" />
+                    android:textSize="12sp" />
+
                 <HorizontalScrollView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+
                     <LinearLayout
+                        android:id="@+id/is_selectDate"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:isScrollContainer="true"
                         android:layout_marginTop="10sp"
-                        android:id="@+id/is_selectDate"
+                        android:isScrollContainer="true"
                         android:orientation="horizontal">
                         <!--                    <LinearLayout-->
                         <!--                        android:layout_width="120sp"-->
@@ -153,6 +158,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20sp"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -160,15 +166,17 @@
                     android:gravity="left"
                     android:text="演出场次"
                     android:textColor="@color/black"
-                    android:textSize="18sp" />
+                    android:textSize="12sp" />
+
                 <HorizontalScrollView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+
                     <LinearLayout
+                        android:id="@+id/is_selectTimes"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:isScrollContainer="true"
-                        android:id="@+id/is_selectTimes"
                         android:orientation="horizontal">
                         <!--                    <LinearLayout-->
                         <!--                        android:layout_width="match_parent"-->
@@ -210,83 +218,84 @@
                 </HorizontalScrollView>
             </LinearLayout>
             <!--演出厅-->
-<!--            <LinearLayout-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_marginTop="20sp"-->
-<!--                android:orientation="vertical">-->
-<!--                <TextView-->
-<!--                    android:layout_width="wrap_content"-->
-<!--                    android:layout_height="match_parent"-->
-<!--                    android:layout_weight="1"-->
-<!--                    android:gravity="left"-->
-<!--                    android:text="演出厅"-->
-<!--                    android:textColor="@color/black"-->
-<!--                    android:textSize="18sp" />-->
-<!--                <LinearLayout-->
-<!--                    android:layout_width="match_parent"-->
-<!--                    android:layout_height="wrap_content"-->
-<!--                    android:orientation="horizontal">-->
-<!--                    <LinearLayout-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_weight="1"-->
-<!--                        android:layout_marginTop="10sp"-->
-<!--                        android:layout_marginRight="10sp"-->
-<!--                        android:layout_marginBottom="10sp"-->
-<!--                        android:padding="10sp"-->
-<!--                        android:background="@drawable/bg_box_01"-->
-<!--                        android:orientation="vertical">-->
-<!--                        <TextView-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="match_parent"-->
-<!--                            android:layout_weight="1"-->
-<!--                            android:gravity="center"-->
-<!--                            android:text="演出厅1"-->
-<!--                            android:textColor="@color/black"-->
-<!--                            android:textSize="18sp" />-->
-<!--                    </LinearLayout>-->
-<!--                    <LinearLayout-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_margin="10sp"-->
-<!--                        android:layout_weight="1"-->
-<!--                        android:layout_marginLeft="10sp"-->
-<!--                        android:padding="10sp"-->
-<!--                        android:background="@drawable/bg_box_01"-->
-<!--                        android:orientation="vertical">-->
-<!--                        <TextView-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="match_parent"-->
-<!--                            android:gravity="center"-->
-<!--                            android:text="演出厅2"-->
-<!--                            android:textColor="@color/black"-->
-<!--                            android:textSize="18sp" />-->
-<!--                    </LinearLayout>-->
-<!--                    <LinearLayout-->
-<!--                        android:layout_width="match_parent"-->
-<!--                        android:layout_height="wrap_content"-->
-<!--                        android:layout_margin="10sp"-->
-<!--                        android:layout_weight="1"-->
-<!--                        android:background="@drawable/bg_box_01"-->
-<!--                        android:orientation="vertical">-->
-<!--                        <TextView-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="match_parent"-->
-<!--                            android:gravity="center"-->
-<!--                            android:text="演出厅3"-->
-<!--                            android:padding="10sp"-->
-<!--                            android:textColor="@color/black"-->
-<!--                            android:textSize="18sp" />-->
-<!--                    </LinearLayout>-->
-<!--                </LinearLayout>-->
-<!--            </LinearLayout>-->
+            <!--            <LinearLayout-->
+            <!--                android:layout_width="match_parent"-->
+            <!--                android:layout_height="wrap_content"-->
+            <!--                android:layout_marginTop="20sp"-->
+            <!--                android:orientation="vertical">-->
+            <!--                <TextView-->
+            <!--                    android:layout_width="wrap_content"-->
+            <!--                    android:layout_height="match_parent"-->
+            <!--                    android:layout_weight="1"-->
+            <!--                    android:gravity="left"-->
+            <!--                    android:text="演出厅"-->
+            <!--                    android:textColor="@color/black"-->
+            <!--                    android:textSize="18sp" />-->
+            <!--                <LinearLayout-->
+            <!--                    android:layout_width="match_parent"-->
+            <!--                    android:layout_height="wrap_content"-->
+            <!--                    android:orientation="horizontal">-->
+            <!--                    <LinearLayout-->
+            <!--                        android:layout_width="match_parent"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_weight="1"-->
+            <!--                        android:layout_marginTop="10sp"-->
+            <!--                        android:layout_marginRight="10sp"-->
+            <!--                        android:layout_marginBottom="10sp"-->
+            <!--                        android:padding="10sp"-->
+            <!--                        android:background="@drawable/bg_box_01"-->
+            <!--                        android:orientation="vertical">-->
+            <!--                        <TextView-->
+            <!--                            android:layout_width="match_parent"-->
+            <!--                            android:layout_height="match_parent"-->
+            <!--                            android:layout_weight="1"-->
+            <!--                            android:gravity="center"-->
+            <!--                            android:text="演出厅1"-->
+            <!--                            android:textColor="@color/black"-->
+            <!--                            android:textSize="18sp" />-->
+            <!--                    </LinearLayout>-->
+            <!--                    <LinearLayout-->
+            <!--                        android:layout_width="match_parent"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_margin="10sp"-->
+            <!--                        android:layout_weight="1"-->
+            <!--                        android:layout_marginLeft="10sp"-->
+            <!--                        android:padding="10sp"-->
+            <!--                        android:background="@drawable/bg_box_01"-->
+            <!--                        android:orientation="vertical">-->
+            <!--                        <TextView-->
+            <!--                            android:layout_width="match_parent"-->
+            <!--                            android:layout_height="match_parent"-->
+            <!--                            android:gravity="center"-->
+            <!--                            android:text="演出厅2"-->
+            <!--                            android:textColor="@color/black"-->
+            <!--                            android:textSize="18sp" />-->
+            <!--                    </LinearLayout>-->
+            <!--                    <LinearLayout-->
+            <!--                        android:layout_width="match_parent"-->
+            <!--                        android:layout_height="wrap_content"-->
+            <!--                        android:layout_margin="10sp"-->
+            <!--                        android:layout_weight="1"-->
+            <!--                        android:background="@drawable/bg_box_01"-->
+            <!--                        android:orientation="vertical">-->
+            <!--                        <TextView-->
+            <!--                            android:layout_width="match_parent"-->
+            <!--                            android:layout_height="match_parent"-->
+            <!--                            android:gravity="center"-->
+            <!--                            android:text="演出厅3"-->
+            <!--                            android:padding="10sp"-->
+            <!--                            android:textColor="@color/black"-->
+            <!--                            android:textSize="18sp" />-->
+            <!--                    </LinearLayout>-->
+            <!--                </LinearLayout>-->
+            <!--            </LinearLayout>-->
             <!--票务信息-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20sp"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -294,34 +303,36 @@
                     android:gravity="left"
                     android:text="票务信息"
                     android:textColor="@color/black"
-                    android:textSize="18sp" />
+                    android:textSize="12sp" />
+
                 <HorizontalScrollView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+
                     <LinearLayout
+                        android:id="@+id/is_goods"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:isScrollContainer="true"
-                        android:id="@+id/is_goods"
                         android:orientation="horizontal">
-<!--                        <LinearLayout-->
-<!--                            android:layout_width="150sp"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_marginTop="10sp"-->
-<!--                            android:layout_marginRight="10sp"-->
-<!--                            android:layout_marginBottom="10sp"-->
-<!--                            android:padding="10sp"-->
-<!--                            android:background="@drawable/bg_box_02"-->
-<!--                            android:orientation="vertical">-->
-<!--                            <TextView-->
-<!--                                android:layout_width="match_parent"-->
-<!--                                android:layout_height="match_parent"-->
-<!--                                android:layout_weight="1"-->
-<!--                                android:gravity="center"-->
-<!--                                android:text="演出票"-->
-<!--                                android:textColor="@color/login_bk"-->
-<!--                                android:textSize="18sp" />-->
-<!--                        </LinearLayout>-->
+                        <!--                        <LinearLayout-->
+                        <!--                            android:layout_width="150sp"-->
+                        <!--                            android:layout_height="wrap_content"-->
+                        <!--                            android:layout_marginTop="10sp"-->
+                        <!--                            android:layout_marginRight="10sp"-->
+                        <!--                            android:layout_marginBottom="10sp"-->
+                        <!--                            android:padding="10sp"-->
+                        <!--                            android:background="@drawable/bg_box_02"-->
+                        <!--                            android:orientation="vertical">-->
+                        <!--                            <TextView-->
+                        <!--                                android:layout_width="match_parent"-->
+                        <!--                                android:layout_height="match_parent"-->
+                        <!--                                android:layout_weight="1"-->
+                        <!--                                android:gravity="center"-->
+                        <!--                                android:text="演出票"-->
+                        <!--                                android:textColor="@color/login_bk"-->
+                        <!--                                android:textSize="18sp" />-->
+                        <!--                        </LinearLayout>-->
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
@@ -331,6 +342,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20sp"
                 android:orientation="vertical">
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
@@ -338,52 +350,54 @@
                     android:gravity="left"
                     android:text="类型选择"
                     android:textColor="@color/black"
-                    android:textSize="18sp" />
+                    android:textSize="12sp" />
+
                 <HorizontalScrollView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
+
                     <LinearLayout
+                        android:id="@+id/is_selectRegion"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:id="@+id/is_selectRegion"
                         android:isScrollContainer="true"
                         android:orientation="horizontal">
-<!--                        <LinearLayout-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_weight="1"-->
-<!--                            android:layout_marginTop="10sp"-->
-<!--                            android:layout_marginRight="10sp"-->
-<!--                            android:layout_marginBottom="10sp"-->
-<!--                            android:padding="10sp"-->
-<!--                            android:background="@drawable/bg_box_01"-->
-<!--                            android:orientation="vertical">-->
-<!--                            <TextView-->
-<!--                                android:layout_width="match_parent"-->
-<!--                                android:layout_height="match_parent"-->
-<!--                                android:layout_weight="1"-->
-<!--                                android:gravity="center"-->
-<!--                                android:text="普通票：120元"-->
-<!--                                android:textColor="@color/black"-->
-<!--                                android:textSize="18sp" />-->
-<!--                        </LinearLayout>-->
-<!--                        <LinearLayout-->
-<!--                            android:layout_width="match_parent"-->
-<!--                            android:layout_height="wrap_content"-->
-<!--                            android:layout_margin="10sp"-->
-<!--                            android:layout_weight="1"-->
-<!--                            android:layout_marginLeft="10sp"-->
-<!--                            android:padding="10sp"-->
-<!--                            android:background="@drawable/bg_box_01"-->
-<!--                            android:orientation="vertical">-->
-<!--                            <TextView-->
-<!--                                android:layout_width="match_parent"-->
-<!--                                android:layout_height="match_parent"-->
-<!--                                android:gravity="center"-->
-<!--                                android:text="贵宾票：120元"-->
-<!--                                android:textColor="@color/black"-->
-<!--                                android:textSize="18sp" />-->
-<!--                        </LinearLayout>-->
+                        <!--                        <LinearLayout-->
+                        <!--                            android:layout_width="match_parent"-->
+                        <!--                            android:layout_height="wrap_content"-->
+                        <!--                            android:layout_weight="1"-->
+                        <!--                            android:layout_marginTop="10sp"-->
+                        <!--                            android:layout_marginRight="10sp"-->
+                        <!--                            android:layout_marginBottom="10sp"-->
+                        <!--                            android:padding="10sp"-->
+                        <!--                            android:background="@drawable/bg_box_01"-->
+                        <!--                            android:orientation="vertical">-->
+                        <!--                            <TextView-->
+                        <!--                                android:layout_width="match_parent"-->
+                        <!--                                android:layout_height="match_parent"-->
+                        <!--                                android:layout_weight="1"-->
+                        <!--                                android:gravity="center"-->
+                        <!--                                android:text="普通票：120元"-->
+                        <!--                                android:textColor="@color/black"-->
+                        <!--                                android:textSize="18sp" />-->
+                        <!--                        </LinearLayout>-->
+                        <!--                        <LinearLayout-->
+                        <!--                            android:layout_width="match_parent"-->
+                        <!--                            android:layout_height="wrap_content"-->
+                        <!--                            android:layout_margin="10sp"-->
+                        <!--                            android:layout_weight="1"-->
+                        <!--                            android:layout_marginLeft="10sp"-->
+                        <!--                            android:padding="10sp"-->
+                        <!--                            android:background="@drawable/bg_box_01"-->
+                        <!--                            android:orientation="vertical">-->
+                        <!--                            <TextView-->
+                        <!--                                android:layout_width="match_parent"-->
+                        <!--                                android:layout_height="match_parent"-->
+                        <!--                                android:gravity="center"-->
+                        <!--                                android:text="贵宾票：120元"-->
+                        <!--                                android:textColor="@color/black"-->
+                        <!--                                android:textSize="18sp" />-->
+                        <!--                        </LinearLayout>-->
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
@@ -392,22 +406,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="25sp"
-                android:gravity="center"
-                android:paddingBottom="30sp"
-                android:orientation="horizontal">
+                android:gravity="center">
 
                 <TextView
                     android:id="@+id/select_btn"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:padding="10sp"
                     android:text="确定"
+                    android:padding="10dp"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="20sp" />
+                    android:textSize="15sp" />
             </LinearLayout>
         </LinearLayout>
 

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="自助取票"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -31,8 +31,8 @@
 
         <LinearLayout
             android:id="@+id/take_btn"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_width="230dp"
+            android:layout_height="400dp"
             android:layout_gravity="center"
             android:layout_marginRight="15sp"
             android:layout_weight="1"
@@ -42,25 +42,24 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="10sp"
-                android:paddingTop="10sp"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text="取票码/手机号取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="20sp" />
+                    android:textSize="15sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="40dp"
                 android:layout_marginTop="20sp"
                 android:gravity="center"
                 android:orientation="horizontal">
@@ -68,8 +67,11 @@
                 <EditText
                     android:id="@+id/et_modify_quantity"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="40dp"
                     android:enabled="true"
+                    android:focusable="false"
+                    android:textSize="12sp"
+                    android:paddingLeft="10dp"
                     android:background="@android:drawable/edit_text"
                     android:hint="取票码/手机号取票"
                     android:text="0076425742"
@@ -79,15 +81,15 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="30sp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_01"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40dp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -97,12 +99,12 @@
                     android:text="1"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/num_02"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -112,12 +114,12 @@
                     android:text="2"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/num_03"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
@@ -126,20 +128,20 @@
                     android:text="3"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="10sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_04"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -149,12 +151,12 @@
                     android:text="4"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/num_05"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -164,12 +166,12 @@
                     android:text="5"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/num_06"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
@@ -178,20 +180,20 @@
                     android:text="6"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="10sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_07"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -201,12 +203,12 @@
                     android:text="7"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/num_08"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -216,12 +218,12 @@
                     android:text="8"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/num_09"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
@@ -230,20 +232,20 @@
                     android:text="9"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="10sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_0"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -253,12 +255,12 @@
                     android:text="0"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="24sp" />
+                    android:textSize="18sp" />
 
                 <TextView
                     android:id="@+id/num_empty"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_marginRight="10sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -267,12 +269,12 @@
                     android:paddingBottom="5sp"
                     android:text="清空"
                     android:textColor="@color/blue"
-                    android:textSize="18sp" />
+                    android:textSize="12sp" />
 
                 <TextView
                     android:id="@+id/num_del"
-                    android:layout_width="wrap_content"
-                    android:layout_height="50sp"
+                    android:layout_width="50dp"
+                    android:layout_height="40sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
@@ -280,44 +282,42 @@
                     android:paddingBottom="7sp"
                     android:text="删除"
                     android:textColor="@color/blue"
-                    android:textSize="18sp" />
+                    android:textSize="12sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
+                android:layout_height="30dp"
+                android:layout_marginTop="15sp"
                 android:gravity="center"
-                android:paddingBottom="20sp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/purchase_btn"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="30dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:padding="10sp"
                     android:text="立即购票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="20sp" />
+                    android:textSize="13sp" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_width="230dp"
+            android:layout_height="400dp"
             android:layout_marginLeft="15sp"
             android:layout_weight="1"
             android:background="@drawable/bg_take"
+            android:padding="15sp"
             android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="10sp"
-                android:paddingTop="10sp"
                 android:gravity="center">
 
                 <TextView
@@ -328,13 +328,13 @@
                     android:text="二维码/身份证取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="20sp" />
+                    android:textSize="15sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10sp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="15sp"
                 android:gravity="center">
 
                 <TextView
@@ -343,23 +343,30 @@
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text="请选择二维码/身份证对准扫码区域"
-                    android:textColor="@color/blue"
+                    android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="9sp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10sp"
-                android:gravity="center"
-                android:padding="15sp">
-
+                android:layout_height="300dp"
+                android:layout_marginTop="25sp"
+                android:gravity="top"
+                android:orientation="vertical">
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:id="@+id/img_code_btn"
+                    android:layout_width="140dp"
+                    android:layout_height="110dp"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/take_code" />
+                <ImageView
+                    android:layout_marginTop="20dp"
+                    android:id="@+id/img_idcard_btn"
+                    android:layout_width="140dp"
+                    android:layout_height="110dp"
                     android:scaleType="fitXY"
-                    android:src="@mipmap/idcard_demonstrate" />
+                    android:src="@mipmap/take_idcard" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="自助取票"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="自助取票"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -51,9 +51,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_below="@+id/tb_main_bar"
-                    android:layout_marginTop="60sp"
+                    android:padding="40dp"
                     android:gravity="center"
                     android:text="没有对应票据"
+                    android:textSize="14sp"
                     android:visibility="gone" />
 
                 <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -78,14 +79,14 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="80sp"
+        android:layout_height="60sp"
         android:layout_alignParentBottom="true"
         android:layout_marginTop="25sp"
-        android:gravity="center|bottom"
-        android:orientation="horizontal"
         android:background="@drawable/bg_take"
-        android:padding="20sp"
-        android:paddingBottom="10sp">
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="20sp"
+        android:paddingRight="20sp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -95,36 +96,36 @@
 
             <CheckBox
                 android:id="@+id/all_btn"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="30dp"
+                android:layout_height="match_parent"
                 android:layout_centerInParent="true" />
 
             <TextView
+                android:id="@+id/txt_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="全选"
                 android:textColor="@color/black"
-                android:textSize="18sp" />
+                android:textSize="14sp" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/print_btn"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
+                android:layout_height="40dp"
                 android:layout_marginLeft="20sp"
                 android:background="@drawable/bg_btn_01"
                 android:gravity="center"
-                android:padding="10sp"
                 android:text="确定打印"
                 android:textColor="@color/white"
                 android:textFontWeight="800"
-                android:textSize="16sp" />
+                android:textSize="13sp" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

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

@@ -13,14 +13,14 @@
         android:background="@drawable/title_bg"
         app:leftColor="@color/white"
         app:leftIcon="@mipmap/left_icon"
-        app:leftSize="18sp"
+        app:leftSize="15sp"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="18sp"
+        app:rightSize="15sp"
         app:rightTitle="120s"
         app:title="自助购票"
         app:titleColor="@color/white"
-        app:titleSize="20sp" />
+        app:titleSize="18sp" />
     <ScrollView
         android:id="@+id/sv"
         android:layout_width="match_parent"

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

@@ -32,7 +32,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="输入设备号"
-                    android:textSize="20sp"
+                    android:textSize="15sp"
                     android:textColor="#333333" />
             </LinearLayout>
 
@@ -55,6 +55,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:hint="请输入设备号"
+                    android:textSize="14sp"
                     android:background="@android:drawable/edit_text" />
 
             </LinearLayout>
@@ -69,21 +70,21 @@
                 <TextView
                     android:id="@+id/btnup_enter"
                     android:layout_width="80dp"
-                    android:layout_height="40dp"
+                    android:layout_height="30dp"
                     android:gravity="center"
                     android:text="确定"
-                    android:textSize="20sp"
+                    android:textSize="15sp"
                     android:textColor="@color/white"
                     android:background="@drawable/bg_corners_04"/>
 
                 <TextView
                     android:id="@+id/btnup_cancel"
                     android:layout_width="80dp"
-                    android:layout_height="40dp"
+                    android:layout_height="30dp"
                     android:gravity="center"
                     android:layout_marginStart="@dimen/dp_40"
                     android:text="取消"
-                    android:textSize="20sp"
+                    android:textSize="15sp"
                     android:textColor="@color/black"
                     android:background="@drawable/bg_corners_03"/>
 

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

@@ -10,7 +10,7 @@
 
     <RelativeLayout
         android:layout_width="300dp"
-        android:layout_height="180dp"
+        android:layout_height="160dp"
         android:background="@drawable/bg_corners_01"
         android:orientation="vertical">
 
@@ -30,8 +30,8 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="出库数量"
-                    android:textSize="20sp"
+                    android:text="温馨提示"
+                    android:textSize="14sp"
                     android:textColor="#333333" />
             </LinearLayout>
 
@@ -44,23 +44,22 @@
 
                 android:layout_marginStart="@dimen/dp_10"
                 android:layout_marginEnd="@dimen/dp_10"
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="20dp"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <EditText
-                    android:id="@+id/et_modify_quantity"
-                    android:layout_width="match_parent"
+                <TextView
+                    android:id="@+id/et_modifycontent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:hint="请输入"
-                    android:inputType="number"
-                    android:background="@android:drawable/edit_text" />
-
+                    android:text="是否关闭当前应用"
+                    android:textSize="15sp"
+                    android:textColor="#333333" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_marginTop="10dp"
+                android:layout_marginTop="20dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -69,21 +68,21 @@
                 <TextView
                     android:id="@+id/btn_quantity_enter"
                     android:layout_width="80dp"
-                    android:layout_height="40dp"
+                    android:layout_height="30dp"
                     android:gravity="center"
                     android:text="确定"
-                    android:textSize="20sp"
+                    android:textSize="14sp"
                     android:textColor="@color/white"
                     android:background="@drawable/bg_corners_04"/>
 
                 <TextView
                     android:id="@+id/btn_quantity_cancel"
                     android:layout_width="80dp"
-                    android:layout_height="40dp"
+                    android:layout_height="30dp"
                     android:gravity="center"
                     android:layout_marginStart="@dimen/dp_40"
                     android:text="取消"
-                    android:textSize="20sp"
+                    android:textSize="14sp"
                     android:textColor="@color/black"
                     android:background="@drawable/bg_corners_03"/>
 

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

@@ -10,7 +10,7 @@
         android:layout_margin="10sp"
         android:layout_width="match_parent"
         android:orientation="vertical"
-        android:padding="20sp"
+        android:padding="15sp"
         android:background="@drawable/bg_info_01"
         android:layout_height="wrap_content">
         <LinearLayout
@@ -29,7 +29,7 @@
                     android:text="姓名"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="14sp" />
                 <TextView
                     android:id="@+id/tv_name"
                     android:layout_weight="3"
@@ -39,7 +39,7 @@
                     android:text="张三"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
             <LinearLayout
                 android:layout_marginTop="10sp"
@@ -54,7 +54,7 @@
                     android:text="身份证"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="14sp" />
                 <TextView
                     android:id="@+id/tv_id_card"
                     android:layout_weight="3"
@@ -64,7 +64,7 @@
                     android:text="520************4153"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="14sp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -10,30 +10,28 @@
         android:layout_margin="10sp"
         android:layout_width="match_parent"
         android:orientation="vertical"
-        android:padding="20sp"
+        android:padding="15sp"
         android:background="@drawable/bg_info_01"
         android:layout_height="wrap_content">
         <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:orientation="horizontal"
             android:layout_height="wrap_content">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:orientation="vertical"
-                android:layout_weight="4"
                 android:gravity="center_vertical"
                 android:layout_height="match_parent">
                 <CheckBox
                     android:id="@+id/cb_check"
-                    android:layout_width="wrap_content"
+                    android:layout_width="30dp"
                     android:layout_centerInParent="true"
-                    android:layout_height="wrap_content" />
+                    android:layout_height="30dp" />
             </LinearLayout>
             <LinearLayout
-                android:layout_weight="3"
-                android:layout_width="match_parent"
+                android:layout_width="86dp"
                 android:layout_marginLeft="10sp"
-                android:layout_height="wrap_content">
+                android:layout_height="130dp">
                 <ImageView
                     android:id="@+id/iv_showImg"
                     android:layout_width="wrap_content"
@@ -42,9 +40,8 @@
                     android:src="@mipmap/ticket_img" />
             </LinearLayout>
             <LinearLayout
-                android:layout_weight="2"
                 android:layout_width="match_parent"
-                android:layout_marginLeft="10sp"
+                android:layout_marginLeft="15sp"
                 android:orientation="vertical"
                 android:layout_height="wrap_content">
                 <TextView
@@ -55,7 +52,7 @@
                     android:text="《伟大转折》-【成人票】"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="14sp" />
                 <TextView
                     android:id="@+id/iv_performDate"
                     android:layout_marginTop="5sp"
@@ -65,7 +62,17 @@
                     android:text="日期 2023-11-27"
                     android:textColor="@color/gray"
                     android:textFontWeight="800"
-                    android:textSize="16sp" />
+                    android:textSize="12sp" />
+                <TextView
+                    android:id="@+id/iv_goodsName"
+                    android:layout_marginTop="5sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="left"
+                    android:text="普通票"
+                    android:textColor="@color/gray"
+                    android:textFontWeight="800"
+                    android:textSize="12sp" />
 <!--                <TextView-->
 <!--                    android:id="@+id/iv_performStart_performEnd"-->
 <!--                    android:layout_marginTop="5sp"-->
@@ -85,17 +92,17 @@
                     android:text="居民票（贵宾票）"
                     android:textColor="@color/gray"
                     android:textFontWeight="800"
-                    android:textSize="16sp" />
+                    android:textSize="12sp" />
                 <TextView
                     android:id="@+id/iv_name"
-                    android:layout_marginTop="20sp"
+                    android:layout_marginTop="30sp"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="left"
                     android:text="张三 "
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="13sp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -10,7 +10,7 @@
         android:layout_margin="10sp"
         android:layout_width="match_parent"
         android:orientation="vertical"
-        android:padding="20sp"
+        android:padding="15sp"
         android:background="@drawable/bg_take"
         android:layout_height="wrap_content">
         <LinearLayout
@@ -19,10 +19,9 @@
             android:background="@drawable/bg_take"
             android:layout_height="wrap_content">
             <LinearLayout
-                android:layout_weight="2"
-                android:layout_width="match_parent"
+                android:layout_width="100dp"
                 android:background="@drawable/bg_take"
-                android:layout_height="wrap_content">
+                android:layout_height="130dp">
                 <ImageView
                     android:id="@+id/ip_showImg"
                     android:layout_width="wrap_content"
@@ -33,7 +32,7 @@
             <LinearLayout
                 android:layout_weight="1"
                 android:layout_width="match_parent"
-                android:layout_marginLeft="10sp"
+                android:layout_marginLeft="15sp"
                 android:orientation="vertical"
                 android:background="@drawable/bg_take"
                 android:layout_height="wrap_content">
@@ -42,23 +41,21 @@
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="left"
-                    android:text="《伟大转折》-【成人票】"
+                    android:text="《伟大转折》-【成人成人票票】"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="15sp" />
                 <TextView
                     android:layout_marginTop="60sp"
                     android:id="@+id/purchase_btn"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
+                    android:layout_width="130dp"
+                    android:layout_height="30dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:padding="10sp"
                     android:text="立即购票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="15sp" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>