Browse Source

云相册去掉管理员限制

liuzhenxing1118 1 week ago
parent
commit
cd76bb2c75

+ 0 - 8
artimenring-iOS/Artimenring/Classes/ViewController/WFunction/Album/SKAlbumViewContoller+status.m

@@ -30,16 +30,12 @@
     //是否支持云相册
     if (![model.device.match isAblum])
         return;
-    //如果是管理员
-    BOOL isRole = model.role <= ROLE_ADMIN;
      
     [SKAlbumViewContoller requestCmccStatus:ticket callback:^(NSInteger authorize, NSInteger status) {
         if (authorize == -1 || status == - 1)
             return;
         NSInteger time = [[NSDate date] timeIntervalSince1970];
         if (authorize == 0) { //未授权
-            if (!isRole)
-                return;
             NSArray* array = [SKAlbumViewContoller getPopupStatus:ticket status:NEED_APP_ENABLE];
             if (isForce || [array.firstObject integerValue] == 0 || time - [array.lastObject integerValue] >= 14*24*60*60) {
                 [SKAlbumPopupView show:NEED_APP_ENABLE ticket:ticket callback:^(BOOL isOK, NSString* ticket) {
@@ -55,8 +51,6 @@
                 }];
             }
         } else if (status == 0) { //已授权, 未开通
-            if (!isRole)
-                return;
             NSArray* array = [SKAlbumViewContoller getPopupStatus:ticket status:NEED_WATCH_ENABLE];
             if (isForce || [array.firstObject integerValue] == 0 || time - [array.lastObject integerValue] >= 14*24*60*60) {
                 [SKAlbumPopupView show:NEED_WATCH_ENABLE ticket:ticket callback:^(BOOL isOK, NSString* ticket) {
@@ -72,8 +66,6 @@
                 }];
             }
         } else if (status == 2) { //已授权, 开通,但是退出登录
-            if (!isRole)
-                return;
             NSArray* array = [SKAlbumViewContoller getPopupStatus:ticket status:WATCH_LOGOUT];
             if (isForce || [array.firstObject integerValue] == 0 || time - [array.lastObject integerValue] >= 14*24*60*60) {
                 [SKAlbumPopupView show:WATCH_LOGOUT ticket:ticket callback:^(BOOL isOK, NSString* ticket) {