【会员系统】DMG版试用过期状态判断修改

PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -464,11 +464,10 @@ import Cocoa
                             if KMMemberInfo.shared.vip_levels == "3" {
                                 return .dmg_type38
                             }
-                        } else if KMMemberInfo.shared.vip_status == 4 { // 试用过期
-                            // 全平台高级版年订阅
-                            if KMMemberInfo.shared.vip_levels == "3" {
-                                return .dmg_type37
-                            }
+                        } else if KMMemberInfo.shared.canTrail == false &&
+                                    KMMemberInfo.shared.vip_levels == "1" &&
+                                    KMMemberInfo.shared.vip_status != 2 { // 试用过期
+                            return .dmg_type37
                         }
                     } else { // 有标准版License、无转档License 19 - 33
                         if KMMemberInfo.shared.canTrail && KMMemberInfo.shared.vip_levels == "1" { // 免费
@@ -532,11 +531,10 @@ import Cocoa
                             if KMMemberInfo.shared.vip_levels == "3" {
                                 return .dmg_type23
                             }
-                        } else if KMMemberInfo.shared.vip_status == 4 { // 试用过期
-                            // 全平台高级版年订阅
-                            if KMMemberInfo.shared.vip_levels == "3" {
-                                return .dmg_type22
-                            }
+                        } else if KMMemberInfo.shared.canTrail == false &&
+                                    KMMemberInfo.shared.vip_levels == "1" &&
+                                    KMMemberInfo.shared.vip_status != 2 { // 试用过期
+                            return .dmg_type22
                         }
                     }
                 } else { // 未绑定License 4 - 18
@@ -601,11 +599,10 @@ import Cocoa
                         if KMMemberInfo.shared.vip_levels == "3" {
                             return .dmg_type10  
                         }
-                    } else if KMMemberInfo.shared.vip_status == 4 { // 试用过期
-                        // 全平台高级版年订阅
-                        if KMMemberInfo.shared.vip_levels == "3" {
-                            return .dmg_type11
-                        }
+                    } else if KMMemberInfo.shared.canTrail == false &&
+                                KMMemberInfo.shared.vip_levels == "1" &&
+                                KMMemberInfo.shared.vip_status != 2 { // 试用过期
+                        return .dmg_type11
                     }
                 }
             } else {