2 Commits 1b70230371 ... bfd281a41e

Auteur SHA1 Message Date
  dinglingui bfd281a41e 【会员系统】解绑设备显示名称修改 il y a 1 semaine
  dinglingui 40839f3262 【会员系统】免费版本不出现office按钮 il y a 1 semaine

+ 3 - 0
PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -360,6 +360,9 @@ NSPopoverDelegate>
             totalWidth+=CGRectGetWidth(self.officeButton.bounds);
             totalWidth+=4;
         }
+#else
+        self.officeButton.hidden = YES;
+        self.officeImg.hidden = YES;
 #endif
         if (type == KMUserScenarioTypeLite_type1 ||
             type == KMUserScenarioTypeLite_type3 ||

+ 6 - 1
PDF Office/PDF Master/MemberCenter/Model/KMMemberCenterManager.swift

@@ -442,6 +442,7 @@ class KMMemberCenterManager: NSObject {
                 var uniqueSn = ""
                 var deviceName = ""
                 var id = ""
+                var model = ""
 
                 if let token = dict["device_id"] {
                     device_id = token as? String ?? ""
@@ -456,11 +457,15 @@ class KMMemberCenterManager: NSObject {
                     deviceName = token as? String ?? ""
                 }
                 
+                if let token = dict["model"] {
+                    model = token as? String ?? ""
+                }
+                
                 if let token = dict["id"] {
                     id = token as? String ?? ""
                 }
                 
-                let list = KMMemberDeviceList(deviceId: device_id, productId: productId, uniqueSn: uniqueSn, appId: "", deviceName: deviceName)
+                let list = KMMemberDeviceList(deviceId: device_id, productId: productId, uniqueSn: uniqueSn, appId: "", device_model:model, deviceName: deviceName)
                 list.id = id
                 deviceLists.append(list)
             }

+ 5 - 4
PDF Office/PDF Master/MemberCenter/WindowsController/KMMemberCenterWindowController.swift

@@ -150,14 +150,15 @@ class KMMemberCenterWindowController: NSWindowController {
         
         for i in 0 ..< deviceList_Result.count {
             let device = deviceList_Result[i]
+            let name = String(format: "%@(%@)",device.deviceName ?? "PDF Reader Pro User for ",device.device_model ?? " Device Name")
             if i == 0 {
-                device1Label.stringValue = device.deviceName ?? "PDF Reader Pro User"
+                device1Label.stringValue = name
             } else if i == 1 {
-                device2Label.stringValue = device.deviceName ?? "PDF Reader Pro User"
+                device2Label.stringValue = name
             }  else if i == 2 {
-                device3Label.stringValue = device.deviceName ?? "PDF Reader Pro User"
+                device3Label.stringValue = name
             } else if i == 3 {
-                device4Label.stringValue = device.deviceName ?? "PDF Reader Pro User"
+                device4Label.stringValue = name
             }
         }
         let maxDeviceNum = memberCenterdeviceResult.maxDeviceNum ?? 1