设备文档对接

app/src/main/aidl/com/hw/idcardservice/IDCardInfo.aidl

@@ -1,3 +0,0 @@
-package com.hw.idcardservice;
-
-parcelable IDCardInfo;

app/src/main/aidl/com/hw/idcardservice/IDCardServiceAidl.aidl

@@ -1,19 +0,0 @@
-package com.hw.idcardservice;
-
-import com.hw.idcardservice.CardCallback;
-import com.hw.idcardservice.IDCardInfo;
-import com.hw.idcardservice.MiFareCardAidl;
-import com.hw.idcardservice.OcrIDCardReaderAidl;
-
-interface IDCardServiceAidl {
-
-     IDCardInfo readCard();
-
-     void readCardAuto(in CardCallback callback);
-
-     void cancelAutoReading();
-
-     MiFareCardAidl getMiFareCardService();
-
-     OcrIDCardReaderAidl getOcrIDCardService();
-}

app/src/main/aidl/com/hw/idcardservice/OcrIDCardReaderAidl.aidl

@@ -1,36 +0,0 @@
-package com.hw.idcardservice;
-
-interface OcrIDCardReaderAidl {
-
-	int setIDCardID(in int mainID,in int[] subID);
-
-	int addIDCardID(in int mainID,in int[] subID);
-
-	int detectDocument();
-
-	int autoProcessIDCard(out int[] cardType);
-
-    int getSubId();
-
-    String getIDCardName();
-
-	String getFieldResult(in int index);
-
-    String getFieldName(in int index);
-
-    int saveImageEx(in String lpPath,in int type);
-
-	int setLanguage(in int langType);
-
-	int setIOStatus(in int ioType,in int open);
-
-	int acquireImage(in int imageSizeType);
-
-	int checkUVDull(in boolean forceAcquire,in int reserve);
-
-	int fibreDetect(in boolean acquireImage);
-
-	int getFibrePos(in int index, out int[] param);
-
-	int getImageSourceType(in int mainID, in int scale, in boolean acquireImage);
-}

app/src/main/aidl/com/sunmi/extprinterservice/ExtPrinterService.aidl

@@ -0,0 +1,45 @@
+// IPrinterService.aidl
+package com.sunmi.extprinterservice;
+
+// Declare any non-default types here with import statements
+
+interface ExtPrinterService {
+
+    int sendRawData(in byte[] cmd);
+
+	int printerInit();
+
+    int getPrinterStatus();
+
+	int lineWrap(in int n);
+
+	int pixelWrap(in int n);
+
+	int flush();
+
+    int tab();
+
+    int printText(in String text);
+
+    int printBarCode(in String code, in int type, in int width, in int height, in int hriPos);
+
+    int printQrCode(in String code, in int modeSize, in int errorlevel);
+
+    int printBitmap(in Bitmap bitmap, in int mode);
+
+    int setHorizontalTab(in int[] k);
+
+    int setAlignMode(in int type);
+
+    int cutPaper(in int m, in int n);
+
+    int setFontZoom(in int hori, in int veri);
+
+    int printColumnsText(in String[] colsTextArr, in int[] colsWidthArr, in int[] colsAlign);
+
+    void openDrawer();
+
+    void startTransBuffer();
+
+    boolean endTransBuffer();
+}

app/src/main/aidl/com/hw/idcardservice/CardCallback.aidl

@@ -1,6 +1,6 @@
-package com.hw.idcardservice;
+package com.sunmi.idcardservice;
 
-import com.hw.idcardservice.IDCardInfo;
+import com.sunmi.idcardservice.IDCardInfo;
 
 interface CardCallback {
 

app/src/main/aidl/com/sunmi/idcardservice/IDCardInfo.aidl

@@ -0,0 +1,3 @@
+package com.sunmi.idcardservice;
+
+parcelable IDCardInfo;

app/src/main/aidl/com/sunmi/idcardservice/IDCardServiceAidl.aidl

@@ -0,0 +1,16 @@
+package com.sunmi.idcardservice;
+
+import com.sunmi.idcardservice.CardCallback;
+import com.sunmi.idcardservice.IDCardInfo;
+import com.sunmi.idcardservice.MiFareCardAidl;
+
+interface IDCardServiceAidl {
+
+     IDCardInfo readCard();
+
+     void readCardAuto(in CardCallback callback);
+
+     void cancelAutoReading();
+
+     MiFareCardAidl getMiFareCardService();
+}

app/src/main/aidl/com/hw/idcardservice/MiFareCardAidl.aidl

@@ -1,4 +1,4 @@
-package com.hw.idcardservice;
+package com.sunmi.idcardservice;
 
 interface MiFareCardAidl {
 
@@ -23,7 +23,10 @@ interface MiFareCardAidl {
      * 		openCupCard(cardtype,snrlen,snr,infolen,cardinfo);
      *
      * 	注： 由于调用该函数时，不一定有卡在感应区，很有可能需要较长的时间才能等到卡进感应区，故设定较长的时间给读写器，
-     * 	完全由读写器在这段时间等待对卡激活，如果超时了便返回“激活失败”。在无卡进感应区时读写器不用等待直接返回“激活失败”；
+     * 	完全由读写器在这段时间等待对卡激活，如果超时了便返回“激活失败”。此命令的delaytime参数就是为了传递上述时间参数给读写器。
+     * 	如果delaytime参数为0，在无卡进感应区时读写器不用等待直接返回“激活失败”；如果delaytime参数为0xffff时,一直寻卡，
+     * 	直到卡进入感应区；如果delaytime参数为其它值时，读写器可在delaytime时间内一直寻卡，直到超时了读	写器才返回“激活失败”，
+     * 	此时主机端也是采用delaytime作为超时退出时间。如果有卡在感应区但激活失败，	那么读写器不用继续寻卡就直接返回“激活失败”。
      */
     int openCupCard(out byte[] cardtype,out byte[] snrlen,out byte[] snr,out byte[] atrlen,out byte[] atr);
     /**
@@ -52,10 +55,12 @@ interface MiFareCardAidl {
      * @return    <>0 错误
      *             =0 正确
      * 举例：
-
+     *  int delaytime = 0;
      *  st = rfhalt();
      *
-     * 注： 完成对卡的Halt操作或者Deselect操作后, 将直接返回halt操作结果。
+     * 注： 完成对卡的Halt操作或者Deselect操作后,要求用户将卡离开射频操作区域，否则将一直循环判断。如果delaytime参数为0时，
+     * 则不用等待，将直接返回halt操作结果；若delayTime为0xffff时，将无限等待， 直至卡离开感应区；若为其它值时，将在规定时间
+     * 判断卡是否还在感应区直至定时时间到或者卡离开感应区。
      */
     int rfhalt();
     /**
@@ -91,7 +96,11 @@ interface MiFareCardAidl {
      * 	st = rfCard(cardtype,snr);
      *
      * 注： 由于调用该函数时，不一定有卡在感应区，很有可能需要较长的时间才能等到卡进感应区，故设定较长的时间给读写器，
-     * 完全由读写器在这段时间等待对卡激活，如果超时了便返回“激活失败”。在无卡进感应区时读写器不用等待直接返回“激活失败”。
+     * 完全由读写器在这段时间等待对卡激活，如果超时了便返回“激活失败”。此函数的delaytime参数就是为了传递上述时间参数给
+     * 读写器。如果delaytime参数为0，在无卡进感应区时读写器不用等待直接返回“激活失败”；如果delaytime参数为0xffff时,
+     * 一直寻卡，直到卡进入感应区；如果delaytime参数为其它值时，读写器可在delaytime时间内一直寻卡，直到超时了读	写器
+     * 才返回“激活失败”，此时主机端也是采用delaytime作为超时退出时间。如果有卡在感应区但激活失败，	那么读写器不用继续寻
+     * 卡就直接返回“激活失败”。
      */
     int rfCard(out byte[] cardtype,out byte[] cardID);
 

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

@@ -26,7 +26,6 @@ import retrofit2.http.QueryMap;
 public interface ApiService {
     String COMMON= BuildConfig.API_PATH;
 
-//
     //登录
     @POST(COMMON + "/system/deviceInfo/selfLogin")
     Observable<ResponseData<LoginBean>> login(
@@ -35,7 +34,7 @@ public interface ApiService {
             );
 
     //版本升级
-    @POST(COMMON + "/pda/appversion/upgrade-by-appid")
+    @POST(COMMON + "/system/appversion/upgrade-by-appid")
     Observable<ResponseData<UpdateVerAskBean>> version(
             @Body UpdateVerReqBean bean,
             @Query("t") Long currtime
@@ -54,8 +53,10 @@ public interface ApiService {
 
     //出票
     @POST(COMMON + "/order/orderInfo/ticketout")
-    Observable<ResponseData<JSONObject>> ticketout(@QueryMap Map< String,String> options,
-                                                      @Query("t") Long currtime);
+    Observable<ResponseData<JSONObject>> ticketout(
+            @Body JSONObject bean,
+            @Query("t") Long currtime
+    );
 
     //获取节目列表
     @GET(COMMON + "/goods/performInfo/selectAll")

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

@@ -1,5 +1,6 @@
 package com.hw.nativeapp.httpnet;
 
+import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -68,7 +69,7 @@ public abstract class ResponseConsumer<E> implements Consumer<ResponseData<E>> {
         }
     }
 
-    public abstract void onSuccess(E data) throws ParseException;
+    public abstract void onSuccess(E data) throws ParseException, RemoteException;
 
     public void onListSuccess(List<E> list) {
 

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

@@ -1,16 +1,38 @@
 package com.hw.nativeapp.ui.activity;
+import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.ProgressDialog;
+import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.CountDownTimer;
+import android.os.Handler;
+import android.os.IBinder;
 import android.util.Log;
 import android.view.View;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.blankj.utilcode.util.ToastUtils;
 import com.hjq.bar.OnTitleBarListener;
 import com.hjq.bar.TitleBar;
+import com.sunmi.idcardservice.CardCallback;
+import com.sunmi.idcardservice.IDCardInfo;
+import com.sunmi.idcardservice.IDCardServiceAidl;
+import com.hw.nativeapp.MApplication;
 import com.hw.nativeapp.R;
+import com.hw.nativeapp.httpnet.ErrorConsumer;
+import com.hw.nativeapp.httpnet.ResponseConsumer;
 import com.hw.nativeapp.utils.ActivityUtils;
+import com.hw.nativeapp.utils.MaskUtil;
+import com.hw.nativeapp.utils.RxUtil;
 
 import butterknife.OnClick;
 
@@ -29,6 +51,14 @@ public class InfoEnterActivity extends BaseActivity  {
     private String performTimeId = "";
     private String seatTypeId = "";
 
+    private String name = "";
+    private String idcard = "";
+    private JSONArray viewerList = new JSONArray();
+
+    private IDCardServiceAidl mService;
+    boolean hasPermission;
+    private ProgressDialog progressDialog;
+
     @Override
     void initView() {
         titleBar = findViewById(R.id.tb_main_bar);
@@ -56,8 +86,47 @@ public class InfoEnterActivity extends BaseActivity  {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_info_enter);
+        bindIDCardService();
+    }
+    @Override
+    protected void onStart() {
+        super.onStart();
+        hasPermission = ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+        if (!hasPermission) {
+            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 101);
+        }
+    }
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (mService != null) {
+            try {
+                mService.cancelAutoReading();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mConnection != null) {
+            try {
+                unbindService(mConnection);
+//                Toast.makeText(InfoEnterActivity.this, "ID服务已断开", Toast.LENGTH_SHORT).show();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            mService = null;
+        }
+    }
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == 101) {
+            hasPermission = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+        }
     }
-
     @OnClick({R.id.idCard_btn})
     public void onClick(View v){
         switch (v.getId()){
@@ -108,4 +177,127 @@ public class InfoEnterActivity extends BaseActivity  {
         };
         timer.start();
     }
+
+    // 身份证注册
+    private void bindIDCardService() {
+        Intent intent = new Intent();
+        intent.setPackage("com.sunmi.idcardservice");
+        intent.setAction("com.sunmi.idcard");
+        bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+    }
+    private ServiceConnection mConnection = new ServiceConnection() {
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = IDCardServiceAidl.Stub.asInterface(service);
+            Log.e("id_card", " 服务已连接");
+//            Toast.makeText(InfoEnterActivity.this, "服务已连接", Toast.LENGTH_SHORT).show();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+            Log.e("id_card", "服务已断开");
+            Toast.makeText(InfoEnterActivity.this, "服务已断开", Toast.LENGTH_SHORT).show();
+        }
+    };
+    public void auto(View view) {
+        try {
+            mService.readCardAuto(new CardCallback.Stub() {
+                @Override
+                public void getCardData(final IDCardInfo info, int code) {
+                    Log.i(TAG, "getCardData: code=" + code + ", id info:" + info);
+                    if (code == 10) {
+                        //读取成功
+                        Log.i(TAG, "getCardData: " + info.toString());
+                        name = info.getName(); // 姓名
+                        idcard = info.getIdCard(); // 身份证号
+                        factorAuth();
+                    } else if (code == -10) {
+                        //读取失败
+                        Log.i(TAG, "auto read card did not get data");
+                    } else {
+                        Log.i(TAG, "what is wrong");
+                    }
+                }
+            });
+        } catch (Exception e) {
+            Log.i(TAG, "auto read is error " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+    public void cancelAuto(View v) {
+        try {
+            mService.cancelAutoReading();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    // 二要数认证
+    private void factorAuth(){
+        if(name.isEmpty() || idcard.isEmpty()){
+            ToastUtils.showShort("请输入姓名和身份证号");
+            return;
+        }
+        if(name.length() < 2 || idcard.length() < 18){
+            ToastUtils.showShort("姓名和身份证号格式错误");
+            return;
+        }
+        JSONObject options = new  JSONObject();
+        options.put("name", name);
+        options.put("idcard", idcard);
+        progressDialog = MaskUtil.showProgressDialog( "正在验证...", InfoEnterActivity.this);
+        new Handler().postDelayed(() -> {
+            if(progressDialog != null){
+                progressDialog.dismiss();
+            }
+        }, 30000);
+        MApplication.getApiService().factorAuth( options, System.currentTimeMillis() / 1000)
+                .compose(RxUtil.applyObservableAsync())
+                .subscribe(new ResponseConsumer<JSONObject>() {
+                    @Override
+                    public void onSuccess(JSONObject data) {
+                        if(data.getIntValue("status") == 1) {
+                            if(progressDialog != null){
+                                progressDialog.dismiss();
+                            }
+                            successFu();
+                        } else {
+                            if(progressDialog != null){
+                                progressDialog.dismiss();
+                            }
+                            ToastUtils.showShort(data.getString("errReason"));
+                        }
+                    }
+
+                    @Override
+                    public void onFailed(int code, String msg) {
+                        if(progressDialog != null){
+                            progressDialog.dismiss();
+                        }
+                    }
+                }, new ErrorConsumer());
+    }
+
+    private void successFu () {
+        Bundle bundle = new Bundle();
+        bundle.putString("performId", performId);
+        bundle.putString("auditoriumId", auditoriumId);
+        bundle.putString("performTimeId", performTimeId);
+        bundle.putString("seatTypeId", seatTypeId);
+        bundle.putString("goodsId", goodsId);
+        bundle.putString("salePeice", salePeice);
+        bundle.putString("type", "1");
+        bundle.putString("name", name);
+        bundle.putString("idcard", idcard);
+        if(viewerList == null || viewerList.size() == 0){
+            viewerList =  new JSONArray();
+        }
+        JSONObject obj = new JSONObject();
+        obj.put("name", name);
+        obj.put("idcard", idcard);
+        viewerList.add(obj);
+        bundle.putString("viewerList", JSONArray.toJSONString(viewerList));
+        ActivityUtils.launchActivity(this,PurchaseInfoActivity.class, bundle);
+    }
 }

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

@@ -1,15 +1,38 @@
 package com.hw.nativeapp.ui.activity;
-import android.annotation.SuppressLint;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.CountDownTimer;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.util.Log;
 import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.hjq.bar.OnTitleBarListener;
 import com.hjq.bar.TitleBar;
+import com.hw.nativeapp.MApplication;
 import com.hw.nativeapp.R;
+import com.hw.nativeapp.httpnet.ErrorConsumer;
+import com.hw.nativeapp.httpnet.ResponseConsumer;
+import com.hw.nativeapp.httpnet.entity.handleBean;
 import com.hw.nativeapp.utils.ActivityUtils;
+import com.hw.nativeapp.utils.RxUtil;
+import com.squareup.picasso.Picasso;
+import com.sunmi.extprinterservice.ExtPrinterService;
 
-import butterknife.OnClick;
+import java.sql.Array;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
 
 
 public class IssueTicketsActivity extends BaseActivity  {
@@ -18,6 +41,16 @@ public class IssueTicketsActivity extends BaseActivity  {
     private CountDownTimer timer;
     private TitleBar titleBar;
 
+    @BindView(R.id.print_num)
+    TextView print_num;
+    @BindView(R.id.tx_customerMobile)
+    TextView tx_customerMobile;
+
+    private ExtPrinterService ext;
+    private int printNum = 1;
+
+    private JSONArray viewerList = new JSONArray();
+    private JSONArray dataList = new JSONArray();
     @Override
     void initView() {
         titleBar = findViewById(R.id.tb_main_bar);
@@ -38,47 +71,144 @@ public class IssueTicketsActivity extends BaseActivity  {
 
             }
         });
-        startCountDownTimer();
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_issue_tickets);
+        selfIndex();
+        bindExtPrinterService();
+        getPageTransmitParams();
+    }
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (serviceConnection != null) {
+            try {
+                unbindService(serviceConnection);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (serviceConnection != null) {
+            try {
+                unbindService(serviceConnection);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            serviceConnection = null;
+        }
+    }
+    //获取页面传递参数
+    private void getPageTransmitParams(){
+        Intent transmitIntent = getIntent();
+        viewerList = JSONArray.parseArray(transmitIntent.getStringExtra("viewerList"));
+        print_num.setText(printNum +"/"+viewerList.size());
+        Log.e("serviceConnection","---------------serviceConnection--------------"+ (serviceConnection));
+    }
+
+    private void initPageView() {
+        print_num.setText(printNum +"/"+viewerList.size());
+        getTicketOut(viewerList.getJSONObject(printNum - 1));
+    }
+
+    private void selfIndex(){
+        MApplication.getApiService().selfIndex(  System.currentTimeMillis() / 1000)
+                .compose(RxUtil.applyObservableAsync())
+                .subscribe(new ResponseConsumer<JSONObject>() {
+                    @Override
+                    public void onSuccess(JSONObject data) {
+                        tx_customerMobile.setText("客服电话：" + data.getString("customerMobile"));
+                    }
+
+                    @Override
+                    public void onFailed(int code, String msg) {
+                    }
+                }, new ErrorConsumer());
     }
 
-//    @OnClick({R.id.num_01,R.id.num_02})
-//    public void onClick(View v){
-//        switch (v.getId()){
-//            case R.id.num_01:
-//
-//                break;
-//            case R.id.num_02:
-//
-//                break;
-//        }
-//    }
-    private void jumpToLogin(){
-        stopCountDownTimer();
-        ActivityUtils.activityFinish(IssueTicketsActivity.this, true);
+    private void getTicketOut(JSONObject obj){
+        JSONObject options = new  JSONObject();
+        options.put("orderId", obj.getString("orderId"));
+        String [] list = new String[1];
+        list[0] = obj.getString("id");
+        options.put("viewerList", list);
+        MApplication.getApiService().ticketout( options, System.currentTimeMillis() / 1000)
+                .compose(RxUtil.applyObservableAsync())
+                .subscribe(new ResponseConsumer<JSONObject>() {
+                    @Override
+                    public void onSuccess(JSONObject data) throws RemoteException {
+                        JSONArray rows = data.getJSONArray("rows");
+                        dataList = rows;
+                        startPrinting();
+                    }
+
+                    @Override
+                    public void onFailed(int code, String msg) {
+
+                    }
+                }, new ErrorConsumer());
     }
-    private void stopCountDownTimer(){
-        if (timer != null){
-            timer.cancel();
+
+    // 开始打印
+    private void startPrinting() throws RemoteException {
+        /*
+        * 打印机状态
+        * -1 打印机脱机或打印服务还未连接打印机
+        * 0 打印机运⾏正常
+        * 1 打印机开盖
+        * 2 打印机缺纸
+        * 3 打印机即将缺纸
+        * 4 打印机过热
+        * */
+        int printerStatus = ext.getPrinterStatus(); //
+        Log.e("printerStatus","---------------printerStatus--------------"+printerStatus);
+        if(printerStatus != 0){
+            String msg = printerStatus == -1 ? "打印机脱机或打印服务还未连接打印机" : printerStatus == 1 ? "打印机开盖" : printerStatus == 2 ? "打印机缺纸" : printerStatus == 3 ? "打印机即将缺纸" : "打印机过热";
+            Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+            return;
+        }
+        ext.startTransBuffer(); //启⽤事务模式
+        ext.printText("测试");
+        ext.printText("测试");
+        ext.printText("测试");
+        ext.endTransBuffer(); //结束事务模式
+        //  打印完成，开始打印下一张
+        printNum++;
+
+        if(printNum < viewerList.size()){
+            getTicketOut(viewerList.getJSONObject(printNum - 1));
         }
     }
-    private void startCountDownTimer(){
-        timer = new CountDownTimer(COUNTDOWN_TIME, 1000) {
-            @SuppressLint("SetTextI18n")
-            @Override
-            public void onTick(long millisUntilFinished) {
-                titleBar.setRightTitle(millisUntilFinished / 1000 + "s");
-            }
 
-            @Override
-            public void onFinish() {
-                jumpToLogin();
-            }
-        };
-        timer.start();
+    // 打印注册
+    private void bindExtPrinterService() {
+        Intent intent = new Intent();
+        intent.setPackage("com.sunmi.extprinterservice");
+        intent.setAction("com.sunmi.extprinterservice.PrinterService");
+        bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
     }
+
+    ServiceConnection serviceConnection = new ServiceConnection() {
+        @Override public void onServiceConnected(ComponentName name, IBinder
+                service) {
+            ext = ExtPrinterService.Stub.asInterface(service);
+            initPageView();
+            Log.e("onServiceConnected","---------------onServiceConnected--------------");
+        }
+        @Override public void onServiceDisconnected(ComponentName name) {
+            Log.e("onServiceDisconnected","---------------onServiceDisconnected--------------");
+        }
+        @Override public void onBindingDied(ComponentName name) {
+            Log.e("onBindingDied","---------------onBindingDied--------------");
+        }
+        @Override public void onNullBinding(ComponentName name) {
+            Log.e("onNullBinding","---------------onNullBinding--------------");
+        }
+    };
+
 }

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

@@ -86,7 +86,7 @@ public class PaymentMethodActivity extends BaseActivity  {
     }
     // 订单支付
     private void getGotoNativePay(){
-        JSONObject options = new  JSONObject();
+        JSONObject options = new JSONObject();
         options.put("orderId", orderId);
         MApplication.getApiService().gotoNativePay( options, System.currentTimeMillis() / 1000)
                 .compose(RxUtil.applyObservableAsync())
@@ -104,9 +104,7 @@ public class PaymentMethodActivity extends BaseActivity  {
 //
 //                            } else {
 //                                //微信支付
-//                                Log.e("payInfo","---------------232323--------------"+payInfo);
-//                                Bitmap weiEQ = ImageUtils.createQRImage(payInfo, 350, 350);
-//                                Log.e("weiEQ","---------------weiEQ--------------"+weiEQ);
+//                                Bitmap weiEQ = ImageUtils.createQRImage(payInfo, 600, 600);
 //                                wechat_pay.setImageBitmap(weiEQ);
 //                            }
                             // 开始循环查询订单状态
@@ -158,7 +156,7 @@ public class PaymentMethodActivity extends BaseActivity  {
         }
     }
     private void orderCountDownTimer(){
-        orderTimer = new CountDownTimer(COUNTDOWN_TIME, 1000) {
+        orderTimer = new CountDownTimer(COUNTDOWN_TIME, 2000) {
             @SuppressLint("SetTextI18n")
             @Override
             public void onTick(long millisUntilFinished) {

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

@@ -1,4 +1,5 @@
 package com.hw.nativeapp.ui.activity;
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -6,6 +7,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.CountDownTimer;
 import android.os.IBinder;
@@ -14,9 +16,14 @@ import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+
 import com.hjq.bar.OnTitleBarListener;
 import com.hjq.bar.TitleBar;
-import com.hw.idcardservice.IDCardServiceAidl;
+import com.sunmi.idcardservice.CardCallback;
+import com.sunmi.idcardservice.IDCardInfo;
+import com.sunmi.idcardservice.IDCardServiceAidl;
 import com.hw.nativeapp.R;
 import com.hw.nativeapp.utils.ActivityUtils;
 
@@ -30,6 +37,9 @@ public class TakeActivity extends BaseActivity  {
     public static final Integer COUNTDOWN_TIME = 120000;
     private CountDownTimer timer;
     private TitleBar titleBar;
+
+    boolean hasPermission;
+
     @BindView(R.id.et_modify_quantity)
     TextView et_modify_quantity;
 
@@ -64,11 +74,46 @@ public class TakeActivity extends BaseActivity  {
         registerReceiver();
     }
     @Override
+    protected void onStart() {
+        super.onStart();
+        hasPermission = ActivityCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+        if (!hasPermission) {
+            ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 101);
+        }
+    }
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (mService != null) {
+            try {
+                mService.cancelAutoReading();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    @Override
     protected void onDestroy() {
         super.onDestroy();
         if (receiver != null){
             unregisterReceiver(receiver);
         }
+        if (mConnection != null) {
+            try {
+                unbindService(mConnection);
+                Toast.makeText(TakeActivity.this, "ID服务已断开", Toast.LENGTH_SHORT).show();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            mService = null;
+        }
+    }
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == 101) {
+            hasPermission = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+        }
     }
     @OnClick({R.id.purchase_btn, R.id.num_01,R.id.num_02,R.id.num_03,R.id.num_04,R.id.num_05,R.id.num_06,R.id.num_07,R.id.num_08,R.id.num_09,R.id.num_0,R.id.num_empty,R.id.num_del})
     public void onClick(View v){
@@ -174,7 +219,7 @@ public class TakeActivity extends BaseActivity  {
         public void onServiceConnected(ComponentName name, IBinder service) {
             mService = IDCardServiceAidl.Stub.asInterface(service);
             Log.e("id_card", " 服务已连接");
-            Toast.makeText(TakeActivity.this, "服务已连接", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(TakeActivity.this, "服务已连接", Toast.LENGTH_SHORT).show();
         }
 
         @Override
@@ -184,4 +229,38 @@ public class TakeActivity extends BaseActivity  {
             Toast.makeText(TakeActivity.this, "服务已断开", Toast.LENGTH_SHORT).show();
         }
     };
+    public void auto(View view) {
+        try {
+            mService.readCardAuto(new CardCallback.Stub() {
+                @Override
+                public void getCardData(final IDCardInfo info, int code) {
+                    Log.i(TAG, "getCardData: code=" + code + ", id info:" + info);
+                    if (code == 10) {
+                        //读取成功
+                        Log.i(TAG, "getCardData: " + info.toString());
+                        // info.getName(); // 姓名
+                        // info.getIdCard(); // 身份证号
+                        Bundle bundle = new Bundle();
+                        bundle.putString("idcard", info.getIdCard());
+                        ActivityUtils.launchActivity(TakeActivity.this, TicketCollectionActivity.class, bundle);
+                    } else if (code == -10) {
+                        //读取失败
+                        Log.i(TAG, "auto read card did not get data");
+                    } else {
+                        Log.i(TAG, "what is wrong");
+                    }
+                }
+            });
+        } catch (Exception e) {
+            Log.i(TAG, "auto read is error " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+    public void cancelAuto(View v) {
+        try {
+            mService.cancelAutoReading();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -172,7 +172,7 @@ public class TakeUserInfoActivity extends BaseActivity  {
     }
 
     private void getDataList(boolean cleaned){
-        Map< String,String> options = new HashMap<>();
+        JSONObject options = new  JSONObject();
         if(!idcard.isEmpty()){
             options.put("idcard", idcard);
         }

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

@@ -209,7 +209,6 @@ public class TicketCollectionActivity extends BaseActivity  {
         if(idcard != null && !idcard.isEmpty()){
             options.put("idcard", idcard);
         }
-//        options.put("idcard", "520112198903170617");
         MApplication.getApiService().getValidList( options, System.currentTimeMillis() / 1000)
                 .compose(RxUtil.applyObservableAsync())
                 .subscribe(new ResponseConsumer<JSONObject>() {
@@ -296,8 +295,23 @@ public class TicketCollectionActivity extends BaseActivity  {
 
     // 打印
     private void printTicket() {
+        JSONArray viewerList = new JSONArray();
+        for (int i = 0; i < dataList.size(); i++) {
+            if(dataList.getJSONObject(i).getBooleanValue("checkedStatus")){
+                JSONObject obj = new JSONObject();
+                obj.put("id",   dataList.getJSONObject(i).getString("id"));
+                obj.put("orderId",  dataList.getJSONObject(i).getString("orderId"));
+                obj.put("name",  dataList.getJSONObject(i).getString("name"));
+                obj.put("idcard",   dataList.getJSONObject(i).getString("idcard"));
+                viewerList.add(obj);
+            }
+        }
+        if(viewerList == null || viewerList.size() == 0){
+            Toast.makeText(TicketCollectionActivity.this, "请选择要打印的票", Toast.LENGTH_SHORT).show();
+            return;
+        }
         Bundle bundle = new Bundle();
-//        bundle.putString("id", "1");
+        bundle.putString("viewerList", JSONArray.toJSONString(viewerList));
         ActivityUtils.launchActivity(this,IssueTicketsActivity.class, bundle);
     }
 

app/src/main/java/com/hw/idcardservice/IDCardInfo.java

@@ -1,4 +1,4 @@
-package com.hw.idcardservice;
+package com.sunmi.idcardservice;
 
 import android.os.Parcel;
 import android.os.Parcelable;

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

@@ -17,7 +17,6 @@
         app:leftTitle="返回"
         app:rightColor="@color/white"
         app:rightSize="18sp"
-        app:rightTitle="120s"
         app:title="自助取票"
         app:titleColor="@color/white"
         app:titleSize="20sp" />
@@ -31,40 +30,24 @@
         android:padding="20sp">
 
         <LinearLayout
-            android:id="@+id/take_btn"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:layout_weight="1"
             android:background="@drawable/bg_take"
-            android:orientation="vertical"
             android:padding="15sp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="10sp"
-                android:orientation="horizontal"
-                android:paddingTop="10sp">
-
+                android:padding="10sp">
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
                     android:gravity="center"
                     android:text="门票正在打印中，请稍后......"
                     android:textColor="@color/login_bk"
                     android:textFontWeight="800"
-                    android:textSize="22sp" />
-                <!--                <TextView-->
-                <!--                    android:layout_width="wrap_content"-->
-                <!--                    android:layout_height="match_parent"-->
-                <!--                    android:layout_weight="1"-->
-                <!--                    android:gravity="center"-->
-                <!--                    android:text="出票完成～"-->
-                <!--                    android:textColor="@color/login_bk"-->
-                <!--                    android:textFontWeight="800"-->
-                <!--                    android:textSize="22sp" />-->
+                    android:textSize="20sp" />
             </LinearLayout>
         </LinearLayout>
 
@@ -81,15 +64,14 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginTop="25sp"
+                android:layout_marginTop="15sp"
                 android:gravity="center"
                 android:orientation="vertical"
-                android:paddingBottom="30sp">
+                android:paddingBottom="10sp">
 
                 <TextView
                     android:layout_width="220sp"
                     android:layout_height="40sp"
-                    android:layout_weight="1"
                     android:background="@drawable/bg_btn_01"
                     android:gravity="center"
                     android:text="注意出票"
@@ -107,7 +89,8 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="25sp">
+                    android:gravity="center"
+                    android:layout_marginTop="15sp">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -117,6 +100,7 @@
                         android:textSize="16sp" />
 
                     <TextView
+                        android:id="@+id/print_num"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="1/8"
@@ -134,7 +118,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="25sp"
+                    android:layout_marginTop="15sp"
                     android:gravity="center"
                     android:orientation="vertical">
 
@@ -143,15 +127,16 @@
                         android:layout_height="wrap_content"
                         android:text="未查询到购票信息，请核实！"
                         android:textColor="@color/black"
-                        android:textSize="18sp" />
+                        android:textSize="16sp" />
 
                     <TextView
+                        android:id="@+id/tx_customerMobile"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10sp"
                         android:text="客服电话：400-992-1888"
                         android:textColor="@color/login_bk"
-                        android:textSize="18sp" />
+                        android:textSize="16sp" />
                 </LinearLayout>
             </LinearLayout>
 

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

@@ -41,7 +41,7 @@
                 android:layout_marginRight="15sp"
                 android:layout_weight="1"
                 android:background="@mipmap/take_bj"
-                android:gravity="right"
+                android:gravity="center"
                 android:orientation="vertical"
                 android:padding="30sp">
 
@@ -77,7 +77,7 @@
                 android:layout_marginLeft="15sp"
                 android:layout_weight="1"
                 android:background="@mipmap/purchase_bj"
-                android:gravity="right"
+                android:gravity="center"
                 android:orientation="vertical"
                 android:padding="30sp">
 
@@ -109,7 +109,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="130sp"
+            android:layout_marginTop="60sp"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -121,7 +121,7 @@
                 android:gravity="left"
                 android:text="剩余纸张：200张"
                 android:textColor="@color/blue"
-                android:textSize="24sp" />
+                android:textSize="20sp" />
 
             <TextView
                 android:id="@+id/tx_customerMobile"
@@ -132,7 +132,7 @@
                 android:gravity="left"
                 android:text="客服电话：0851-28256633"
                 android:textColor="@color/black"
-                android:textSize="24sp" />
+                android:textSize="20sp" />
         </LinearLayout>
     </LinearLayout>
 </RelativeLayout>

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

@@ -55,7 +55,7 @@
                     android:text="取票码/手机号取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="22sp" />
+                    android:textSize="20sp" />
             </LinearLayout>
 
             <LinearLayout
@@ -288,14 +288,13 @@
                 android:layout_height="match_parent"
                 android:layout_marginTop="25sp"
                 android:gravity="center"
-                android:paddingBottom="30sp"
+                android:paddingBottom="20sp"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/purchase_btn"
-                    android:layout_width="wrap_content"
+                    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"
@@ -329,7 +328,7 @@
                     android:text="二维码/身份证取票"
                     android:textColor="@color/black"
                     android:textFontWeight="800"
-                    android:textSize="22sp" />
+                    android:textSize="20sp" />
             </LinearLayout>
 
             <LinearLayout