Bläddra i källkod

样式调整修改

zhongzhao 1 år sedan
förälder
incheckning
2f5240f11f

+ 0 - 1
app/src/main/java/com/hw/nativeapp/ui/activity/IssueTicketsActivity.java

@@ -267,7 +267,6 @@ public class IssueTicketsActivity extends BaseActivity  {
 //                Toast.makeText(IssueTicketsActivity.this, "打印失败", Toast.LENGTH_SHORT).show();
 //                return;
 //            }
-            Toast.makeText(IssueTicketsActivity.this, "printNum: " + printNum, Toast.LENGTH_SHORT).show();
             if(printNum  < viewerList.size()){
                 //  打印完成,开始打印下一张
                 printNum++;

+ 0 - 1
app/src/main/java/com/hw/nativeapp/ui/activity/MainActivity.java

@@ -100,7 +100,6 @@ public class MainActivity extends BaseActivity  {
                     .show();
         } else {
             loginIn();
-            Log.e("deviceId","---------------deviceId--------------"+deviceId);
         }
     }
 

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

@@ -137,7 +137,7 @@ public class PaymentMethodActivity extends BaseActivity  {
                         if(data.getBooleanValue("needPay")){
                             String payInfo = data.getString("payInfo");
                             //微信支付
-                            Bitmap weiEQ = ImageUtils.createQRImage(payInfo, 600, 600);
+                            Bitmap weiEQ = ImageUtils.createQRImage(payInfo, 500, 500);
                             wechat_pay.setImageBitmap(weiEQ);
 //                            String payType = "alipay";
 //                            if(payType.equals("alipay")){

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

@@ -305,11 +305,11 @@ public class SelectInfoActivity extends BaseActivity  {
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
             textView.setPadding(0,10,0,0);
-            textView.setTextSize(33);
+            textView.setTextSize(20);
             textView.setText(DateUtils.getWeek(list.getJSONObject(i).getString("performDate")));
             // 创建时TextView对象
             TextView textView1 = new TextView(this);
-            textView1.setTextSize(33);
+            textView1.setTextSize(20);
             textView1.setPadding(0,10,0,0);
             textView1.setGravity(Gravity.CENTER);
             textView1.setText(list.getJSONObject(i).getString("performDate"));
@@ -364,7 +364,7 @@ public class SelectInfoActivity extends BaseActivity  {
             // 创建天TextView对象
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
-            textView.setTextSize(33);
+            textView.setTextSize(20);
             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";
@@ -417,7 +417,7 @@ public class SelectInfoActivity extends BaseActivity  {
             // 创建天TextView对象
             TextView textView = new TextView(this);
             textView.setGravity(Gravity.CENTER);
-            textView.setTextSize(33);
+            textView.setTextSize(20);
             textView.setText(list.getJSONObject(i).getString("goodsName"));
 
             if(i == 0){
@@ -465,7 +465,7 @@ public class SelectInfoActivity extends BaseActivity  {
 
             // 创建天TextView对象
             TextView textView = new TextView(this);
-            textView.setTextSize(33);
+            textView.setTextSize(20);
             textView.setGravity(Gravity.CENTER);
             textView.setText(list.getJSONObject(i).getString("seatTypeName") + ": " + list.getJSONObject(i).getString("salePrice") + "元");
             if(i == 0){

+ 45 - 25
app/src/main/res/layout/activity_info_enter.xml

@@ -6,23 +6,43 @@
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
 
-    <com.hjq.bar.TitleBar
-        android:id="@+id/tb_main_bar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="信息录入"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="信息录入"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
     <ScrollView
         android:id="@+id/sv"
+        android:layout_marginTop="650dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_below="@+id/tb_main_bar">
@@ -30,7 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="top"
-            android:layout_marginTop="60sp"
+            android:layout_marginTop="30sp"
             android:orientation="vertical"
             android:padding="60sp">
 
@@ -38,19 +58,19 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginTop="20sp"
+                android:layout_marginTop="10sp"
                 android:layout_weight="1"
                 android:background="@drawable/bg_take"
                 android:orientation="vertical"
-                android:padding="30sp">
+                android:padding="60sp">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_marginTop="80sp"
+                    android:layout_marginTop="10sp"
                     android:gravity="center"
                     android:orientation="vertical"
-                    android:paddingBottom="60sp">
+                    android:paddingBottom="10sp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -59,17 +79,17 @@
                         android:gravity="center"
                         android:paddingLeft="80dp"
                         android:paddingRight="80dp"
-                        android:paddingTop="20dp"
-                        android:paddingBottom="20dp"
+                        android:paddingTop="10dp"
+                        android:paddingBottom="10dp"
                         android:text="请将身份证放置在读卡区!"
                         android:textColor="@color/white"
                         android:textFontWeight="800"
                         android:textSize="@dimen/text_30dp_size" />
 
                     <ImageView
-                        android:layout_width="800dp"
-                        android:layout_height="400dp"
-                        android:layout_marginTop="100sp"
+                        android:layout_width="600dp"
+                        android:layout_height="350dp"
+                        android:layout_marginTop="80sp"
                         android:scaleType="fitXY"
                         android:src="@mipmap/idcard" />
 
@@ -87,7 +107,7 @@
                             android:layout_marginTop="10sp"
                             android:text="忘带身份证?"
                             android:textColor="@color/login_bk"
-                            android:textSize="@dimen/text_30dp_size" />
+                            android:textSize="@dimen/inedx_btn_size" />
                     </LinearLayout>
                 </LinearLayout>
 

+ 44 - 25
app/src/main/res/layout/activity_info_input.xml

@@ -5,27 +5,46 @@
     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"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="信息录入"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="信息录入"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="220sp"
+        android:layout_marginTop="650sp"
         android:orientation="vertical"
         android:padding="60sp">
 
@@ -49,18 +68,18 @@
                     <TextView
                         android:id="@+id/idCard_btn"
                         android:layout_width="wrap_content"
-                        android:layout_height="100dp"
+                        android:layout_height="70dp"
                         android:layout_marginTop="10sp"
                         android:gravity="right"
                         android:text="姓名:"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_50dp_size" />
+                        android:textSize="@dimen/text_30dp_size" />
                     <EditText
                         android:id="@+id/et_name"
                         android:text=""
                         android:layout_width="match_parent"
-                        android:layout_height="100dp"
-                        android:textSize="@dimen/text_50dp_size"
+                        android:layout_height="70dp"
+                        android:textSize="@dimen/text_30dp_size"
                         android:background="@android:drawable/edit_text"
                         android:hint="请输入" />
                 </LinearLayout>
@@ -73,19 +92,19 @@
                     android:orientation="horizontal">
                     <TextView
                         android:layout_width="wrap_content"
-                        android:layout_height="100dp"
+                        android:layout_height="70dp"
                         android:layout_marginTop="10sp"
                         android:gravity="right"
                         android:text="身份证号码:"
                         android:inputType="text"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_50dp_size" />
+                        android:textSize="@dimen/text_30dp_size" />
                     <EditText
                         android:id="@+id/et_idcard"
                         android:layout_width="match_parent"
-                        android:layout_height="100dp"
+                        android:layout_height="70dp"
                         android:digits="0123456789X"
-                        android:textSize="@dimen/text_50dp_size"
+                        android:textSize="@dimen/text_30dp_size"
                         android:text=""
                         android:background="@android:drawable/edit_text"
                         android:hint="请输入" />
@@ -103,7 +122,7 @@
                 <TextView
                     android:id="@+id/input_btn"
                     android:layout_width="wrap_content"
-                    android:layout_height="100dp"
+                    android:layout_height="80dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
@@ -111,7 +130,7 @@
                     android:text="确定"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

+ 48 - 28
app/src/main/res/layout/activity_issue_tickets.xml

@@ -5,24 +5,45 @@
     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"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:title="自助取票"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
 
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="自助取票"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="200sp"
+        android:layout_marginTop="620sp"
         android:orientation="vertical"
         android:padding="60sp">
 
@@ -45,7 +66,7 @@
                     android:text="门票正在打印中,请稍后......"
                     android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
         </LinearLayout>
 
@@ -62,7 +83,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="50sp"
                 android:gravity="center"
                 android:orientation="vertical"
                 android:paddingBottom="30sp">
@@ -70,9 +90,9 @@
                 <TextView
                     android:id="@+id/tx_issue_txt"
                     android:layout_width="wrap_content"
-                    android:layout_height="100dp"
-                    android:paddingBottom="20dp"
-                    android:paddingTop="20dp"
+                    android:layout_height="wrap_content"
+                    android:paddingBottom="10dp"
+                    android:paddingTop="10dp"
                     android:paddingLeft="100dp"
                     android:paddingRight="100dp"
                     android:background="@drawable/bg_btn_01"
@@ -80,13 +100,13 @@
                     android:text="注意出票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <ImageView
                     android:id="@+id/img_issue_tickets"
-                    android:layout_width="900dp"
-                    android:layout_height="600dp"
-                    android:layout_marginTop="90sp"
+                    android:layout_width="400dp"
+                    android:layout_height="250dp"
+                    android:layout_marginTop="50sp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/issue_tickets" />
 
@@ -94,14 +114,14 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:gravity="center"
-                    android:layout_marginTop="60dp">
+                    android:layout_marginTop="40dp">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="正在为您打印"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_40dp_size" />
+                        android:textSize="@dimen/inedx_btn_size" />
 
 <!--                    <TextView-->
 <!--                        android:id="@+id/print_num"-->
@@ -116,13 +136,13 @@
                         android:layout_height="wrap_content"
                         android:text="张,请注意下方出票口取票..."
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_40dp_size" />
+                        android:textSize="@dimen/inedx_btn_size" />
                 </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="30dp"
+                    android:layout_marginTop="20dp"
                     android:gravity="center"
                     android:orientation="vertical">
 
@@ -132,16 +152,16 @@
                         android:layout_height="wrap_content"
                         android:text="本机小票不足,请联系工作人员"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_40dp_size" />
+                        android:textSize="@dimen/inedx_btn_size" />
 
                     <TextView
                         android:id="@+id/tx_customerMobile"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="30dp"
+                        android:layout_marginTop="20dp"
                         android:text="客服电话:400-992-1888"
                         android:textColor="@color/login_bk"
-                        android:textSize="@dimen/text_40dp_size" />
+                        android:textSize="@dimen/inedx_btn_size" />
                 </LinearLayout>
             </LinearLayout>
 

+ 18 - 19
app/src/main/res/layout/activity_main.xml

@@ -24,7 +24,7 @@
                 <ImageView
                     android:id="@+id/main_img"
                     android:layout_width="match_parent"
-                    android:layout_height="1000dp"
+                    android:layout_height="650dp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/main_top" />
 
@@ -38,9 +38,8 @@
 
                 <TextView
                     android:id="@+id/tx_top_hide"
-                    android:layout_width="420dp"
+                    android:layout_width="80dp"
                     android:layout_height="80dp"
-                    android:layout_marginTop="20sp"
                     android:gravity="center"
                     android:text=""
                     android:textColor="@color/black"
@@ -50,9 +49,9 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="80sp"
-                android:layout_marginTop="160dp"
-                android:layout_marginRight="80sp"
+                android:layout_marginLeft="60sp"
+                android:layout_marginRight="60sp"
+                android:layout_marginTop="40dp"
                 android:gravity="center"
                 android:orientation="vertical">
 
@@ -65,24 +64,24 @@
                     <LinearLayout
                         android:id="@+id/take_btn"
                         android:layout_width="match_parent"
-                        android:layout_height="700dp"
+                        android:layout_height="400dp"
                         android:layout_gravity="center"
                         android:layout_marginRight="50dp"
                         android:layout_weight="1"
                         android:background="@mipmap/take_bj"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:padding="90dp">
+                        android:padding="60dp">
 
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="30dp"
+                            android:layout_marginTop="40dp"
                             android:gravity="center"
                             android:text="自助取票"
                             android:textColor="@color/white"
                             android:textFontWeight="900"
-                            android:textSize="@dimen/text_70dp_size" />
+                            android:textSize="@dimen/text_50dp_size" />
 
                         <RelativeLayout
                             android:layout_width="match_parent"
@@ -91,8 +90,8 @@
                             android:gravity="center">
 
                             <ImageView
-                                android:layout_width="300dp"
-                                android:layout_height="300dp"
+                                android:layout_width="100dp"
+                                android:layout_height="100dp"
                                 android:scaleType="fitXY"
                                 android:src="@mipmap/take_icon" />
                         </RelativeLayout>
@@ -108,17 +107,17 @@
                         android:background="@mipmap/purchase_bj"
                         android:gravity="center"
                         android:orientation="vertical"
-                        android:padding="90dp">
+                        android:padding="60dp">
 
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="30dp"
+                            android:layout_marginTop="40dp"
                             android:gravity="center"
                             android:text="自助购票"
                             android:textColor="@color/white"
                             android:textFontWeight="900"
-                            android:textSize="@dimen/text_70dp_size" />
+                            android:textSize="@dimen/text_50dp_size" />
 
                         <RelativeLayout
                             android:layout_width="match_parent"
@@ -127,8 +126,8 @@
                             android:gravity="center">
 
                             <ImageView
-                                android:layout_width="300dp"
-                                android:layout_height="300dp"
+                                android:layout_width="100dp"
+                                android:layout_height="100dp"
                                 android:scaleType="fitXY"
                                 android:src="@mipmap/purchase_icon" />
                         </RelativeLayout>
@@ -156,7 +155,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:gravity="center"
-                        android:layout_marginTop="320dp"
+                        android:layout_marginTop="220dp"
                         android:orientation="horizontal">
 
                         <TextView
@@ -167,7 +166,7 @@
                             android:gravity="left"
                             android:text="客服电话:0851-28256633"
                             android:textColor="@color/black"
-                            android:textSize="@dimen/text_50dp_size" />
+                            android:textSize="@dimen/text_30dp_size" />
 
                         <TextView
                             android:id="@+id/tx_hide"

+ 48 - 28
app/src/main/res/layout/activity_payment_method.xml

@@ -5,27 +5,46 @@
     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"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="支付方式"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="支付方式"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="160dp"
+        android:layout_marginTop="600dp"
         android:orientation="vertical"
         android:padding="60dp">
 
@@ -42,25 +61,25 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="80dp"
+                android:layout_marginTop="40dp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="60sp">
+                android:paddingBottom="30sp">
 <!--                选择支付方式-->
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="100dp"
+                    android:layout_height="60dp"
                     android:layout_weight="1"
                     android:gravity="center"
                     android:text="微信扫码支付"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="80dp"
+                    android:layout_marginTop="30dp"
                     android:gravity="center"
                     android:orientation="horizontal">
 
@@ -72,27 +91,27 @@
                         android:layout_marginRight="15sp"
                         android:orientation="vertical">
                         <LinearLayout
-                            android:layout_width="800dp"
-                            android:layout_height="800dp"
+                            android:layout_width="350dp"
+                            android:layout_height="350dp"
                             android:gravity="center"
                             android:background="@mipmap/eq_code_box"
                             android:orientation="horizontal">
                             <ImageView
                                 android:id="@+id/wechat_pay"
-                                android:layout_width="700dp"
-                                android:layout_height="700dp"
+                                android:layout_width="300dp"
+                                android:layout_height="300dp"
                                 android:src="@mipmap/eq_code_ing"
                                 android:scaleType="fitXY" />
                         </LinearLayout>
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:layout_marginTop="90sp"
+                            android:layout_marginTop="60sp"
                             android:gravity="center"
                             android:orientation="horizontal">
                             <ImageView
-                                android:layout_width="80dp"
-                                android:layout_height="80dp"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
                                 android:scaleType="fitXY"
                                 android:layout_marginRight="5sp"
                                 android:src="@mipmap/weix_icon" />
@@ -101,9 +120,10 @@
                                 android:layout_height="wrap_content"
                                 android:gravity="center"
                                 android:text="微信支付"
+                                android:layout_marginLeft="5dp"
                                 android:textColor="@color/black"
                                 android:textFontWeight="800"
-                                android:textSize="@dimen/text_50dp_size" />
+                                android:textSize="@dimen/inedx_btn_size" />
                         </LinearLayout>
                     </LinearLayout>
 <!--                    <LinearLayout-->

+ 135 - 110
app/src/main/res/layout/activity_purchase_info.xml

@@ -6,143 +6,168 @@
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
 
-    <com.hjq.bar.TitleBar
-        android:id="@+id/tb_main_bar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="信息录入"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
 
+    </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:layout_marginTop="160dp"
-        android:orientation="vertical"
-        android:padding="60dp">
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="信息录入"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
+
+    <ScrollView
+        android:layout_marginTop="600dp"
+        android:layout_marginBottom="30dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/tb_main_bar">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginTop="20sp"
-            android:background="@drawable/bg_take"
+            android:layout_gravity="top"
             android:orientation="vertical"
             android:padding="60dp">
-
-            <ScrollView
-                android:id="@+id/sv"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_below="@+id/tb_main_bar">
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginTop="20sp"
+                android:background="@drawable/bg_take"
+                android:orientation="vertical"
+                android:padding="60dp">
 
-                <LinearLayout
+                <ScrollView
+                    android:id="@+id/sv"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:layout_marginBottom="20sp"
-                    android:orientation="vertical">
-                    <TextView
-                        android:id="@+id/tx_noDataShow"
-                        android:layout_below="@+id/tb_main_bar"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="40sp"
-                        android:gravity="center"
-                        android:textSize="@dimen/text_50dp_size"
-                        android:visibility="gone"
-                        android:text="没有对应票据"/>
+                    android:layout_height="match_parent"
+                    android:layout_below="@+id/tb_main_bar">
 
-                    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                    <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_below="@+id/tb_main_bar"
-                        android:layout_marginTop="60sp"
-                        android:id="@+id/refreshLayout"
-                        android:layout_height="match_parent">
-
-                        <androidx.recyclerview.widget.RecyclerView
-                            android:id="@+id/list_stock"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:layout_marginBottom="20sp"
+                        android:orientation="vertical">
+                        <TextView
+                            android:id="@+id/tx_noDataShow"
+                            android:layout_below="@+id/tb_main_bar"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
+                            android:layout_marginTop="40sp"
+                            android:gravity="center"
+                            android:textSize="@dimen/text_30dp_size"
+                            android:visibility="gone"
+                            android:text="没有对应票据"/>
 
-                    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
-                </LinearLayout>
+                        <com.scwang.smartrefresh.layout.SmartRefreshLayout
+                            android:layout_width="match_parent"
+                            android:layout_below="@+id/tb_main_bar"
+                            android:layout_marginTop="60sp"
+                            android:id="@+id/refreshLayout"
+                            android:layout_height="match_parent">
 
-            </ScrollView>
+                            <androidx.recyclerview.widget.RecyclerView
+                                android:id="@+id/list_stock"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                app:layout_constraintBottom_toBottomOf="parent"
+                                app:layout_constraintEnd_toEndOf="parent"
+                                app:layout_constraintStart_toStartOf="parent"
+                                app:layout_constraintTop_toTopOf="parent" />
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="50dp"
-                android:gravity="right"
-                android:orientation="horizontal">
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:id="@+id/tx_num"
-                    android:text="共2张, 合计"
-                    android:textColor="@color/black"
-                    android:textFontWeight="800"
-                    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="@dimen/text_50dp_size" />
-            </LinearLayout>
+                        </com.scwang.smartrefresh.layout.SmartRefreshLayout>
+                    </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="80dp"
-                android:gravity="center"
-                android:paddingBottom="30sp"
-                android:orientation="horizontal">
+                </ScrollView>
 
-                <TextView
-                    android:id="@+id/continue_btn"
+                <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/bg_btn_01"
-                    android:gravity="center"
-                    android:padding="20sp"
-                    android:layout_marginRight="20sp"
-                    android:text="继续添加观影人"
-                    android:textColor="@color/white"
-                    android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
-                <TextView
-                    android:id="@+id/determine_btn"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="50dp"
+                    android:gravity="right"
+                    android:orientation="horizontal">
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:id="@+id/tx_num"
+                        android:text="共2张, 合计"
+                        android:textColor="@color/black"
+                        android:textFontWeight="800"
+                        android:textSize="@dimen/text_30dp_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="@dimen/text_30dp_size" />
+                </LinearLayout>
+
+                <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:background="@drawable/bg_btn_01"
+                    android:layout_marginTop="80dp"
                     android:gravity="center"
-                    android:padding="20sp"
-                    android:text="确定付款"
-                    android:layout_marginLeft="20sp"
-                    android:textColor="@color/white"
-                    android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:paddingBottom="30sp"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:id="@+id/continue_btn"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_btn_01"
+                        android:gravity="center"
+                        android:padding="10sp"
+                        android:layout_marginRight="20sp"
+                        android:text="继续添加观影人"
+                        android:textColor="@color/white"
+                        android:textFontWeight="800"
+                        android:textSize="@dimen/text_30dp_size" />
+                    <TextView
+                        android:id="@+id/determine_btn"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:background="@drawable/bg_btn_01"
+                        android:gravity="center"
+                        android:padding="10sp"
+                        android:text="确定付款"
+                        android:layout_marginLeft="20sp"
+                        android:textColor="@color/white"
+                        android:textFontWeight="800"
+                        android:textSize="@dimen/text_30dp_size" />
+                </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
+    </ScrollView>
 
 </RelativeLayout>

+ 44 - 27
app/src/main/res/layout/activity_scan_code_pay.xml

@@ -5,27 +5,45 @@
     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"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="扫码支付"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
 
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="扫码支付"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="160sp"
+        android:layout_marginTop="600sp"
         android:orientation="vertical"
         android:padding="60dp">
 
@@ -42,15 +60,14 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="90sp">
+                android:paddingBottom="40sp">
 
                 <ImageView
                     android:id="@+id/im_pay_result"
-                    android:layout_width="800dp"
-                    android:layout_height="480dp"
+                    android:layout_width="400dp"
+                    android:layout_height="300dp"
                     android:layout_marginTop="60sp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/code_ok" />
@@ -58,7 +75,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="90sp"
+                    android:layout_marginTop="60sp"
                     android:gravity="center"
                     android:orientation="vertical">
                     <TextView
@@ -67,31 +84,31 @@
                         android:layout_height="wrap_content"
                         android:text="支付成功"
                         android:textColor="@color/login_bk"
-                        android:textSize="@dimen/text_50dp_size" />
+                        android:textSize="@dimen/text_30dp_size" />
                     <TextView
                         android:id="@+id/tx_pay_result_money"
-                        android:layout_marginTop="30sp"
+                        android:layout_marginTop="20sp"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="共2张,合计¥488"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/text_40dp_size" />
+                        android:textSize="@dimen/inedx_btn_size" />
                 </LinearLayout>
                 <TextView
                     android:id="@+id/code_btn"
-                    android:layout_marginTop="60sp"
+                    android:layout_marginTop="40sp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:paddingLeft="100dp"
                     android:paddingRight="100dp"
-                    android:paddingTop="20dp"
-                    android:paddingBottom="20dp"
+                    android:paddingTop="10dp"
+                    android:paddingBottom="10dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="打印小票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
 
         </LinearLayout>

+ 46 - 26
app/src/main/res/layout/activity_select_info.xml

@@ -6,25 +6,45 @@
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
 
+    <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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
 
-    <com.hjq.bar.TitleBar
-        android:id="@+id/tb_main_bar"
+    </LinearLayout>
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="选择信息"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="选择信息"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
 
     <ScrollView
         android:id="@+id/sv"
+        android:layout_marginTop="650dp"
+        android:layout_marginBottom="30dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/tb_main_bar">
@@ -47,13 +67,13 @@
                 android:text="演出信息"
                 android:textColor="@color/black"
                 android:textFontWeight="800"
-                android:textSize="@dimen/text_50dp_size" />
+                android:textSize="@dimen/text_30dp_size" />
 
             <!--演出时间-->
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="50sp"
+                android:layout_marginTop="30sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -63,7 +83,7 @@
                     android:gravity="left"
                     android:text="演出时间"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/text_40dp_size" />
+                    android:textSize="25dp" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -85,7 +105,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="50sp"
+                android:layout_marginTop="30sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -95,7 +115,7 @@
                     android:gravity="left"
                     android:text="演出场次"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/text_40dp_size" />
+                    android:textSize="25dp" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -189,7 +209,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="50sp"
+                android:layout_marginTop="30sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -199,7 +219,7 @@
                     android:gravity="left"
                     android:text="票务信息"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/text_40dp_size" />
+                    android:textSize="25dp" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -221,7 +241,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="50sp"
+                android:layout_marginTop="30sp"
                 android:orientation="vertical">
 
                 <TextView
@@ -231,7 +251,7 @@
                     android:gravity="left"
                     android:text="类型选择"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/text_40dp_size" />
+                    android:textSize="25dp" />
 
                 <HorizontalScrollView
                     android:layout_width="match_parent"
@@ -253,7 +273,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="120sp"
+                android:layout_marginTop="80sp"
                 android:paddingBottom="40dp"
                 android:gravity="center">
 
@@ -263,11 +283,11 @@
                     android:layout_height="wrap_content"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
-                    android:padding="30dp"
+                    android:padding="15dp"
                     android:text="确定"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
         </LinearLayout>
 

+ 82 - 64
app/src/main/res/layout/activity_take.xml

@@ -5,40 +5,58 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
+    <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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
 
-    <com.hjq.bar.TitleBar
-        android:id="@+id/tb_main_bar"
+    </LinearLayout>
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="自助取票"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="自助取票"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="150sp"
-        android:padding="60sp"
+        android:layout_marginTop="700sp"
+        android:padding="30sp"
         android:layout_gravity="top">
 
         <LinearLayout
             android:id="@+id/take_btn"
             android:layout_width="230dp"
-            android:layout_height="1200dp"
+            android:layout_height="700dp"
             android:layout_gravity="center"
             android:layout_marginRight="30sp"
             android:layout_weight="1"
             android:background="@drawable/bg_take"
             android:orientation="vertical"
-            android:padding="50sp">
+            android:padding="30sp">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -54,24 +72,24 @@
                     android:text="取票码/手机号取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="100dp"
-                android:layout_marginTop="60sp"
+                android:layout_height="60dp"
+                android:layout_marginTop="30sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <EditText
                     android:id="@+id/et_modify_quantity"
                     android:layout_width="match_parent"
-                    android:layout_height="100dp"
+                    android:layout_height="60dp"
                     android:enabled="true"
                     android:focusable="false"
-                    android:textSize="@dimen/text_40dp_size"
-                    android:paddingLeft="20dp"
+                    android:textSize="@dimen/inedx_btn_size"
+                    android:paddingLeft="10dp"
                     android:background="@android:drawable/edit_text"
                     android:hint="取票码/手机号取票"
                     android:text=""
@@ -82,14 +100,14 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="60sp"
+                android:layout_marginTop="30sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_01"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -97,12 +115,12 @@
                     android:text="1"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <TextView
                     android:id="@+id/num_02"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -110,32 +128,32 @@
                     android:text="2"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <TextView
                     android:id="@+id/num_03"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
                     android:text="3"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30sp"
+                android:layout_marginTop="20sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_04"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -143,12 +161,12 @@
                     android:text="4"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <TextView
                     android:id="@+id/num_05"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -156,32 +174,32 @@
                     android:text="5"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <TextView
                     android:id="@+id/num_06"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
                     android:text="6"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30sp"
+                android:layout_marginTop="20sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_07"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -189,12 +207,12 @@
                     android:text="7"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <TextView
                     android:id="@+id/num_08"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -202,32 +220,32 @@
                     android:text="8"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <TextView
                     android:id="@+id/num_09"
                     android:layout_width="wrap_content"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
                     android:text="9"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30sp"
+                android:layout_marginTop="20sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/num_0"
                     android:layout_width="120dp"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
@@ -235,24 +253,24 @@
                     android:text="0"
                     android:textColor="@color/blue"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
 
                 <TextView
                     android:id="@+id/num_empty"
                     android:layout_width="120dp"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_marginRight="30sp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
                     android:text="清空"
                     android:textColor="@color/blue"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/inedx_btn_size" />
 
                 <TextView
                     android:id="@+id/num_del"
                     android:layout_width="120dp"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:layout_weight="1"
                     android:background="@drawable/bg_num_01"
                     android:gravity="center"
@@ -260,36 +278,36 @@
                     android:paddingBottom="7sp"
                     android:text="删除"
                     android:textColor="@color/blue"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/inedx_btn_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="120dp"
-                android:layout_marginTop="80sp"
+                android:layout_height="60dp"
+                android:layout_marginTop="50sp"
                 android:gravity="center"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/purchase_btn"
                     android:layout_width="match_parent"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="立即取票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="230dp"
-            android:layout_height="1200dp"
+            android:layout_height="700dp"
             android:layout_marginLeft="15sp"
             android:layout_weight="1"
             android:background="@drawable/bg_take"
-            android:padding="50sp"
+            android:padding="30sp"
             android:orientation="vertical">
 
             <LinearLayout
@@ -306,13 +324,13 @@
                     android:text="二维码/身份证取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="60sp"
+                android:layout_marginTop="40sp"
                 android:gravity="center">
 
                 <TextView
@@ -323,19 +341,19 @@
                     android:text="请选择二维码/身份证对准扫码区域"
                     android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_30dp_size" />
+                    android:textSize="18dp" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="800dp"
-                android:layout_marginTop="70sp"
+                android:layout_height="700dp"
+                android:layout_marginTop="40sp"
                 android:gravity="top"
                 android:orientation="vertical">
                 <ImageView
                     android:id="@+id/img_code_btn"
                     android:layout_width="match_parent"
-                    android:layout_height="820dp"
+                    android:layout_height="420dp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/idcard_demonstrate" />
 <!--                <ImageView-->

+ 46 - 27
app/src/main/res/layout/activity_ticket_collection.xml

@@ -6,27 +6,46 @@
     android:layout_height="match_parent"
     android:background="@mipmap/page_bj">
 
-    <com.hjq.bar.TitleBar
-        android:id="@+id/tb_main_bar"
+    <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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
+
+    </LinearLayout>
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="自助取票"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="自助取票"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="top"
-        android:layout_marginTop="190sp"
+        android:layout_marginTop="700sp"
         android:layout_marginLeft="30sp"
         android:layout_marginRight="30sp"
         android:layout_marginBottom="100sp"
@@ -51,10 +70,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_below="@+id/tb_main_bar"
-                    android:padding="40dp"
+                    android:padding="30dp"
                     android:gravity="center"
                     android:text="没有对应票据"
-                    android:textSize="@dimen/text_50dp_size"
+                    android:textSize="@dimen/text_30dp_size"
                     android:visibility="gone" />
 
                 <com.scwang.smartrefresh.layout.SmartRefreshLayout
@@ -85,13 +104,13 @@
         android:background="@drawable/bg_take"
         android:gravity="center"
         android:orientation="horizontal"
-        android:paddingLeft="50sp"
-        android:paddingTop="30dp"
-        android:paddingBottom="30dp">
+        android:paddingLeft="30sp"
+        android:paddingTop="20dp"
+        android:paddingBottom="20dp">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="80dp"
+            android:layout_height="60dp"
             android:layout_weight="1"
             android:orientation="horizontal">
 
@@ -101,8 +120,8 @@
                 android:layout_marginLeft="40dp"
                 android:layout_height="match_parent"
                 android:layout_centerInParent="true"
-                android:scaleX="3"
-                android:scaleY="3" />
+                android:scaleX="2"
+                android:scaleY="2" />
 
             <TextView
                 android:id="@+id/txt_btn"
@@ -112,12 +131,12 @@
                 android:layout_marginTop="5dp"
                 android:text="全选"
                 android:textColor="@color/black"
-                android:textSize="@dimen/text_50dp_size" />
+                android:textSize="@dimen/text_30dp_size" />
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="120dp"
+            android:layout_height="60dp"
             android:layout_weight="1"
             android:paddingLeft="30dp"
             android:paddingRight="30dp"
@@ -126,14 +145,14 @@
             <TextView
                 android:id="@+id/print_btn"
                 android:layout_width="match_parent"
-                android:layout_height="120dp"
+                android:layout_height="60dp"
                 android:layout_marginLeft="20sp"
                 android:background="@drawable/bg_btn_01"
                 android:gravity="center"
                 android:text="确定打印"
                 android:textColor="@color/white"
                 android:textFontWeight="800"
-                android:textSize="@dimen/text_50dp_size" />
+                android:textSize="@dimen/text_30dp_size" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

+ 37 - 15
app/src/main/res/layout/activity_ticket_purchase.xml

@@ -5,23 +5,45 @@
     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"
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="150dp"
-        android:background="@color/login_bk"
-        app:leftColor="@color/white"
-        app:leftIcon="@mipmap/left_88_icon"
-        app:leftSize="@dimen/text_40dp_size"
-        app:leftTitle="返回"
-        app:rightColor="@color/white"
-        app:rightSize="@dimen/text_40dp_size"
-        app:rightTitle="120s"
-        app:title="自助购票"
-        app:titleColor="@color/white"
-        app:titleSize="@dimen/text_50dp_size" />
+        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="550dp"
+            android:scaleType="fitXY"
+            android:src="@mipmap/main_top" />
+
+    </LinearLayout>
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="550dp">
+        <com.hjq.bar.TitleBar
+            android:id="@+id/tb_main_bar"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:background="@color/login_bk"
+            app:leftColor="@color/white"
+            app:leftIcon="@mipmap/left_44_icon"
+            app:leftSize="@dimen/inedx_btn_size"
+            app:leftTitle="返回"
+            app:rightColor="@color/white"
+            app:rightSize="@dimen/inedx_btn_size"
+            app:rightTitle="120s"
+            app:title="自助取票"
+            app:titleColor="@color/white"
+            app:titleSize="@dimen/text_30dp_size" />
+    </LinearLayout>
+
     <ScrollView
         android:id="@+id/sv"
+        android:layout_marginTop="600dp"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@+id/tb_main_bar">
@@ -40,7 +62,7 @@
                 android:layout_marginTop="120sp"
                 android:gravity="center"
                 android:visibility="gone"
-                android:textSize="@dimen/text_50dp_size"
+                android:textSize="@dimen/text_30dp_size"
                 android:text="没有对应票据"/>
 
             <com.scwang.smartrefresh.layout.SmartRefreshLayout

+ 7 - 7
app/src/main/res/layout/item_purchase_info.xml

@@ -7,10 +7,10 @@
 
 
     <LinearLayout
-        android:layout_margin="30sp"
+        android:layout_margin="20sp"
         android:layout_width="match_parent"
         android:orientation="horizontal"
-        android:padding="50dp"
+        android:padding="30dp"
         android:background="@drawable/bg_info_01"
         android:layout_height="wrap_content">
         <LinearLayout
@@ -30,7 +30,7 @@
                     android:text="姓名"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
                 <TextView
                     android:id="@+id/tv_name"
                     android:layout_weight="3"
@@ -40,7 +40,7 @@
                     android:text="张三"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
             <LinearLayout
                 android:layout_marginTop="30sp"
@@ -55,7 +55,7 @@
                     android:text="身份证"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
                 <TextView
                     android:id="@+id/tv_id_card"
                     android:layout_weight="3"
@@ -65,7 +65,7 @@
                     android:text="520************4153"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
         </LinearLayout>
         <LinearLayout
@@ -83,7 +83,7 @@
                 android:text="删除"
                 android:textColor="@color/red"
                 android:textFontWeight="800"
-                android:textSize="@dimen/text_50dp_size" />
+                android:textSize="@dimen/text_30dp_size" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>

+ 18 - 18
app/src/main/res/layout/item_ticket_collection.xml

@@ -10,7 +10,7 @@
         android:layout_margin="20dp"
         android:layout_width="match_parent"
         android:orientation="vertical"
-        android:padding="40dp"
+        android:padding="20dp"
         android:background="@drawable/bg_info_01"
         android:layout_height="wrap_content">
         <LinearLayout
@@ -28,23 +28,23 @@
                     android:layout_marginLeft="50dp"
                     android:layout_height="match_parent"
                     android:layout_centerInParent="true"
-                    android:scaleX="3"
-                    android:scaleY="3" />
+                    android:scaleX="2"
+                    android:scaleY="2" />
             </LinearLayout>
             <LinearLayout
-                android:layout_width="300dp"
-                android:layout_marginLeft="30sp"
-                android:layout_height="400dp">
+                android:layout_width="120dp"
+                android:layout_marginLeft="10sp"
+                android:layout_height="200dp">
                 <ImageView
                     android:id="@+id/iv_showImg"
-                    android:layout_width="300dp"
-                    android:layout_height="400dp"
+                    android:layout_width="120dp"
+                    android:layout_height="200dp"
                     android:scaleType="fitXY"
                     android:src="@mipmap/ticket_img" />
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_marginLeft="60dp"
+                android:layout_marginLeft="30dp"
                 android:orientation="vertical"
                 android:layout_height="wrap_content">
                 <TextView
@@ -55,27 +55,27 @@
                     android:text="《伟大转折》-【成人票】"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
                 <TextView
                     android:id="@+id/iv_performDate"
-                    android:layout_marginTop="20sp"
+                    android:layout_marginTop="10sp"
                     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="@dimen/text_40dp_size" />
+                    android:textSize="@dimen/inedx_btn_size" />
                 <TextView
                     android:id="@+id/iv_goodsName"
-                    android:layout_marginTop="20sp"
+                    android:layout_marginTop="10sp"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="left"
                     android:text="普通票"
                     android:textColor="@color/gray"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_40dp_size" />
+                    android:textSize="@dimen/inedx_btn_size" />
 <!--                <TextView-->
 <!--                    android:id="@+id/iv_performStart_performEnd"-->
 <!--                    android:layout_marginTop="5sp"-->
@@ -88,24 +88,24 @@
 <!--                    android:textSize="16sp" />-->
                 <TextView
                     android:id="@+id/iv_seat"
-                    android:layout_marginTop="20sp"
+                    android:layout_marginTop="10sp"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="left"
                     android:text="居民票(贵宾票)"
                     android:textColor="@color/gray"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_40dp_size" />
+                    android:textSize="@dimen/inedx_btn_size" />
                 <TextView
                     android:id="@+id/iv_name"
-                    android:layout_marginTop="40sp"
+                    android:layout_marginTop="18sp"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:gravity="left"
                     android:text="张三 "
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_40dp_size" />
+                    android:textSize="@dimen/inedx_btn_size" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

+ 6 - 6
app/src/main/res/layout/item_ticket_purchase.xml

@@ -19,9 +19,9 @@
             android:background="@drawable/bg_take"
             android:layout_height="wrap_content">
             <LinearLayout
-                android:layout_width="300dp"
+                android:layout_width="150dp"
                 android:background="@drawable/bg_take"
-                android:layout_height="400dp">
+                android:layout_height="200dp">
 
                 <ImageView
                     android:id="@+id/ip_showImg"
@@ -45,18 +45,18 @@
                     android:text="《伟大转折》-【成人成人票票】"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
                 <TextView
-                    android:layout_marginTop="200sp"
+                    android:layout_marginTop="100sp"
                     android:id="@+id/purchase_btn"
                     android:layout_width="360dp"
-                    android:layout_height="120dp"
+                    android:layout_height="60dp"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="立即购票"
                     android:textColor="@color/white"
                     android:textFontWeight="800"
-                    android:textSize="@dimen/text_50dp_size" />
+                    android:textSize="@dimen/text_30dp_size" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

BIN
app/src/main/res/mipmap-hdpi/left_44_icon.png