From 4cd0dc7586e71600ff52c6f57f01990a8f352759 Mon Sep 17 00:00:00 2001
From: nineven <nineven@qq.com>
Date: Thu, 14 Apr 2022 20:08:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/user/FirSuperSignBase.vue  | 20 ++++++++++++++-----
 fir_ser/xsign/utils/supersignutils.py         | 10 ++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/fir_client/src/components/user/FirSuperSignBase.vue b/fir_client/src/components/user/FirSuperSignBase.vue
index c669ba3..bdbf353 100644
--- a/fir_client/src/components/user/FirSuperSignBase.vue
+++ b/fir_client/src/components/user/FirSuperSignBase.vue
@@ -857,11 +857,18 @@
               </el-tooltip>
             </template>
           </el-table-column>
+          <el-table-column
+              :formatter="deviceformatter"
+              align="center"
+              label="添加时间"
+              prop="created_time"
+              width="100">
+          </el-table-column>
           <el-table-column
               align="center"
               label="开发者ID"
               prop="developer_id"
-              width="200">
+              width="170">
             <template slot-scope="scope">
               <el-popover placement="top" trigger="hover">
                 <p>开发者ID: {{ scope.row.developer_id }}</p>
@@ -941,7 +948,7 @@
               align="center"
               label="开发者ID"
               prop="developer_id"
-              width="200">
+              width="170">
             <template slot-scope="scope">
               <el-popover placement="top" trigger="hover">
                 <p>开发者ID: {{ get_developer_uid(scope.row.developer_id) }}</p>
@@ -972,7 +979,7 @@
               align="center"
               label="授权时间"
               prop="created_time"
-              width="160">
+              width="100">
           </el-table-column>
         </el-table>
 
@@ -1019,7 +1026,7 @@
                 <p>UDID: {{ scope.row.udid }}</p>
                 <p>开发者ID: {{ scope.row.issuer_id }}</p>
                 <div slot="reference" class="name-wrapper">
-                  <el-tag size="medium">{{ scope.row.udid }}</el-tag>
+                  {{ scope.row.udid }}
                 </div>
               </el-popover>
             </template>
@@ -1057,6 +1064,7 @@
           <el-table-column
               align="center"
               label="开发者ID"
+              width="170"
               prop="issuer_id">
             <template slot-scope="scope">
               <el-popover placement="top" trigger="hover">
@@ -1093,7 +1101,7 @@
               align="center"
               label="添加时间"
               prop="created_time"
-              width="160">
+              width="100">
           </el-table-column>
           <el-table-column
               align="center"
@@ -1106,6 +1114,7 @@
                   <el-button
                       size="mini"
                       type="danger"
+                      plain
                       @click="udidDeleteFun(scope,0)">仅删除
                   </el-button>
                 </el-tooltip>
@@ -1115,6 +1124,7 @@
                   <el-button
                       size="mini"
                       type="danger"
+                      plain
                       @click="udidDeleteFun(scope,1)">删除并禁用设备
                   </el-button>
                 </el-tooltip>
diff --git a/fir_ser/xsign/utils/supersignutils.py b/fir_ser/xsign/utils/supersignutils.py
index d8fa75b..8393ae6 100644
--- a/fir_ser/xsign/utils/supersignutils.py
+++ b/fir_ser/xsign/utils/supersignutils.py
@@ -612,11 +612,12 @@ class IosUtils(object):
                 return status, device_obj
 
             if device_obj and device_obj.status not in ['ENABLED', 'DISABLED']:
-                if not IosUtils.check_device_status(developer_obj, org_device_obj=device_obj)[0]:
+                status, sync_device_obj = IosUtils.check_device_status(developer_obj, org_device_obj=device_obj)
+                if not status:
                     update_or_create_developer_udid_info(device_obj, developer_obj)
                     return False, 'UNEXPECTED_ERROR'
-
-            sync_device_obj, _ = update_or_create_developer_udid_info(device_obj, developer_obj)
+            else:
+                sync_device_obj, _ = update_or_create_developer_udid_info(device_obj, developer_obj)
 
         # 更新设备状态
         # 1. UDIDsyncDeveloper 库，通过udid 更新或创建设备信息
@@ -698,7 +699,8 @@ class IosUtils(object):
                     return False, err_msg
                 else:
                     if org_device_obj and org_device_obj.id == device_obj.id:
-                        org_device_obj.status = device_obj.status
+                        sync_device_obj, _ = update_or_create_developer_udid_info(device_obj, developer_obj)
+                        return True, sync_device_obj
         return True, ''
 
     @staticmethod