From 5aabe1c0a264bd90def6ca6ea6ad74e1a11b30f9 Mon Sep 17 00:00:00 2001
From: 黄灿宏 <canhong.huang@ectrip.com>
Date: Mon, 4 Dec 2023 15:21:46 +0800
Subject: [PATCH] 畅游通核销app: 1.增加扫码配置

---
 build.gradle                                        | 14 ++++++++++++++
 src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 26bdc51..aad4db6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+import java.text.SimpleDateFormat
+
 //apply plugin: 'android'
 apply plugin: 'com.android.application'
 buildscript {
@@ -81,6 +83,15 @@ android {
         }
     }
 
+    //在apk文件后边生成版本号信息
+    android.applicationVariants.all {
+        variant ->
+            variant.outputs.all {
+                //在这里修改apk文件名 Selfserviceticketingandroid_V1.0.5_202006220953
+                outputFileName = "CYTAndroid_V${variant.versionName}_${releaseTime()}.apk"
+            }
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -133,6 +144,9 @@ android {
 //    }
 
 }
+def releaseTime() {
+    return new SimpleDateFormat("yyyyMMddHHmm").format(new Date())
+}
 
 repositories {
     maven {
diff --git a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
index 7dff667..567e501 100644
--- a/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
+++ b/src/com/ectrip/cyt/ui/PhomeScanerOrderActivity.java
@@ -20,8 +20,10 @@ import android.view.View.OnClickListener;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.ectrip.cyt.bean.ConfigBean;
+import com.ectrip.cyt.config.DevicTool;
 import com.ectrip.cyt.constant.constant;
 import com.ectrip.cyt.db.DbManager;
 import com.ectrip.cyt.shield_home.LockLayer.MToast;
@@ -130,6 +132,10 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
         playBeepSoundAndVibrate();
         String resultString = result.getText().trim();
         LogUtil.i(TAG, "扫码数据 = " + resultString);
+        if (resultString.startsWith("PZ")) {
+            configIdent(resultString);
+            return;
+        }
         if (resultString.equals("")) {
             MToast(PhomeScanerOrderActivity.this,
                     getString(R.string.scan_fail), MToast.LENGTH_SHORT);
@@ -177,7 +183,7 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
                     QRCodeOrderListActivity.class);
             intent.putExtra("mode", 1);
             intent.putExtra("input_orid", resultString);
-            LogUtil.i(TAG,getString(R.string.scan_result) + resultString);
+            LogUtil.i(TAG, getString(R.string.scan_result) + resultString);
             intent.putExtra("titleName", getString(R.string.show_result));
             intent.putExtra("typeScan", typeScan);
             startActivity(intent);
@@ -192,6 +198,48 @@ public class PhomeScanerOrderActivity extends BaseActivity implements Callback {
 
     }
 
+    private void configIdent(String resultString) {
+        String[] split = resultString.split(";");
+        String serviceIp = split[0].split("=")[1];
+        String encode = split[1].split("=")[1];
+        String identity = split[2].split("=")[1];
+        if (!identity.equals("")) {
+            try {
+                identity = AESEncryptor.decrypt(constant.decrypt, identity);
+                LogUtil.d(TAG, getString(R.string.enterprise_communication_identifier)
+                        + identity);
+                identity = AESEncryptor.encrypt(constant.decrypt, identity);
+            } catch (Exception ex) {
+                try {
+                    identity = AESEncryptor.encrypt(constant.decrypt,
+                            identity);
+                    LogUtil.d(TAG, getString(R.string.not_successfully_decrypt)
+                            + identity);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return;
+                }
+            }
+            ArrayList<ConfigBean> beans = DbManager.GetConfigs();
+            ConfigBean bean = new ConfigBean();
+            String mac = DevicTool.getInstance().getDevId().trim();
+            bean.setEc_id(0 + "");
+            bean.setEc_ip(serviceIp.trim());
+            bean.setEc_identity(encode.trim());
+            bean.setEc_mac(mac.toUpperCase());
+            bean.setEc_passwd("123456");
+            bean.setEc_signkey(identity);
+            if (1 == beans.get(0).getEc_isPrint()) {
+                bean.setEc_isPrint(beans.get(0).getEc_isPrint());
+            }else {
+                bean.setEc_isPrint(0);
+            }
+            DbManager.ClearConfig();
+            DbManager.InsertConfig(bean);
+            Toast.makeText(this,"配置成功",Toast.LENGTH_SHORT);
+        }
+    }
+
     private void initCamera(SurfaceHolder surfaceHolder) {
         try {
             CameraManager.get().openDriver(surfaceHolder, PhomeScanerOrderActivity.this);
--
libgit2 0.21.4