观影人信息优化

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

@@ -141,15 +141,15 @@ public class IssueTicketsActivity extends BaseActivity  {
         if (isSuccess){
             runOnUiThread(() -> {
                 // 更新用户界面
-                ToastUtils.showShortToast(this, "出票完成！");
-                if (tx_issue_status_text != null){
-                    tx_issue_status_text.setVisibility(View.VISIBLE);
-                    tx_issue_status_text.setText("出票完成～");
-                }
-                if (tx_issue_txt != null){
-                    tx_issue_txt.setVisibility(View.VISIBLE);
-                    tx_issue_txt.setText("请取票！");
-                }
+//                ToastUtils.showShortToast(this, "出票完成！");
+//                if (tx_issue_status_text != null){
+//                    tx_issue_status_text.setVisibility(View.VISIBLE);
+//                    tx_issue_status_text.setText("出票完成～");
+//                }
+//                if (tx_issue_txt != null){
+//                    tx_issue_txt.setVisibility(View.VISIBLE);
+//                    tx_issue_txt.setText("请取票！");
+//                }
                 startCountDownTimer();
             });
             logReport("出票完成");
@@ -335,7 +335,7 @@ public class IssueTicketsActivity extends BaseActivity  {
                         int cutType = itemJson.get("cutType") == null ? 0 : itemJson.getInteger("cutType");
                         logReport("打印切纸开始::cutPx:" + cutPx + " cutType:" + cutType );
                         printService.cutPaper(cutType, cutPx);
-                        logReport("打印走纸结束");
+                        logReport("打印切纸结束");
                     }
                 }
             }else {
@@ -393,7 +393,7 @@ public class IssueTicketsActivity extends BaseActivity  {
                 @SuppressLint("SetTextI18n")
                 @Override
                 public void onTick(long millisUntilFinished) {
-
+                    refreshCountdown(millisUntilFinished);
                 }
 
                 @Override
@@ -405,7 +405,16 @@ public class IssueTicketsActivity extends BaseActivity  {
         }
     }
 
+    private void refreshCountdown(long millisUntilFinished){
+        if (titleBar != null){
+            titleBar.setRightTitle(millisUntilFinished / 1000 + "s");
+        }
+    }
+
+
     private void jumpToMain(){
+
+        logReport("跳转主页");
         stopCountDownTimer();
         Intent i = new Intent (IssueTicketsActivity.this  ,  MainActivity.class  )
                 .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -420,7 +429,7 @@ public class IssueTicketsActivity extends BaseActivity  {
         try {
             deviceId = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
         }catch (Exception ignored){}
-        options.put("apkId", "1");
+        options.put("apkId", String.valueOf(System.currentTimeMillis()));
         options.put("apkTag", deviceId);
         options.put("content", content);
         MApplication.getApiService().apkLog( options, System.currentTimeMillis() / 1000)

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

@@ -11,6 +11,7 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -74,6 +75,11 @@ public class PurchaseInfoActivity extends BaseActivity  {
     TextView tx_personnelNum;
     @BindView(R.id.tx_isAuth)
     TextView tx_isAuth;
+    @BindView(R.id.tx_touristNum)
+    TextView tx_touristNum;
+    @BindView(R.id.determine_btn)
+    Button determine_btn;
+
 
     public static final Integer COUNTDOWN_TIME = 240000;
     private CountDownTimer timer;
@@ -205,6 +211,33 @@ public class PurchaseInfoActivity extends BaseActivity  {
         initLoadData();
         touristName.setText("");
         touristIdcard.setText("");
+        refreshTouristNum();
+        refreshSubmitBtn();
+    }
+
+    private void refreshTouristNum(){
+        int touristNum = 0;
+        if (touristList != null && !touristList.isEmpty()){
+            touristNum = touristList.size();
+        }
+        tx_touristNum.setText("已添加观影人数: " + touristNum + "人");
+    }
+
+    /**
+     * 刷新提交按钮
+     */
+    private void refreshSubmitBtn(){
+        //观影人数量
+        int touristNum = touristList.size();
+        //需要的观影人数量
+        int needTouristNum = goodsSaleNum * personnelNum;
+        if (touristNum < needTouristNum){
+            determine_btn.setEnabled(false);
+            determine_btn.setBackgroundResource(R.drawable.bg_btn_02);
+        }else {
+            determine_btn.setEnabled(true);
+            determine_btn.setBackgroundResource(R.drawable.bg_btn_01);
+        }
     }
 
     // 订单提交
@@ -335,6 +368,8 @@ public class PurchaseInfoActivity extends BaseActivity  {
             tx_isAuth.setText("(无需实名)");
         }
         tx_personnelNum.setText(String.valueOf(personnelNum));
+        refreshTouristNum();
+        refreshSubmitBtn();
     }
 
     private void reflashFinish(){
@@ -356,6 +391,8 @@ public class PurchaseInfoActivity extends BaseActivity  {
             if(touristList.size() > 1) {
                 touristList.remove(position);
                 initLoadData();
+                refreshTouristNum();
+                refreshSubmitBtn();
             } else {
                 ToastUtils.showShortToast(this, "至少保留一个观影人");
             }

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

@@ -42,6 +42,7 @@
                     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" />

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

@@ -89,7 +89,7 @@
                                     android:orientation="horizontal">
 
                                     <TextView
-                                        android:text="观影人信息:"
+                                        android:text="购票人电话:"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:textColor="@color/black"
@@ -136,25 +136,33 @@
                                     android:gravity="center"
                                     android:padding="10sp"
                                     android:layout_marginTop="20sp"
-                                    android:background="@color/msg_item_gray"
                                     android:layout_height="wrap_content">
-                                    <ImageView
+
+                                    <LinearLayout
+                                        android:background="@drawable/bg_corners_05"
                                         android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:src="@mipmap/img_add"/>
-                                    <TextView
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:textSize="36sp"
-                                        android:textColor="@color/black"
-                                        android:layout_marginStart="10sp"
-                                        android:text="新增观影人"/>
+                                        android:padding="10sp"
+                                        android:layout_height="wrap_content">
+                                        <ImageView
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:src="@mipmap/img_add_write"/>
+                                        <TextView
+                                            android:layout_width="match_parent"
+                                            android:layout_height="wrap_content"
+                                            android:textSize="36sp"
+                                            android:textColor="@color/white"
+                                            android:layout_marginStart="10sp"
+                                            android:text="确认添加"/>
+
+                                    </LinearLayout>
+
 
                                     <TextView
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:textSize="20sp"
-                                        android:textColor="@color/blue"
+                                        android:textColor="@color/gray"
                                         android:layout_marginStart="20sp"
                                         android:text="每张票需要"/>
                                     <TextView
@@ -168,7 +176,7 @@
                                         android:layout_width="match_parent"
                                         android:layout_height="wrap_content"
                                         android:textSize="20sp"
-                                        android:textColor="@color/blue"
+                                        android:textColor="@color/gray"
                                         android:text="观影人信息"/>
 
                                     <TextView
@@ -194,6 +202,16 @@
                                     android:gravity="center"
                                     android:layout_marginBottom="20sp"
                                     android:orientation="vertical">
+
+                                    <TextView
+                                        android:id="@+id/tx_touristNum"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="match_parent"
+                                        android:layout_marginTop="10sp"
+                                        android:textColor="@color/gray"
+                                        android:gravity="left|center"
+                                        android:textSize="@dimen/text_30dp_size"
+                                        tools:text="已添加观影人数: 1人"/>
                                     <TextView
                                         android:id="@+id/tx_noDataShow"
                                         android:layout_below="@+id/tb_main_bar"
@@ -272,19 +290,29 @@
 <!--                                    android:textColor="@color/white"-->
 <!--                                    android:textFontWeight="800"-->
 <!--                                    android:textSize="@dimen/text_30dp_size" />-->
-                                <TextView
+<!--                                <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" />-->
+
+                                <Button
                                     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" />
+                                    android:textSize="@dimen/text_30dp_size"
+                                    android:text="确定付款"/>
                             </LinearLayout>
                         </LinearLayout>
                     </LinearLayout>