测试bug修改和测试需求添加

app/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
     <uses-permission android:name="android.hardware.camera" />
     <uses-permission android:name="android.hardware.camera.autofocus" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
-
+    <uses-permission android:name="com.sunmi.idcard.permission.ACCESS_SERVICE" />
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.CALL_PHONE"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>

app/src/main/java/com/hw/nativeapp/httpnet/ApiService.java

@@ -104,6 +104,13 @@ public interface ApiService {
             @Query("t") Long currtime
     );
 
+    // 订单支付码支付
+    @POST(COMMON + "/order/orderInfo/gotoMicroPay")
+    Observable<ResponseData<JSONObject>> gotoMicroPay(
+            @Body JSONObject bean,
+            @Query("t") Long currtime
+    );
+
     // 支付查询
     @POST(COMMON + "/order/orderInfo/payQuery")
     Observable<ResponseData<JSONObject>> payQuery(

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

@@ -39,12 +39,12 @@ import butterknife.BindView;
 
 public class IssueTicketsActivity extends BaseActivity  {
 
-    public static final Integer COUNTDOWN_TIME = 120000;
+    public static final Integer COUNTDOWN_TIME = 12000;
     private CountDownTimer timer;
     private TitleBar titleBar;
 
-    @BindView(R.id.print_num)
-    TextView print_num;
+//    @BindView(R.id.print_num)
+//    TextView print_num;
     @BindView(R.id.tx_customerMobile)
     TextView tx_customerMobile;
     @BindView(R.id.tx_issue_status_text)
@@ -91,6 +91,7 @@ public class IssueTicketsActivity extends BaseActivity  {
         selfIndex();
         getPageTransmitParams();
         bindExtPrinterService();
+//        initPageView();
     }
     @Override
     protected void onStop() {
@@ -119,7 +120,7 @@ public class IssueTicketsActivity extends BaseActivity  {
     private void getPageTransmitParams(){
         Intent transmitIntent = getIntent();
         viewerList = JSONArray.parseArray(transmitIntent.getStringExtra("viewerList"));
-        print_num.setText(printNum +"/"+viewerList.size());
+//        print_num.setText(printNum +"/"+viewerList.size());
         String [] list = new String[viewerList.size()];
         for (int i = 0; i < viewerList.size(); i++) {
             list[i] =  viewerList.getJSONObject(i).getString("id");
@@ -127,15 +128,16 @@ public class IssueTicketsActivity extends BaseActivity  {
     }
 
     private void initPageView() {
-        print_num.setText(printNum +"/"+viewerList.size());
+//        print_num.setText(printNum +"/"+viewerList.size());
         getTicketOut();
     }
 
     // 出票完成
     private void finishView() {
+        Toast.makeText(IssueTicketsActivity.this, "出票完成！", Toast.LENGTH_SHORT).show();
         tx_issue_status_text.setText("出票完成～");
         tx_issue_txt.setText("请取票！");
-        img_issue_tickets.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.ticket_collection));
+//        img_issue_tickets.setImageBitmap(BitmapFactory.decodeResource(getResources(), R.mipmap.ticket_collection));
     }
 
     private void selfIndex(){
@@ -158,7 +160,7 @@ public class IssueTicketsActivity extends BaseActivity  {
         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");
+            list[i] = viewerList.getJSONObject(i).getString("id");
         }
         options.put("viewerList", list);
         MApplication.getApiService().ticketout( options, System.currentTimeMillis() / 1000)
@@ -180,6 +182,7 @@ public class IssueTicketsActivity extends BaseActivity  {
 
     // 开始打印
     private void startPrinting(JSONObject obj) throws RemoteException {
+//        print_num.setText(printNum +"/"+viewerList.size());
         /*
         * 打印机状态
         * -1 打印机脱机或打印服务还未连接打印机
@@ -190,7 +193,7 @@ public class IssueTicketsActivity extends BaseActivity  {
         * 4 打印机过热
         * */
         int printerStatus = ext.getPrinterStatus(); //
-        Log.e("printerStatus","---------------printerStatus--------------"+printerStatus);
+        Toast.makeText(IssueTicketsActivity.this, "printerStatus！" + printerStatus, Toast.LENGTH_SHORT).show();
         if(printerStatus == 2) {
             tx_issue_not.setVisibility(View.VISIBLE);
             tx_issue_txt.setVisibility(View.GONE);
@@ -201,75 +204,79 @@ public class IssueTicketsActivity extends BaseActivity  {
             Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
             return;
         }
-        ext.startTransBuffer(); //启⽤事务模式
         JSONArray rowItem = obj.getJSONArray("printList");
-        for (int i = 0; i < rowItem.size(); i++) {
-            // 打印文本
-            if(rowItem.getJSONObject(i).getString("printType").equals("text")){
-                int hori = rowItem.getJSONObject(i).getInteger("hori");
-                int veri = rowItem.getJSONObject(i).getInteger("veri");
-                ext.setFontZoom(hori, veri);
-                // 对其方式
-                int alignMode = rowItem.getJSONObject(i).getInteger("alignMode");
-                ext.setAlignMode(alignMode);
-
-                ext.printText(rowItem.getJSONObject(i).getString("printContent"));
-            }
-            // 打印二维码
-            if(rowItem.getJSONObject(i).getString("printType").equals("qrcode")){
-                // 对其方式
-                int alignMode = rowItem.getJSONObject(i).getInteger("alignMode");
-                ext.setAlignMode(alignMode);
+        if(rowItem != null && rowItem.size() > 0) {
+            ext.startTransBuffer(); //启⽤事务模式
+            for (int i = 0; i < rowItem.size(); i++) {
+                // 打印文本
+                if(rowItem.getJSONObject(i).getString("printType").equals("text")){
+                    int hori = rowItem.getJSONObject(i).get("hori") == null ? 1 : rowItem.getJSONObject(i).getInteger("hori");
+                    int veri = rowItem.getJSONObject(i).get("veri")== null ? 1 : rowItem.getJSONObject(i).getInteger("veri");
+                    ext.setFontZoom(hori, veri);
+                    // 对其方式
+                    int alignMode =rowItem.getJSONObject(i).get("alignMode") == null ? 1 : rowItem.getJSONObject(i).getInteger("alignMode");
+                    ext.setAlignMode(alignMode);
+                    ext.printText(rowItem.getJSONObject(i).getString("printContent"));
+                }
+                // 打印二维码
+                if(rowItem.getJSONObject(i).getString("printType").equals("qrcode")){
+                    // 对其方式
+                    int alignMode = rowItem.getJSONObject(i).get("alignMode") == null ? 1 : rowItem.getJSONObject(i).getInteger("alignMode");
+                    ext.setAlignMode(alignMode);
 
-                String eqCode = rowItem.getJSONObject(i).getString("printContent");
-                int qrcodeSize = rowItem.getJSONObject(i).getInteger("qrcodeSize");
-                ext.printQrCode(eqCode, qrcodeSize, 0);
-            }
-            // 打印条形码
-            if(rowItem.getJSONObject(i).getString("printType").equals("barCode")){
-                // 对其方式
-                int alignMode = rowItem.getJSONObject(i).getInteger("alignMode");
-                ext.setAlignMode(alignMode);
+                    String eqCode = rowItem.getJSONObject(i).get("printContent") == null ? "" : rowItem.getJSONObject(i).getString("printContent");
+                    int qrcodeSize = rowItem.getJSONObject(i).get("qrcodeSize") == null ? 0 : rowItem.getJSONObject(i).getInteger("qrcodeSize");
+                    ext.printQrCode(eqCode, qrcodeSize, 0);
+                }
+                // 打印条形码
+                if(rowItem.getJSONObject(i).getString("printType").equals("barCode")){
+                    // 对其方式
+                    int alignMode = rowItem.getJSONObject(i).get("alignMode") == null ? 0 : rowItem.getJSONObject(i).getInteger("alignMode");
+                    ext.setAlignMode(alignMode);
 
-                String barCode = rowItem.getJSONObject(i).getString("printContent");
-                int barCodeType = rowItem.getJSONObject(i).getInteger("barCodeType");
-                int width = rowItem.getJSONObject(i).getInteger("width");
-                int height = rowItem.getJSONObject(i).getInteger("height");
-                ext.printBarCode(barCode, barCodeType, width, height, 1);
-            }
-            // 打印走纸
-            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);
+                    String barCode = rowItem.getJSONObject(i).get("printContent") == null ? "" :  rowItem.getJSONObject(i).getString("printContent");
+                    int barCodeType = rowItem.getJSONObject(i).get("barCodeType") == null ? 0 :  rowItem.getJSONObject(i).getInteger("barCodeType");
+                    int width =rowItem.getJSONObject(i).get("width") == null ? 0 :  rowItem.getJSONObject(i).getInteger("width");
+                    int height = rowItem.getJSONObject(i).get("height") == null ? 0 :  rowItem.getJSONObject(i).getInteger("height");
+                    ext.printBarCode(barCode, barCodeType, width, height, 1);
+                }
+                // 打印走纸
+                if(rowItem.getJSONObject(i).getString("printType").equals("wrpe")){
+                    // 走纸类型: 1-按行 2-按像素
+                    int wrapType = rowItem.getJSONObject(i).get("wrapType") == null ? 0 : rowItem.getJSONObject(i).getInteger("wrapType");
+                    int wrapLen = rowItem.getJSONObject(i).get("wrapLen") == null ? 0 :  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 cutPx = rowItem.getJSONObject(i).get("cutPx") == null ? 0 : rowItem.getJSONObject(i).getInteger("cutPx");
+                    int cutType = rowItem.getJSONObject(i).get("cutType") == null ? 0 : rowItem.getJSONObject(i).getInteger("cutType");
+                    ext.cutPaper(cutType, cutPx);
                 }
             }
-            // 打印切纸
-            if(rowItem.getJSONObject(i).getString("printType").equals("cut")){
-                int wrapLen = rowItem.getJSONObject(i).getInteger("wrapLen");
-                ext.cutPaper(wrapLen, 0);
+            ext.endTransBuffer(); //结束事务模式
+//            Boolean endTransBuffer = ext.endTransBuffer(); //结束事务模式
+//            Toast.makeText(IssueTicketsActivity.this, "endTransBuffer！" + endTransBuffer, Toast.LENGTH_SHORT).show();
+//            if(!endTransBuffer){
+//                tx_issue_status_text.setText("打印失败,请检查打印机请联系工作人员");
+//                tx_issue_txt.setText("打印失败");
+//                Toast.makeText(IssueTicketsActivity.this, "打印失败", Toast.LENGTH_SHORT).show();
+//                return;
+//            }
+            Toast.makeText(IssueTicketsActivity.this, "printNum: " + printNum, Toast.LENGTH_SHORT).show();
+            if(printNum  < viewerList.size()){
+                //  打印完成，开始打印下一张
+                printNum++;
+                startPrinting(printInfo.getJSONObject(printNum - 1));
+            } else {
+                finishView();
             }
-        }
-        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()){
-            print_num.setText(printNum +"/"+viewerList.size());
-            startPrinting(viewerList.getJSONObject(printNum - 1));
         } else {
-            finishView();
+            Toast.makeText(IssueTicketsActivity.this, "打印小票数据为空！" + rowItem, Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -286,17 +293,10 @@ public class IssueTicketsActivity extends BaseActivity  {
                 service) {
             ext = ExtPrinterService.Stub.asInterface(service);
             initPageView();
-            Log.e("onServiceConnected","---------------onServiceConnected--------------");
-        }
-        @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--------------");
         }
+        @Override public void onServiceDisconnected(ComponentName name) {}
+        @Override public void onBindingDied(ComponentName name) {}
+        @Override public void onNullBinding(ComponentName name) {}
     };
 
 }

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

@@ -1,6 +1,9 @@
 package com.hw.nativeapp.ui.activity;
 import android.annotation.SuppressLint;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -8,6 +11,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -67,6 +71,7 @@ public class PaymentMethodActivity extends BaseActivity  {
         });
         getPageTransmitParams();
         getGotoNativePay();
+        registerReceiver();
         startCountDownTimer();
     }
     @Override
@@ -75,6 +80,35 @@ public class PaymentMethodActivity extends BaseActivity  {
         setContentView(R.layout.activity_payment_method);
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        stopOrderCountDownTimer();
+        if (receiver != null){
+            if (receiver != null){
+                try {
+                    unregisterReceiver(receiver);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        stopOrderCountDownTimer();
+        if (receiver != null){
+            if (receiver != null){
+                try {
+                    unregisterReceiver(receiver);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
     //获取页面传递参数
     private void getPageTransmitParams(){
         Intent transmitIntent = getIntent();
@@ -150,6 +184,86 @@ public class PaymentMethodActivity extends BaseActivity  {
                 }, new ErrorConsumer());
     }
 
+    // 扫码成功
+    private BroadcastReceiver receiver = new BroadcastReceiver()
+    {
+        @Override
+        public void onReceive(Context context, Intent intent)
+        {
+            String code = intent.getStringExtra("data");
+            if (code != null && !code.isEmpty())
+            {
+                gotoMicroPay(code);
+            }
+        }
+    };
+    // 扫码订单支付
+    private void gotoMicroPay(String authCode){
+        JSONObject options = new JSONObject();
+        options.put("orderId", orderId);
+        options.put("authCode", authCode);
+        MApplication.getApiService().gotoNativePay( options, System.currentTimeMillis() / 1000)
+                .compose(RxUtil.applyObservableAsync())
+                .subscribe(new ResponseConsumer<JSONObject>() {
+                    @Override
+                    public void onSuccess(JSONObject data) {
+                        orderCountDownTimer();
+                    }
+
+                    @Override
+                    public void onFailed(int code, String msg) {
+
+                    }
+                }, new ErrorConsumer());
+    }
+    // 扫码注册
+    private void registerReceiver()
+    {
+
+        Intent intent = new Intent();
+        intent.setAction("com.sunmi.scanner.ACTION_BAR_DEVICES_SETTING");
+        intent.putExtra("name","Point of Sale Fixed Barcode Scanner.");
+        intent.putExtra("pid",193);
+        intent.putExtra("vid",12879);
+        intent.putExtra("type",2); //1 KeyEvent 输出 2 广播输出
+        intent.putExtra("toast",false);
+        this.sendBroadcast(intent);
+
+        IntentFilter fifilter = new IntentFilter();
+        fifilter.addAction("com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED");
+        registerReceiver(receiver, fifilter);
+        Toast.makeText(PaymentMethodActivity.this, "扫码注册！", Toast.LENGTH_SHORT).show();
+        onSendSerialCmd();
+    }
+
+    /*
+     **发送串口命令
+     */
+    public void onSendSerialCmd() {
+        try {
+            String s = "@SCNMOD2";//串口命令，例如：NLS0302010;
+            byte[] bytes = s.getBytes();
+            byte[] cmd = new byte[bytes.length + 2];
+            System.arraycopy(bytes, 0, cmd, 0, bytes.length);
+            lrcCheckSum(cmd);
+            Intent intent = new Intent("com.sunmi.scanner.Setting_cmd");
+            intent.putExtra("cmd_data", cmd);
+            sendBroadcast(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    private void lrcCheckSum(byte[] content) {
+        int len = content.length;
+        int crc = 0;
+        for (int l = 0; l < len - 2; l++) {
+            crc += content[l] & 0xFF;
+        }
+        crc = ~crc + 1;
+        content[len - 2] = (byte) ((crc >> 8) & 0xFF);
+        content[len - 1] = (byte) (crc & 0xFF);
+    }
+
     private void stopOrderCountDownTimer(){
         if (orderTimer != null){
             orderTimer.cancel();

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

@@ -9,6 +9,7 @@ import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -255,6 +256,16 @@ public class PurchaseInfoActivity extends BaseActivity  {
         listStock.setLayoutManager(linearLayoutManager);
 
         adapter = new PurchaseInfoAdapter(this);
+
+        adapter.setOnOutBtnClickListerer((bean, position) -> {
+            if(viewerList.size() > 1) {
+                viewerList.remove(position);
+                initLoadData();
+            } else {
+                Toast.makeText(this, "至少保留一个观影人", Toast.LENGTH_SHORT).show();
+            }
+        });
+
         listStock.setAdapter(adapter);
 
         //下拉刷新

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

@@ -77,7 +77,8 @@ public class ScanCodePayActivity extends BaseActivity  {
         switch (v.getId()){
             case R.id.code_btn:
                 Bundle bundle = new Bundle();
-                bundle.putString("idcard", idcard);
+//                bundle.putString("idcard", idcard);
+                bundle.putString("orderId", orderId);
                 ActivityUtils.launchActivity(this, TicketCollectionActivity.class, bundle);
                 break;
         }

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

@@ -2,6 +2,7 @@ package com.hw.nativeapp.ui.activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.Color;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.util.Log;
@@ -10,6 +11,8 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.RequiresApi;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -53,6 +56,10 @@ public class SelectInfoActivity extends BaseActivity  {
     @BindView(R.id.is_selectRegion)
     LinearLayout is_selectRegion;
 
+    // 类型选择
+    @BindView(R.id.select_btn)
+    TextView select_btn;
+
 
     private String performId = "";
     private String auditoriumId = "";
@@ -61,6 +68,7 @@ public class SelectInfoActivity extends BaseActivity  {
     private String salePeice = "";
     private String performTimeId = "";
     private String seatTypeId = "";
+    private Boolean btnStatus = false;
 
     private JSONObject auditorium = new JSONObject();
 
@@ -103,15 +111,17 @@ public class SelectInfoActivity extends BaseActivity  {
     public void onClick(View v){
         switch (v.getId()){
             case R.id.select_btn:
-                Bundle bundle = new Bundle();
-                bundle.putString("performId", performId);
-                bundle.putString("auditoriumId", auditoriumId);
-                bundle.putString("performTimeId", performTimeId);
-                bundle.putString("seatTypeId", seatTypeId);
-                bundle.putString("goodsId", goodsId);
-                bundle.putString("salePeice", salePeice);
-                ActivityUtils.launchActivity(this, InfoEnterActivity.class, bundle);
-                break;
+                if(btnStatus){
+                    Bundle bundle = new Bundle();
+                    bundle.putString("performId", performId);
+                    bundle.putString("auditoriumId", auditoriumId);
+                    bundle.putString("performTimeId", performTimeId);
+                    bundle.putString("seatTypeId", seatTypeId);
+                    bundle.putString("goodsId", goodsId);
+                    bundle.putString("salePeice", salePeice);
+                    ActivityUtils.launchActivity(this, InfoEnterActivity.class, bundle);
+                    break;
+                }
         }
     }
 
@@ -151,9 +161,21 @@ public class SelectInfoActivity extends BaseActivity  {
                     @Override
                     public void onSuccess(JSONObject data) throws ParseException {
                         JSONArray list = data.getJSONArray("list");
-                        date = list.getJSONObject(0).getString("performDate");
+                        JSONArray newList = new JSONArray();
+                        for (int i = 0; i < list.size(); i++) {
+                            boolean  flag = true;
+                            for (int j = 0; j < newList.size(); j++) {
+                                if(list.getJSONObject(i).getString("performDate").equals(newList.getJSONObject(j).getString("performDate"))) {
+                                    flag = false;
+                                }
+                            }
+                            if(flag){
+                                newList.add(list.getJSONObject(i));
+                            }
+                        }
+                        date = newList.getJSONObject(0).getString("performDate");
                         getSelectTimes();
-                        addDate(list);
+                        addDate(newList);
                     }
 
                     @Override
@@ -237,6 +259,25 @@ public class SelectInfoActivity extends BaseActivity  {
         timer.start();
     }
 
+    // 时间判断是否已经开场
+    private void contrastTime(String performTimeStr) {
+        try {
+            Long newDate = DateUtils.toDateStamp(DateUtils.getNewTime());
+            Long timeDate = DateUtils.toDateStamp(performTimeStr);
+            if (newDate > timeDate) { //  已超过当前时间
+                btnStatus = false;
+                select_btn.setBackground(getResources().getDrawable(R.drawable.bg_btn_02));
+                select_btn.setText("场次已结束");
+            } else {
+                btnStatus = true;
+                select_btn.setBackground(getResources().getDrawable(R.drawable.bg_btn_01));
+                select_btn.setText("确定");
+            }
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
     // 添加演出时间
     private void addDate(JSONArray list) throws ParseException {
         for (int i = 0; i < list.size(); i++) {
@@ -253,11 +294,11 @@ public class SelectInfoActivity extends BaseActivity  {
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
             textView.setPadding(0,10,0,0);
-            textView.setTextSize(11);
+            textView.setTextSize(33);
             textView.setText(DateUtils.getWeek(list.getJSONObject(i).getString("performDate")));
             // 创建时TextView对象
             TextView textView1 = new TextView(this);
-            textView1.setTextSize(11);
+            textView1.setTextSize(33);
             textView1.setPadding(0,10,0,0);
             textView1.setGravity(Gravity.CENTER);
             textView1.setText(list.getJSONObject(i).getString("performDate"));
@@ -312,9 +353,11 @@ public class SelectInfoActivity extends BaseActivity  {
             // 创建天TextView对象
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
-            textView.setTextSize(11);
+            textView.setTextSize(33);
             textView.setText(list.getJSONObject(i).getString("performTimeStart") + " - " + list.getJSONObject(i).getString("performTimeEnd"));
             performTimeId = list.getJSONObject(0).getString("id");
+            String performTimeStr = list.getJSONObject(0).getString("performDate") + " " + list.getJSONObject(0).getString("performTimeStart") + ":00";
+            contrastTime(performTimeStr);
             linearLayout.setTag(list.getJSONObject(i).getString("id"));
             if(i == 0){
                 linearLayout.setBackgroundResource(R.drawable.bg_box_02);
@@ -325,6 +368,7 @@ public class SelectInfoActivity extends BaseActivity  {
             }
 
             linearLayout.addView(textView);
+            int finalI = i;
             linearLayout.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -338,6 +382,8 @@ public class SelectInfoActivity extends BaseActivity  {
                     textView.setTextColor(getResources().getColor(R.color.login_bk));
                     performTimeId = linearLayout.getTag().toString();
                     getSelectRegion();
+                    String performTime = list.getJSONObject(finalI).getString("performDate") + " " + list.getJSONObject(finalI).getString("performTimeStart") + ":00";
+                    contrastTime(performTime);
                 }
             });
 
@@ -360,7 +406,7 @@ public class SelectInfoActivity extends BaseActivity  {
             // 创建天TextView对象
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
-            textView.setTextSize(11);
+            textView.setTextSize(33);
             textView.setText(list.getJSONObject(i).getString("goodsName"));
 
             if(i == 0){
@@ -384,8 +430,9 @@ public class SelectInfoActivity extends BaseActivity  {
                         textView.setTextColor(getResources().getColor(R.color.black));
                     }
                     linearLayout.setBackgroundResource(R.drawable.bg_box_02);
-                    goodsId = linearLayout.getTag().toString();
+                    goodsId = list.getJSONObject(finalI).getString("id");
                     textView.setTextColor(getResources().getColor(R.color.login_bk));
+                    getSelectRegion();
                 }
             });
 
@@ -407,7 +454,7 @@ public class SelectInfoActivity extends BaseActivity  {
 
             // 创建天TextView对象
             TextView textView = new TextView(this);
-            textView.setTextSize(11);
+            textView.setTextSize(33);
             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

@@ -11,6 +11,7 @@ import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.IBinder;
+import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -44,12 +45,13 @@ 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;
+//    @BindView(R.id.img_idcard_btn)
+//    ImageView img_idcard_btn;
+//    @BindView(R.id.img_code_btn)
+//    ImageView img_code_btn;
 
     private IDCardServiceAidl mService;
+    private Context context;
 
     @Override
     void initView() {
@@ -77,7 +79,6 @@ public class TakeActivity extends BaseActivity  {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_take);
-        registerReceiver();
     }
     @Override
     protected void onStart() {
@@ -86,6 +87,9 @@ public class TakeActivity extends BaseActivity  {
         if (!hasPermission) {
             ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 101);
         }
+
+        registerReceiver();
+        bindIDCardService();
     }
     @Override
     protected void onStop() {
@@ -110,6 +114,7 @@ public class TakeActivity extends BaseActivity  {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        stopCountDownTimer();
         if (receiver != null){
             if (receiver != null){
                 try {
@@ -136,7 +141,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, R.id.img_idcard_btn, R.id.img_code_btn})
+    @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})
     public void onClick(View v){
         switch (v.getId()){
             case R.id.purchase_btn:
@@ -183,31 +188,8 @@ public class TakeActivity extends BaseActivity  {
                 break;
             case R.id.num_del:
                 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){
-                    try {
-                        unregisterReceiver(receiver);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-                if (mConnection == null) {
-                    bindIDCardService();
-                }
-                break;
-            case R.id.img_code_btn:
-                if (mConnection != null) {
-                    try {
-                        unbindService(mConnection);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    mService = null;
-                }
-                if (receiver == null){
-                    registerReceiver();
+                if(str.length() > 0){
+                    et_modify_quantity.setText(str.substring(0, str.length() - 1));
                 }
                 break;
         }
@@ -255,11 +237,52 @@ public class TakeActivity extends BaseActivity  {
     // 扫码注册
     private void registerReceiver()
     {
+
+        Intent intent = new Intent();
+        intent.setAction("com.sunmi.scanner.ACTION_BAR_DEVICES_SETTING");
+        intent.putExtra("name","Point of Sale Fixed Barcode Scanner.");
+        intent.putExtra("pid",193);
+        intent.putExtra("vid",12879);
+        intent.putExtra("type",2); //1 KeyEvent 输出 2 广播输出
+        intent.putExtra("toast",false);
+        this.sendBroadcast(intent);
+
         IntentFilter fifilter = new IntentFilter();
         fifilter.addAction("com.sunmi.scanner.ACTION_DATA_CODE_RECEIVED");
         registerReceiver(receiver, fifilter);
+        Toast.makeText(TakeActivity.this, "扫码注册！", Toast.LENGTH_SHORT).show();
+        onSendSerialCmd();
+    }
+
+    /*
+     **发送串口命令
+     */
+    public void onSendSerialCmd() {
+        try {
+            String s = "@SCNMOD2";//串口命令，例如：NLS0302010;
+            byte[] bytes = s.getBytes();
+            byte[] cmd = new byte[bytes.length + 2];
+            System.arraycopy(bytes, 0, cmd, 0, bytes.length);
+            lrcCheckSum(cmd);
+            Intent intent = new Intent("com.sunmi.scanner.Setting_cmd");
+            intent.putExtra("cmd_data", cmd);
+            sendBroadcast(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+    private void lrcCheckSum(byte[] content) {
+        int len = content.length;
+        int crc = 0;
+        for (int l = 0; l < len - 2; l++) {
+            crc += content[l] & 0xFF;
+        }
+        crc = ~crc + 1;
+        content[len - 2] = (byte) ((crc >> 8) & 0xFF);
+        content[len - 1] = (byte) (crc & 0xFF);
     }
 
+
     // 身份证注册
     private void bindIDCardService() {
         Intent intent = new Intent();
@@ -281,30 +304,54 @@ public class TakeActivity extends BaseActivity  {
             Log.e("id_card", "服务已断开");
         }
     };
-    public void auto(View view) {
+    public void auto() {
         try {
             mService.readCardAuto(new CardCallback.Stub() {
                 @Override
                 public void getCardData(final IDCardInfo info, int code) {
                     Log.i(TAG, "getCardData: code=" + code + ", id info:" + info);
+                    Toast.makeText(TakeActivity.this, "身份证读取！" + code, Toast.LENGTH_SHORT).show();
                     if (code == 10) {
                         //读取成功
                         Log.i(TAG, "getCardData: " + info.toString());
+                        Toast.makeText(TakeActivity.this, info.toString(), Toast.LENGTH_SHORT).show();
                         // info.getName(); // 姓名
                         // info.getIdCard(); // 身份证号
                         Bundle bundle = new Bundle();
                         bundle.putString("idcard", info.getIdCard());
                         ActivityUtils.launchActivity(TakeActivity.this, TicketCollectionActivity.class, bundle);
                     } else if (code == -10) {
+                        Toast.makeText(TakeActivity.this, "身份证读取失败！" + code, Toast.LENGTH_SHORT).show();
                         //读取失败
                         Log.i(TAG, "auto read card did not get data");
                     } else {
+                        Toast.makeText(TakeActivity.this, "身份证读取失败！" + code, Toast.LENGTH_SHORT).show();
                         Log.i(TAG, "what is wrong");
                     }
                 }
             });
         } catch (Exception e) {
             Log.i(TAG, "auto read is error " + e.getMessage());
+            Toast.makeText(TakeActivity.this, "auto read is error " + e.getMessage(), Toast.LENGTH_SHORT).show();
+            e.printStackTrace();
+        }
+    }
+    public void read(View view) {
+        try {
+            if (mService != null) {
+                IDCardInfo cardInfo = mService.readCard();
+                Toast.makeText(TakeActivity.this, "111111！", Toast.LENGTH_SHORT).show();
+                if (cardInfo != null) {
+                    //显示图片
+                    Log.i(TAG, "read: " + cardInfo.toString());
+                } else {
+                    Log.i(TAG, "card info is null ");
+                }
+            } else {
+                Log.i(TAG, "service is null");
+            }
+        } catch (Exception e) {
+            Log.i(TAG, "got error: " + e.getMessage());
             e.printStackTrace();
         }
     }

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

@@ -73,6 +73,7 @@ public class TicketCollectionActivity extends BaseActivity  {
     private TicketCollectionAdapter adapter;
     private String qrcodeNo;
     private String idcard = "";
+    private String orderId = "";
 
     private JSONArray dataList = new JSONArray();
 
@@ -135,9 +136,8 @@ public class TicketCollectionActivity extends BaseActivity  {
                 setDataList(true);
                 break;
             case R.id.txt_btn:
-                boolean isChecked = false;
+                boolean isChecked = !all_btn.isChecked();
                 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);
@@ -152,6 +152,7 @@ public class TicketCollectionActivity extends BaseActivity  {
         Intent transmitIntent = getIntent();
         qrcodeNo = transmitIntent.getStringExtra("qrcodeNo");
         idcard = transmitIntent.getStringExtra("idcard");
+        orderId = transmitIntent.getStringExtra("orderId");
     }
 
     private void reflashFinish(){
@@ -169,11 +170,16 @@ public class TicketCollectionActivity extends BaseActivity  {
 
         adapter = new TicketCollectionAdapter(this);
         adapter.setOnOutBtnClickListerer((bean, position) -> {
+            boolean allStatus = true;
             for (int i = 0; i < dataList.size(); i++) {
                 if(bean.id.equals(dataList.getJSONObject(i).getString("id"))){
                     dataList.getJSONObject(i).put("checkedStatus", bean.checkedStatus);
                 }
+                if(!dataList.getJSONObject(i).getBoolean("checkedStatus")) {
+                    allStatus = false;
+                }
             }
+            all_btn.setChecked(allStatus);
         });
         listStock.setAdapter(adapter);
 
@@ -220,6 +226,9 @@ public class TicketCollectionActivity extends BaseActivity  {
         if(idcard != null && !idcard.isEmpty()){
             options.put("idcard", idcard);
         }
+        if(orderId != null && !orderId.isEmpty()){
+            options.put("orderId", orderId);
+        }
         MApplication.getApiService().getValidList( options, System.currentTimeMillis() / 1000)
                 .compose(RxUtil.applyObservableAsync())
                 .subscribe(new ResponseConsumer<JSONObject>() {

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

@@ -62,9 +62,9 @@ public class PurchaseInfoAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
         }
         normalHolder.tv_name.setText(detailBean.name);
         normalHolder.tv_id_card.setText(StringUtils.idCardAddStar(detailBean.idcard));
-//        normalHolder.purchase_btn.setOnClickListener(v -> {
-//            mOnOutBtnClickListerer.onClick(detailBean, position);
-//        });
+        normalHolder.btn_del.setOnClickListener(v -> {
+            mOnOutBtnClickListerer.onClick(detailBean, position);
+        });
     }
 
     @Override

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

@@ -12,13 +12,13 @@ public class PurchaseInfoHolder extends RecyclerView.ViewHolder{
 
     public TextView tv_name;
     public TextView tv_id_card;
-//    public TextView purchase_btn;
+    public TextView btn_del;
 
     public PurchaseInfoHolder(@NonNull View itemView) {
         super(itemView);
 
         tv_name = (TextView) itemView.findViewById(R.id.tv_name);
         tv_id_card = (TextView) itemView.findViewById(R.id.tv_id_card);
-//        purchase_btn = (TextView) itemView.findViewById(R.id.purchase_btn);
+        btn_del = (TextView) itemView.findViewById(R.id.btn_del);
     }
 }

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

@@ -4,15 +4,16 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
+import android.widget.Toast;
 
 import com.hw.nativeapp.ui.activity.SplashActivity;
+import com.hw.nativeapp.ui.activity.TakeActivity;
 
 public class BootBroadcastReceiver extends BroadcastReceiver {
     static final String ACTION = "android.intent.action.BOOT_COMPLETED";
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        Log.d("BootBroadcastReceiver", "onReceive");
         // 判断是否是开机广播
         if (intent.getAction().equals(ACTION)) {
             Intent bootMainIntent = new Intent(context, SplashActivity.class);

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

@@ -1,12 +1,17 @@
 package com.hw.nativeapp.utils;
 
+import android.os.Build;
 import android.util.Log;
 
+import androidx.annotation.RequiresApi;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.TimeZone;
 
 /**
  * @author yi.ding
@@ -331,4 +336,31 @@ public class DateUtils {
         String newDateStr=sdf.format(date);
         return newDateStr;
     }
+
+    /**
+     * yyyy-MM-dd HH:mm:ss字符串 转 时间戳
+     * @param dateTime
+     * @return
+     */
+    public static Long toDateStamp(String dateTime) throws ParseException {
+        String dateStr = dateTime; // 要转换的日期字符串
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); // 设置日期格式
+
+        Date date = sdf.parse(dateStr); // 将日期字符串解析成Date对象
+        long timestamp = date.getTime(); // 获取时间戳（单位：毫秒）
+
+        Long newDateStr = timestamp;
+        return newDateStr;
+    }
+
+    /**
+     * 获取当前时间 yyyy-MM-dd HH:mm:ss
+     * @return
+     */
+    public static String getNewTime() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        sdf.setTimeZone(TimeZone.getTimeZone("GMT+8"));
+        String currentTime = sdf.format(new Date());
+        return currentTime;
+    }
 }

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"><!--首页搜索框样式-->
-    <stroke android:width="1dp" android:color="#ffc2c2c2" />
+    <stroke android:width="3dp" android:color="#ffc2c2c2" />
     <solid android:color="#ffffffff" />
-    <corners android:radius="4dp" />
+    <corners android:radius="10dp" />
 </shape>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"><!--首页搜索框样式-->
-    <stroke android:width="1dp" android:color="#ff2e79f1" />
+    <stroke android:width="3dp" android:color="#ff2e79f1" />
     <solid android:color="#ffbfe2ff" />
-    <corners android:radius="4dp" />
+    <corners android:radius="10dp" />
 </shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"><!--首页搜索框样式-->
     <solid android:color="#ff2e79f1" />
-    <corners android:radius="15dp" />
+    <corners android:radius="30dp" />
 </shape>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"><!--首页搜索框样式-->
+    <solid android:color="#868788" />
+    <corners android:radius="15dp" />
+</shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"><!--首页搜索框样式-->
     <solid android:color="#fff5f9ff" />
-    <corners android:radius="5dp" />
+    <corners android:radius="15dp" />
 </shape>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"><!--首页搜索框样式-->
-    <stroke android:width="1dp" android:color="#ff2e79f1" />
-    <corners android:radius="6dp" />
+    <stroke android:width="3dp" android:color="#ff2e79f1" />
+    <corners android:radius="15dp" />
 </shape>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"><!--首页搜索框样式-->
     <solid android:color="#ffffffff" />
-    <corners android:radius="10dp" />
+    <corners android:radius="30dp" />
     <item android:name="android:shadowColor">#80bbd0ef</item>
     <item android:name="android:shadowDx">0</item>
     <item android:name="android:shadowDy">1</item>

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

@@ -9,26 +9,25 @@
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="信息录入"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
-
+        app:titleSize="@dimen/text_50dp_size" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="60sp"
+        android:layout_marginTop="180sp"
         android:orientation="vertical"
-        android:padding="20sp">
+        android:padding="60sp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -43,32 +42,36 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="10sp"
+                android:layout_marginTop="100sp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="20sp">
+                android:paddingBottom="60sp">
 
                 <TextView
-                    android:layout_width="210sp"
-                    android:layout_height="30sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
+                    android:paddingLeft="80dp"
+                    android:paddingRight="80dp"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
                     android:text="请将身份证放置在读卡区！"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="13sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="40sp"
+                    android:layout_width="1000dp"
+                    android:layout_height="650dp"
+                    android:layout_marginTop="120sp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/idcard" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="25sp"
+                    android:layout_marginTop="60sp"
                     android:gravity="center"
                     android:orientation="vertical">
 
@@ -79,7 +82,7 @@
                         android:layout_marginTop="10sp"
                         android:text="忘带身份证？"
                         android:textColor="@color/login_bk"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_50dp_size" />
                 </LinearLayout>
             </LinearLayout>
 

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

@@ -5,37 +5,36 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
-
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="信息录入"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="60sp"
+        android:layout_marginTop="220sp"
         android:orientation="vertical"
-        android:padding="20sp">
+        android:padding="60sp">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="15sp">
+            android:padding="50dp">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -44,24 +43,24 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginTop="20sp"
+                    android:layout_marginTop="50sp"
                     android:gravity="center"
                     android:orientation="horizontal">
                     <TextView
                         android:id="@+id/idCard_btn"
-                        android:layout_width="100sp"
-                        android:layout_height="50sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="100dp"
                         android:layout_marginTop="10sp"
                         android:gravity="right"
                         android:text="姓名："
                         android:textColor="@color/black"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_50dp_size" />
                     <EditText
                         android:id="@+id/et_name"
                         android:text=""
                         android:layout_width="match_parent"
-                        android:layout_height="40sp"
-                        android:textSize="14sp"
+                        android:layout_height="100dp"
+                        android:textSize="@dimen/text_50dp_size"
                         android:background="@android:drawable/edit_text"
                         android:hint="请输入" />
                 </LinearLayout>
@@ -69,24 +68,24 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginTop="20sp"
+                    android:layout_marginTop="50sp"
                     android:gravity="center"
                     android:orientation="horizontal">
                     <TextView
-                        android:layout_width="100sp"
-                        android:layout_height="50sp"
+                        android:layout_width="wrap_content"
+                        android:layout_height="100dp"
                         android:layout_marginTop="10sp"
                         android:gravity="right"
                         android:text="身份证号码："
                         android:inputType="text"
                         android:textColor="@color/black"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_50dp_size" />
                     <EditText
                         android:id="@+id/et_idcard"
                         android:layout_width="match_parent"
-                        android:layout_height="40sp"
-                        android:digits="0123456789 X"
-                        android:textSize="14sp"
+                        android:layout_height="100dp"
+                        android:digits="0123456789X"
+                        android:textSize="@dimen/text_50dp_size"
                         android:text=""
                         android:background="@android:drawable/edit_text"
                         android:hint="请输入" />
@@ -96,23 +95,23 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
+                android:layout_marginTop="100sp"
                 android:gravity="center"
                 android:paddingBottom="30sp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/input_btn"
-                    android:layout_width="345dp"
-                    android:layout_height="40dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:padding="10sp"
+                    android:padding="20sp"
                     android:text="确定"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -5,36 +5,33 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
-
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="15sp"
         app:title="自助取票"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="60sp"
+        android:layout_marginTop="200sp"
         android:orientation="vertical"
-        android:padding="20sp">
+        android:padding="60sp">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:background="@drawable/bg_take"
-            android:padding="15sp">
+            android:padding="30sp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -48,7 +45,7 @@
                     android:text="门票正在打印中，请稍后......"
                     android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="15sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
         </LinearLayout>
 
@@ -56,36 +53,40 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginTop="20sp"
+            android:layout_marginTop="60sp"
             android:layout_weight="1"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="15sp">
+            android:padding="60dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="15sp"
+                android:layout_marginTop="50sp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="10sp">
+                android:paddingBottom="30sp">
 
                 <TextView
                     android:id="@+id/tx_issue_txt"
-                    android:layout_width="190sp"
-                    android:layout_height="30sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp"
+                    android:paddingBottom="20dp"
+                    android:paddingTop="20dp"
+                    android:paddingLeft="100dp"
+                    android:paddingRight="100dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="注意出票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="13sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <ImageView
                     android:id="@+id/img_issue_tickets"
-                    android:layout_width="260dp"
-                    android:layout_height="150dp"
-                    android:layout_marginTop="20sp"
+                    android:layout_width="900dp"
+                    android:layout_height="600dp"
+                    android:layout_marginTop="90sp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/issue_tickets" />
 
@@ -93,35 +94,35 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:layout_marginTop="35dp">
+                    android:layout_marginTop="60dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="正在为您打印"
                         android:textColor="@color/black"
-                        android:textSize="13sp" />
+                        android:textSize="@dimen/text_40dp_size" />
 
-                    <TextView
-                        android:id="@+id/print_num"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="1/8"
-                        android:textColor="@color/login_bk"
-                        android:textSize="13sp" />
+<!--                    <TextView-->
+<!--                        android:id="@+id/print_num"-->
+<!--                        android:layout_width="wrap_content"-->
+<!--                        android:layout_height="wrap_content"-->
+<!--                        android:text="1/8"-->
+<!--                        android:textColor="@color/login_bk"-->
+<!--                        android:textSize="13sp" />-->
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="张，请注意下方出票口取票..."
                         android:textColor="@color/black"
-                        android:textSize="13sp" />
+                        android:textSize="@dimen/text_40dp_size" />
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="15sp"
+                    android:layout_marginTop="30dp"
                     android:gravity="center"
                     android:orientation="vertical">
 
@@ -131,16 +132,16 @@
                         android:layout_height="wrap_content"
                         android:text="本机小票不足，请联系工作人员"
                         android:textColor="@color/black"
-                        android:textSize="15sp" />
+                        android:textSize="@dimen/text_40dp_size" />
 
                     <TextView
                         android:id="@+id/tx_customerMobile"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10sp"
+                        android:layout_marginTop="30dp"
                         android:text="客服电话：400-992-1888"
                         android:textColor="@color/login_bk"
-                        android:textSize="13sp" />
+                        android:textSize="@dimen/text_40dp_size" />
                 </LinearLayout>
             </LinearLayout>
 

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

@@ -5,172 +5,182 @@
     android:background="@mipmap/page_bj"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <LinearLayout
+    <ScrollView
+        android:id="@+id/sv"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="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>
+        android:layout_height="match_parent">
         <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:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
+                android:orientation="vertical">
+
+                <ImageView
+                    android:id="@+id/main_img"
+                    android:layout_width="match_parent"
+                    android:layout_height="1000dp"
+                    android:scaleType="fitXY"
+                    android:src="@mipmap/main_top" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="420dp"
+                android:layout_height="80dp"
+                android:gravity="center"
                 android:orientation="horizontal">
 
-                <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"
+                <TextView
+                    android:id="@+id/tx_top_hide"
+                    android:layout_width="420dp"
+                    android:layout_height="80dp"
+                    android:layout_marginTop="20sp"
                     android:gravity="center"
-                    android:orientation="vertical"
-                    android:padding="30dp">
-
-                    <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" />
+                    android:text=""
+                    android:textColor="@color/black"
+                    android:textSize="15sp" />
+            </LinearLayout>
 
-                    <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>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="80sp"
+                android:layout_marginTop="160dp"
+                android:layout_marginRight="80sp"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <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:layout_width="match_parent"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:orientation="vertical"
-                    android:padding="30dp">
+                    android:orientation="horizontal">
 
-                    <TextView
+                    <LinearLayout
+                        android:id="@+id/take_btn"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                        android:layout_height="700dp"
+                        android:layout_gravity="center"
+                        android:layout_marginRight="50dp"
+                        android:layout_weight="1"
+                        android:background="@mipmap/take_bj"
                         android:gravity="center"
-                        android:text="自助购票"
-                        android:textColor="@color/white"
-                        android:layout_marginTop="10dp"
-                        android:textFontWeight="800"
-                        android:textSize="20sp" />
+                        android:orientation="vertical"
+                        android:padding="90dp">
 
-                    <RelativeLayout
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="30dp"
+                            android:gravity="center"
+                            android:text="自助取票"
+                            android:textColor="@color/white"
+                            android:textFontWeight="900"
+                            android:textSize="@dimen/text_70dp_size" />
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="10dp"
+                            android:gravity="center">
+
+                            <ImageView
+                                android:layout_width="300dp"
+                                android:layout_height="300dp"
+                                android:scaleType="fitXY"
+                                android:src="@mipmap/take_icon" />
+                        </RelativeLayout>
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/purchase_btn"
                         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>
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="50dp"
+                        android:layout_weight="1"
+                        android:background="@mipmap/purchase_bj"
+                        android:gravity="center"
+                        android:orientation="vertical"
+                        android:padding="90dp">
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="50dp"
-                android:gravity="center"
-                android:orientation="vertical">
+                        <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="30dp"
+                            android:gravity="center"
+                            android:text="自助购票"
+                            android:textColor="@color/white"
+                            android:textFontWeight="900"
+                            android:textSize="@dimen/text_70dp_size" />
 
-                <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=""
-                    android:textColor="@color/blue"
-                    android:textSize="15sp" />
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_marginTop="10sp"
+                            android:gravity="center">
+
+                            <ImageView
+                                android:layout_width="300dp"
+                                android:layout_height="300dp"
+                                android:scaleType="fitXY"
+                                android:src="@mipmap/purchase_icon" />
+                        </RelativeLayout>
+                    </LinearLayout>
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="50dp"
                     android:gravity="center"
-                    android:orientation="horizontal">
+                    android:orientation="vertical">
+
                     <TextView
-                        android:id="@+id/tx_customerMobile"
+                        android:id="@+id/paper_text"
                         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:textColor="@color/blue"
                         android:textSize="15sp" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:gravity="center"
+                        android:layout_marginTop="320dp"
+                        android:orientation="horizontal">
+
+                        <TextView
+                            android:id="@+id/tx_customerMobile"
+                            android:layout_width="match_parent"
+                            android:layout_height="80dp"
+                            android:layout_weight="1"
+                            android:gravity="left"
+                            android:text="客服电话：0851-28256633"
+                            android:textColor="@color/black"
+                            android:textSize="@dimen/text_50dp_size" />
+
+                        <TextView
+                            android:id="@+id/tx_hide"
+                            android:layout_width="match_parent"
+                            android:layout_height="80dp"
+                            android:layout_weight="2"
+                            android:gravity="left"
+                            android:text=""
+                            android:textColor="@color/black"
+                            android:textSize="15sp" />
+                    </LinearLayout>
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
+    </ScrollView>
 </RelativeLayout>

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

@@ -5,30 +5,29 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
-
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="支付方式"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="60sp"
+        android:layout_marginTop="160dp"
         android:orientation="vertical"
-        android:padding="20sp">
+        android:padding="60dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -43,25 +42,25 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
+                android:layout_marginTop="80dp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="30sp">
+                android:paddingBottom="60sp">
 <!--                选择支付方式-->
                 <TextView
-                    android:layout_width="280sp"
-                    android:layout_height="40sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text="微信扫码支付"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="15sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="25sp"
+                    android:layout_marginTop="80dp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -73,27 +72,27 @@
                         android:layout_marginRight="15sp"
                         android:orientation="vertical">
                         <LinearLayout
-                            android:layout_width="235dp"
-                            android:layout_height="235dp"
+                            android:layout_width="800dp"
+                            android:layout_height="800dp"
                             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:layout_width="700dp"
+                                android:layout_height="700dp"
                                 android:src="@mipmap/eq_code_ing"
                                 android:scaleType="fitXY" />
                         </LinearLayout>
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:layout_marginTop="35sp"
+                            android:layout_marginTop="90sp"
                             android:gravity="center"
                             android:orientation="horizontal">
                             <ImageView
-                                android:layout_width="22dp"
-                                android:layout_height="22dp"
+                                android:layout_width="80dp"
+                                android:layout_height="80dp"
                                 android:scaleType="fitXY"
                                 android:layout_marginRight="5sp"
                                 android:src="@mipmap/weix_icon" />
@@ -104,7 +103,7 @@
                                 android:text="微信支付"
                                 android:textColor="@color/black"
                                 android:textFontWeight="800"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_50dp_size" />
                         </LinearLayout>
                     </LinearLayout>
 <!--                    <LinearLayout-->

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

@@ -9,26 +9,26 @@
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="信息录入"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="60sp"
+        android:layout_marginTop="160dp"
         android:orientation="vertical"
-        android:padding="20sp">
+        android:padding="60dp">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -36,7 +36,7 @@
             android:layout_marginTop="20sp"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="15sp">
+            android:padding="60dp">
 
             <ScrollView
                 android:id="@+id/sv"
@@ -57,13 +57,14 @@
                         android:layout_height="match_parent"
                         android:layout_marginTop="40sp"
                         android:gravity="center"
+                        android:textSize="@dimen/text_50dp_size"
                         android:visibility="gone"
                         android:text="没有对应票据"/>
 
                     <com.scwang.smartrefresh.layout.SmartRefreshLayout
                         android:layout_width="match_parent"
                         android:layout_below="@+id/tb_main_bar"
-                        android:layout_marginTop="20sp"
+                        android:layout_marginTop="60sp"
                         android:id="@+id/refreshLayout"
                         android:layout_height="match_parent">
 
@@ -84,7 +85,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15sp"
+                android:layout_marginTop="50dp"
                 android:gravity="right"
                 android:orientation="horizontal">
                 <TextView
@@ -94,23 +95,24 @@
                     android:text="共2张, 合计"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_50dp_size" />
                 <TextView
                     android:id="@+id/tx_total"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="¥488"
+                    android:paddingRight="10dp"
                     android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
+                android:layout_marginTop="80dp"
                 android:gravity="center"
-                android:paddingBottom="10sp"
+                android:paddingBottom="30sp"
                 android:orientation="horizontal">
 
                 <TextView
@@ -120,12 +122,12 @@
                     android:layout_weight="1"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:padding="10sp"
+                    android:padding="20sp"
                     android:layout_marginRight="20sp"
                     android:text="继续添加观影人"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
                 <TextView
                     android:id="@+id/determine_btn"
                     android:layout_width="match_parent"
@@ -133,12 +135,12 @@
                     android:layout_weight="1"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:padding="10sp"
+                    android:padding="20sp"
                     android:text="确定付款"
                     android:layout_marginLeft="20sp"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -5,30 +5,29 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
-
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="扫码支付"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="60sp"
+        android:layout_marginTop="160sp"
         android:orientation="vertical"
-        android:padding="20sp">
+        android:padding="60dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -38,7 +37,7 @@
             android:layout_weight="1"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="15sp">
+            android:padding="30sp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -46,20 +45,20 @@
                 android:layout_marginTop="25sp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="30sp">
+                android:paddingBottom="90sp">
 
                 <ImageView
                     android:id="@+id/im_pay_result"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="20sp"
+                    android:layout_width="800dp"
+                    android:layout_height="480dp"
+                    android:layout_marginTop="60sp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/code_ok" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="35sp"
+                    android:layout_marginTop="90sp"
                     android:gravity="center"
                     android:orientation="vertical">
                     <TextView
@@ -68,27 +67,31 @@
                         android:layout_height="wrap_content"
                         android:text="支付成功"
                         android:textColor="@color/login_bk"
-                        android:textSize="15sp" />
+                        android:textSize="@dimen/text_50dp_size" />
                     <TextView
                         android:id="@+id/tx_pay_result_money"
-                        android:layout_marginTop="10sp"
+                        android:layout_marginTop="30sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="共2张，合计¥488"
                         android:textColor="@color/black"
-                        android:textSize="12sp" />
+                        android:textSize="@dimen/text_40dp_size" />
                 </LinearLayout>
                 <TextView
                     android:id="@+id/code_btn"
-                    android:layout_marginTop="30sp"
-                    android:layout_width="150sp"
-                    android:layout_height="30sp"
+                    android:layout_marginTop="60sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingLeft="100dp"
+                    android:paddingRight="100dp"
+                    android:paddingTop="20dp"
+                    android:paddingBottom="20dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="打印小票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
         </LinearLayout>

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

@@ -6,21 +6,22 @@
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
 
+
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="选择信息"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <ScrollView
         android:id="@+id/sv"
@@ -31,27 +32,28 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="15sp"
+            android:layout_margin="40sp"
             android:layout_marginBottom="20sp"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="15sp">
+            android:padding="50sp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
+                android:layout_marginTop="20dp"
                 android:layout_weight="1"
                 android:gravity="left"
                 android:text="演出信息"
                 android:textColor="@color/black"
                 android:textFontWeight="800"
-                android:textSize="15sp" />
+                android:textSize="@dimen/text_50dp_size" />
 
             <!--演出时间-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20sp"
+                android:layout_marginTop="50sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -61,7 +63,7 @@
                     android:gravity="left"
                     android:text="演出时间"
                     android:textColor="@color/black"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_40dp_size" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -71,84 +73,11 @@
                         android:id="@+id/is_selectDate"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10sp"
                         android:isScrollContainer="true"
-                        android:orientation="horizontal">
-                        <!--                    <LinearLayout-->
-                        <!--                        android:layout_width="120sp"-->
-                        <!--                        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:gravity="center"-->
-                        <!--                            android:text="今天"-->
-                        <!--                            android:textColor="@color/login_bk"-->
-                        <!--                            android:textSize="18sp" />-->
-                        <!--                        <TextView-->
-                        <!--                            android:layout_marginTop="10sp"-->
-                        <!--                            android:layout_width="match_parent"-->
-                        <!--                            android:layout_height="match_parent"-->
-                        <!--                            android:layout_weight="1"-->
-                        <!--                            android:gravity="center"-->
-                        <!--                            android:text="11-03"-->
-                        <!--                            android:textColor="@color/login_bk"-->
-                        <!--                            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="今天"-->
-                        <!--                            android:textColor="@color/black"-->
-                        <!--                            android:textSize="18sp" />-->
-                        <!--                        <TextView-->
-                        <!--                            android:layout_marginTop="10sp"-->
-                        <!--                            android:layout_width="match_parent"-->
-                        <!--                            android:layout_height="match_parent"-->
-                        <!--                            android:gravity="center"-->
-                        <!--                            android:text="11-03"-->
-                        <!--                            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="今天"-->
-                        <!--                            android:padding="10sp"-->
-                        <!--                            android:textColor="@color/black"-->
-                        <!--                            android:textSize="18sp" />-->
-                        <!--                        <TextView-->
-                        <!--                            android:layout_marginTop="10sp"-->
-                        <!--                            android:layout_width="match_parent"-->
-                        <!--                            android:layout_height="match_parent"-->
-                        <!--                            android:gravity="center"-->
-                        <!--                            android:text="11-03"-->
-                        <!--                            android:textColor="@color/black"-->
-                        <!--                            android:textSize="18sp" />-->
-                        <!--                    </LinearLayout>-->
+                        android:orientation="horizontal"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp">
+
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
@@ -156,7 +85,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20sp"
+                android:layout_marginTop="50sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -166,7 +95,7 @@
                     android:gravity="left"
                     android:text="演出场次"
                     android:textColor="@color/black"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_40dp_size" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -177,43 +106,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         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="09:00-10:00"-->
-                        <!--                            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="09:00-10:00"-->
-                        <!--                            android:textColor="@color/black"-->
-                        <!--                            android:textSize="18sp" />-->
-                        <!--                    </LinearLayout>-->
+                        android:orientation="horizontal"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp">
+
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
@@ -293,7 +189,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20sp"
+                android:layout_marginTop="50sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -303,7 +199,7 @@
                     android:gravity="left"
                     android:text="票务信息"
                     android:textColor="@color/black"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_40dp_size" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -314,25 +210,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:isScrollContainer="true"
-                        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>-->
+                        android:orientation="horizontal"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp">
+
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
@@ -340,7 +221,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20sp"
+                android:layout_marginTop="50sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -350,7 +231,7 @@
                     android:gravity="left"
                     android:text="类型选择"
                     android:textColor="@color/black"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_40dp_size" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -361,43 +242,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         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>-->
+                        android:orientation="horizontal"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp">
+
                     </LinearLayout>
                 </HorizontalScrollView>
             </LinearLayout>
@@ -405,7 +253,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
+                android:layout_marginTop="120sp"
+                android:paddingBottom="40dp"
                 android:gravity="center">
 
                 <TextView
@@ -414,11 +263,11 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
+                    android:padding="30dp"
                     android:text="确定"
-                    android:padding="10dp"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="15sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
         </LinearLayout>
 

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

@@ -16,7 +16,7 @@
             android:id="@+id/tx_contentdown"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             tools:text="倒计时:1s">
         </TextView>
 
@@ -25,7 +25,7 @@
             android:layout_marginLeft="5sp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/purple_700"
+            android:textColor="@color/blue"
             android:text="跳过">
         </TextView>
     </LinearLayout>

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

@@ -9,69 +9,69 @@
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="自助取票"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="60sp"
-        android:padding="20sp"
+        android:layout_marginTop="150sp"
+        android:padding="60sp"
         android:layout_gravity="top">
 
         <LinearLayout
             android:id="@+id/take_btn"
             android:layout_width="230dp"
-            android:layout_height="400dp"
+            android:layout_height="1200dp"
             android:layout_gravity="center"
-            android:layout_marginRight="15sp"
+            android:layout_marginRight="30sp"
             android:layout_weight="1"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="15sp">
+            android:padding="50sp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10sp"
+                android:layout_marginTop="30sp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text="取票码/手机号取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="15sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginTop="20sp"
+                android:layout_height="100dp"
+                android:layout_marginTop="60sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <EditText
                     android:id="@+id/et_modify_quantity"
                     android:layout_width="match_parent"
-                    android:layout_height="40dp"
+                    android:layout_height="100dp"
                     android:enabled="true"
                     android:focusable="false"
-                    android:textSize="12sp"
-                    android:paddingLeft="10dp"
+                    android:textSize="@dimen/text_40dp_size"
+                    android:paddingLeft="20dp"
                     android:background="@android:drawable/edit_text"
                     android:hint="取票码/手机号取票"
                     android:text=""
@@ -82,199 +82,177 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20sp"
+                android:layout_marginTop="60sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_01"
-                    android:layout_width="50dp"
-                    android:layout_height="40dp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="1"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_02"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="2"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_03"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="3"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10sp"
+                android:layout_marginTop="30sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_04"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="4"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_05"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="5"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_06"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="6"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10sp"
+                android:layout_marginTop="30sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_07"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="7"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_08"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="8"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_09"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="120dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="9"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10sp"
+                android:layout_marginTop="30sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_0"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="7sp"
-                    android:paddingBottom="7sp"
                     android:text="0"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="18sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_empty"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
-                    android:layout_marginRight="10sp"
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
+                    android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
-                    android:paddingTop="5sp"
-                    android:paddingBottom="5sp"
                     android:text="清空"
                     android:textColor="@color/blue"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_50dp_size" />
 
                 <TextView
                     android:id="@+id/num_del"
-                    android:layout_width="50dp"
-                    android:layout_height="40sp"
+                    android:layout_width="120dp"
+                    android:layout_height="120dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
@@ -282,42 +260,42 @@
                     android:paddingBottom="7sp"
                     android:text="删除"
                     android:textColor="@color/blue"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="30dp"
-                android:layout_marginTop="15sp"
+                android:layout_height="120dp"
+                android:layout_marginTop="80sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/purchase_btn"
                     android:layout_width="match_parent"
-                    android:layout_height="30dp"
+                    android:layout_height="120dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="立即取票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="13sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="230dp"
-            android:layout_height="400dp"
+            android:layout_height="1200dp"
             android:layout_marginLeft="15sp"
             android:layout_weight="1"
             android:background="@drawable/bg_take"
-            android:padding="15sp"
+            android:padding="50sp"
             android:orientation="vertical">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10sp"
+                android:layout_marginTop="30sp"
                 android:gravity="center">
 
                 <TextView
@@ -328,13 +306,13 @@
                     android:text="二维码/身份证取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="15sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="15sp"
+                android:layout_marginTop="60sp"
                 android:gravity="center">
 
                 <TextView
@@ -345,28 +323,28 @@
                     android:text="请选择二维码/身份证对准扫码区域"
                     android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="9sp" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="300dp"
-                android:layout_marginTop="25sp"
+                android:layout_height="800dp"
+                android:layout_marginTop="70sp"
                 android:gravity="top"
                 android:orientation="vertical">
                 <ImageView
                     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:layout_width="match_parent"
+                    android:layout_height="820dp"
                     android:scaleType="fitXY"
-                    android:src="@mipmap/take_idcard" />
+                    android:src="@mipmap/idcard_demonstrate" />
+<!--                <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/take_idcard" />-->
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -9,30 +9,30 @@
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="自助取票"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="70sp"
-        android:layout_marginLeft="10sp"
-        android:layout_marginRight="10sp"
+        android:layout_marginTop="190sp"
+        android:layout_marginLeft="30sp"
+        android:layout_marginRight="30sp"
         android:layout_marginBottom="100sp"
         android:background="@drawable/bg_take"
         android:orientation="vertical"
-        android:padding="10sp">
+        android:padding="30sp">
         <ScrollView
             android:id="@+id/sv"
             android:layout_width="match_parent"
@@ -42,7 +42,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10sp"
+                android:layout_marginBottom="30sp"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -54,7 +54,7 @@
                     android:padding="40dp"
                     android:gravity="center"
                     android:text="没有对应票据"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_50dp_size"
                     android:visibility="gone" />
 
                 <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -79,53 +79,61 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="60sp"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginTop="25sp"
+        android:layout_marginTop="60sp"
         android:background="@drawable/bg_take"
         android:gravity="center"
         android:orientation="horizontal"
-        android:paddingLeft="20sp"
-        android:paddingRight="20sp">
+        android:paddingLeft="50sp"
+        android:paddingTop="30dp"
+        android:paddingBottom="30dp">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="80dp"
             android:layout_weight="1"
             android:orientation="horizontal">
 
             <CheckBox
                 android:id="@+id/all_btn"
-                android:layout_width="30dp"
+                android:layout_width="60dp"
+                android:layout_marginLeft="40dp"
                 android:layout_height="match_parent"
-                android:layout_centerInParent="true" />
+                android:layout_centerInParent="true"
+                android:scaleX="3"
+                android:scaleY="3" />
 
             <TextView
                 android:id="@+id/txt_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="-20dp"
+                android:layout_marginTop="5dp"
                 android:text="全选"
                 android:textColor="@color/black"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_50dp_size" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="120dp"
             android:layout_weight="1"
+            android:paddingLeft="30dp"
+            android:paddingRight="30dp"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/print_btn"
                 android:layout_width="match_parent"
-                android:layout_height="40dp"
+                android:layout_height="120dp"
                 android:layout_marginLeft="20sp"
                 android:background="@drawable/bg_btn_01"
                 android:gravity="center"
                 android:text="确定打印"
                 android:textColor="@color/white"
                 android:textFontWeight="800"
-                android:textSize="13sp" />
+                android:textSize="@dimen/text_50dp_size" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

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

@@ -5,22 +5,21 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
-
     <com.hjq.bar.TitleBar
         android:id="@+id/tb_main_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="150dp"
         android:background="@color/login_bk"
         app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_icon"
-        app:leftSize="15sp"
+        app:leftIcon="@mipmap/left_88_icon"
+        app:leftSize="@dimen/text_40dp_size"
         app:leftTitle="返回"
         app:rightColor="@color/white"
-        app:rightSize="15sp"
+        app:rightSize="@dimen/text_40dp_size"
         app:rightTitle="120s"
         app:title="自助购票"
         app:titleColor="@color/white"
-        app:titleSize="18sp" />
+        app:titleSize="@dimen/text_50dp_size" />
     <ScrollView
         android:id="@+id/sv"
         android:layout_width="match_parent"
@@ -38,15 +37,16 @@
                 android:layout_below="@+id/tb_main_bar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="60sp"
+                android:layout_marginTop="120sp"
                 android:gravity="center"
                 android:visibility="gone"
+                android:textSize="@dimen/text_50dp_size"
                 android:text="没有对应票据"/>
 
             <com.scwang.smartrefresh.layout.SmartRefreshLayout
                 android:layout_width="match_parent"
                 android:layout_below="@+id/tb_main_bar"
-                android:layout_marginTop="20sp"
+                android:layout_marginTop="60sp"
                 android:id="@+id/refreshLayout"
                 android:layout_height="match_parent">
 

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

@@ -7,15 +7,16 @@
 
 
     <LinearLayout
-        android:layout_margin="10sp"
+        android:layout_margin="30sp"
         android:layout_width="match_parent"
-        android:orientation="vertical"
-        android:padding="15sp"
+        android:orientation="horizontal"
+        android:padding="50dp"
         android:background="@drawable/bg_info_01"
         android:layout_height="wrap_content">
         <LinearLayout
             android:layout_width="match_parent"
             android:orientation="vertical"
+            android:layout_weight="1"
             android:layout_height="wrap_content">
             <LinearLayout
                 android:orientation="horizontal"
@@ -29,7 +30,7 @@
                     android:text="姓名"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
                 <TextView
                     android:id="@+id/tv_name"
                     android:layout_weight="3"
@@ -39,10 +40,10 @@
                     android:text="张三"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
             <LinearLayout
-                android:layout_marginTop="10sp"
+                android:layout_marginTop="30sp"
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -54,7 +55,7 @@
                     android:text="身份证"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
                 <TextView
                     android:id="@+id/tv_id_card"
                     android:layout_weight="3"
@@ -64,8 +65,25 @@
                     android:text="520************4153"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:orientation="vertical"
+            android:layout_weight="5"
+            android:gravity="right"
+            android:layout_height="wrap_content">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="right"
+                android:id="@+id/btn_del"
+                android:layout_marginTop="50dp"
+                android:text="删除"
+                android:textColor="@color/red"
+                android:textFontWeight="800"
+                android:textSize="@dimen/text_50dp_size" />
+        </LinearLayout>
     </LinearLayout>
 </LinearLayout>

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

@@ -7,10 +7,10 @@
 
 
     <LinearLayout
-        android:layout_margin="10sp"
+        android:layout_margin="20dp"
         android:layout_width="match_parent"
         android:orientation="vertical"
-        android:padding="15sp"
+        android:padding="40dp"
         android:background="@drawable/bg_info_01"
         android:layout_height="wrap_content">
         <LinearLayout
@@ -18,30 +18,33 @@
             android:orientation="horizontal"
             android:layout_height="wrap_content">
             <LinearLayout
-                android:layout_width="match_parent"
+                android:layout_width="90dp"
                 android:orientation="vertical"
                 android:gravity="center_vertical"
                 android:layout_height="match_parent">
                 <CheckBox
                     android:id="@+id/cb_check"
-                    android:layout_width="30dp"
+                    android:layout_width="60dp"
+                    android:layout_marginLeft="50dp"
+                    android:layout_height="match_parent"
                     android:layout_centerInParent="true"
-                    android:layout_height="30dp" />
+                    android:scaleX="3"
+                    android:scaleY="3" />
             </LinearLayout>
             <LinearLayout
-                android:layout_width="86dp"
-                android:layout_marginLeft="10sp"
-                android:layout_height="130dp">
+                android:layout_width="300dp"
+                android:layout_marginLeft="30sp"
+                android:layout_height="400dp">
                 <ImageView
                     android:id="@+id/iv_showImg"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="300dp"
+                    android:layout_height="400dp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/ticket_img" />
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_marginLeft="15sp"
+                android:layout_marginLeft="60dp"
                 android:orientation="vertical"
                 android:layout_height="wrap_content">
                 <TextView
@@ -52,27 +55,27 @@
                     android:text="《伟大转折》-【成人票】"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_50dp_size" />
                 <TextView
                     android:id="@+id/iv_performDate"
-                    android:layout_marginTop="5sp"
+                    android:layout_marginTop="20sp"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="left"
                     android:text="日期 2023-11-27"
                     android:textColor="@color/gray"
                     android:textFontWeight="800"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_40dp_size" />
                 <TextView
                     android:id="@+id/iv_goodsName"
-                    android:layout_marginTop="5sp"
+                    android:layout_marginTop="20sp"
                     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" />
+                    android:textSize="@dimen/text_40dp_size" />
 <!--                <TextView-->
 <!--                    android:id="@+id/iv_performStart_performEnd"-->
 <!--                    android:layout_marginTop="5sp"-->
@@ -85,24 +88,24 @@
 <!--                    android:textSize="16sp" />-->
                 <TextView
                     android:id="@+id/iv_seat"
-                    android:layout_marginTop="5sp"
+                    android:layout_marginTop="20sp"
                     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" />
+                    android:textSize="@dimen/text_40dp_size" />
                 <TextView
                     android:id="@+id/iv_name"
-                    android:layout_marginTop="30sp"
+                    android:layout_marginTop="40sp"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="left"
                     android:text="张三 "
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="13sp" />
+                    android:textSize="@dimen/text_40dp_size" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -7,10 +7,10 @@
 
 
     <LinearLayout
-        android:layout_margin="10sp"
+        android:layout_margin="20sp"
         android:layout_width="match_parent"
         android:orientation="vertical"
-        android:padding="15sp"
+        android:padding="40dp"
         android:background="@drawable/bg_take"
         android:layout_height="wrap_content">
         <LinearLayout
@@ -19,20 +19,21 @@
             android:background="@drawable/bg_take"
             android:layout_height="wrap_content">
             <LinearLayout
-                android:layout_width="100dp"
+                android:layout_width="300dp"
                 android:background="@drawable/bg_take"
-                android:layout_height="130dp">
+                android:layout_height="400dp">
+
                 <ImageView
                     android:id="@+id/ip_showImg"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="300dp"
+                    android:layout_height="400dp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/ticket_img" />
             </LinearLayout>
             <LinearLayout
                 android:layout_weight="1"
                 android:layout_width="match_parent"
-                android:layout_marginLeft="15sp"
+                android:layout_marginLeft="30sp"
                 android:orientation="vertical"
                 android:background="@drawable/bg_take"
                 android:layout_height="wrap_content">
@@ -44,18 +45,18 @@
                     android:text="《伟大转折》-【成人成人票票】"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="15sp" />
+                    android:textSize="@dimen/text_50dp_size" />
                 <TextView
-                    android:layout_marginTop="60sp"
+                    android:layout_marginTop="200sp"
                     android:id="@+id/purchase_btn"
-                    android:layout_width="130dp"
-                    android:layout_height="30dp"
+                    android:layout_width="360dp"
+                    android:layout_height="120dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="立即购票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="15sp" />
+                    android:textSize="@dimen/text_50dp_size" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

app/src/main/res/values/dimens.xml

@@ -1,4 +1,9 @@
 <resources>
     <dimen name="fab_margin">16dp</dimen>
     <dimen name="inedx_btn_size">20sp</dimen>
+    <dimen name="text_70dp_size">70dp</dimen>
+    <dimen name="text_60dp_size">60dp</dimen>
+    <dimen name="text_50dp_size">50dp</dimen>
+    <dimen name="text_40dp_size">40dp</dimen>
+    <dimen name="text_30dp_size">30dp</dimen>
 </resources>