merge

BuildPackage-PC21-PY308.bat

@@ -0,0 +1,9 @@
+@echo off
+rmdir /s /q build
+%1 mshta vbscript:CreateObject("Shell.Application").ShellExecute("cmd.exe","/c %~s0 ::","","runas",1)(window.close)&&exit
+cd /d "%~dp0"
+D:\Venvs\TPMSmartCard-PY308\Scripts\python.exe BuildPackage.py build -p ttkbootstrap
+xcopy Config "build\exe.win-amd64-3.8\Config\"
+xcopy Config\myfont "build\exe.win-amd64-3.8\Config\\myfont\"
+xcopy Tooler "build\exe.win-amd64-3.8\Tooler\"
+xcopy OpenSC "build\exe.win-amd64-3.8\OpenSC\"

BuildPackage.py

@@ -8,7 +8,7 @@
 # TARGET
 target = Executable(
     script="SmartCardAPP.py",
-    # base="Win32GUI",
+    base="Win32GUI",
     icon="Config/iconer/icon02.ico",
     uac_admin=True
 )

Config/button.json

@@ -38,25 +38,25 @@
       "name": "cer",
       "text": "➕ Import Certificate",
       "type": "success",
-      "w": 145
+      "w": 155
     },
     {
       "name": "sys",
       "text": "\uD83D\uDD12 Show in System",
       "type": "info",
-      "w": 140
+      "w": 155
     },
     {
       "name": "out",
       "text": "\uD83D\uDCBE Save to File",
       "type": "info",
-      "w": 130
+      "w": 155
     },
     {
       "name": "non",
       "text": "❌  Delete Certificate",
       "type": "danger",
-      "w": 143
+      "w": 155
     }
   ]
 }

Config/frames.json

@@ -18,9 +18,27 @@
     260
   ],
   "cert_main": [
-    590,
-    500,
+    650,
+    520,
     415,
     5
+  ],
+  "cert_info": [
+    625,
+    160,
+    428,
+    260
+  ],
+  "cert_user": [
+    308,
+    95,
+    428,
+    420
+  ],
+  "cert_last": [
+    308,
+    95,
+    745,
+    420
   ]
 }

Config/global.json

@@ -0,0 +1,34 @@
+{
+  "cn": {
+    "card_name": "卡片名称",
+    "card_uuid": "卡片编号",
+    "card_path": "实例路径",
+    "sc_status": "卡片状态",
+    "sc_length": "密码规则",
+    "cert_name": "证书名称",
+    "cert_uuid": "证书编号",
+    "cert_sha1": "证书SHA1",
+    "cert_sign": "签名算法",
+    "cert_open": "生效日期",
+    "cert_stop": "失效日期",
+    "is_ca_cert": "是否为CA",
+    "is_expired": "证书过期",
+    "pub_length": "加密算法",
+    "key_usages": "密钥用途",
+    "key_identy": "密钥标识",
+    "sub_usages": "拓展用途",
+    "sub_identy": "身份标识",
+    "user_name": "通用名称",
+    "user_code": "国家代码",
+    "user_area": "所在地区",
+    "user_city": "所在城市",
+    "user_on_t": "组织名称",
+    "user_ou_t": "部门名称",
+    "last_name": "通用名称",
+    "last_code": "国家代码",
+    "last_area": "所在地区",
+    "last_city": "所在城市",
+    "last_on_t": "组织名称",
+    "last_ou_t": "部门名称"
+  }
+}

Config/labels.json

@@ -10,36 +10,106 @@
       "..."
     ]
   ],
-  "card_info": [
-    [
-      "card_name",
+  "card_info": {
+    "conf": [
       43,
-      275,
-      100
+      275
     ],
-    [
-      "card_uuid",
-      43,
-      295,
-      100
+    "data": [
+      {
+        "card_name": 100
+      },
+      {
+        "card_uuid": 200
+      },
+      {
+        "card_path": 200
+      },
+      {
+        "sc_status": 200
+      },
+      {
+        "sc_length": 200
+      }
+    ]
+  },
+  "cert_info": {
+    "conf": [
+      435,
+      278
     ],
-    [
-      "card_path",
-      43,
-      315,
-      100
+    "data": [
+      {
+        "cert_uuid": 150,
+        "cert_name": 225
+      },
+      {
+        "cert_sha1": 150,
+        "cert_open": 102,
+        "cert_stop": 102
+      },
+      {
+        "is_ca_cert": 43,
+        "is_expired": 42,
+        "pub_length": 60,
+        "cert_sign": 150
+      },
+      {
+        "key_usages": 220
+      },
+      {
+        "sub_usages": 220
+      },
+      {
+        "key_identy": 220
+      },
+      {
+        "sub_identy": 220
+      }
+    ]
+  },
+  "cert_user": {
+    "conf": [
+      435,
+      435
     ],
-    [
-      "sc_status",
-      43,
-      335,
-      100
+    "data": [
+      {
+        "user_name": 150
+      },
+      {
+        "user_code": 20,
+        "user_area": 40,
+        "user_city": 30
+      },
+      {
+        "user_on_t": 20
+      },
+      {
+        "user_ou_t": 20
+      }
+    ]
+  },
+  "cert_last": {
+    "conf": [
+      750,
+      435
     ],
-    [
-      "sc_length",
-      43,
-      355,
-      100
+    "data": [
+      {
+        "last_name": 150
+      },
+      {
+        "last_code": 20,
+        "last_area": 40,
+        "last_city": 30
+      },
+      {
+        "last_on_t": 20
+      },
+      {
+        "last_ou_t": 20
+      }
     ]
-  ]
-}
+  }
+}

Config/tables.json

@@ -33,7 +33,7 @@
         "GUID"
       ],
       "NAME": [
-        240,
+        300,
         "Cert Name"
       ],
       "LENS": [