Prechádzať zdrojové kódy

群组查询是否不接收推送消息调整

Steven 2 rokov pred
rodič
commit
86c0e04b08

BIN
KulexiuForStudent/KulexiuForStudent.xcworkspace/xcuserdata/wangzhi.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m

@@ -912,7 +912,7 @@
 + (void)sysImComplaintRequest:(NSString *)post type:(NSString *)type fileUrl:(NSString *)fileUrl memo:(NSString *)memo targetId:(NSString *)targetId success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodJSON];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/sysImComplaint/add"];
-    targetId = [self returnNoContainGroupId:targetId];
+//    targetId = [self returnNoContainGroupId:targetId];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:type forKey:@"type"];
     [parm setValue:fileUrl forKey:@"url"];

+ 3 - 4
KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/Controller/GroupSettingViewController.m

@@ -230,15 +230,15 @@
 
 
 - (void)messageSetting {
-    BOOL isBlock = self.bodyView.isOn;
-    [[RCIMClient sharedRCIMClient] setConversationNotificationStatus:ConversationType_GROUP targetId:self.groupId isBlocked:isBlock success:^(RCConversationNotificationStatus nStatus) {
+    
+    RCPushNotificationLevel level = self.bodyView.isOn ? RCPushNotificationLevelBlocked : RCPushNotificationLevelDefault;
+    [[RCChannelClient sharedChannelManager] setConversationNotificationLevel:ConversationType_GROUP targetId:self.groupId level:level success:^{
         dispatch_main_async_safe(^{
             MJWeakSelf;
             [self KSShowMsg:@"设置成功" promptCompletion:^{
                 [weakSelf.navigationController popViewControllerAnimated:YES];
             }];
         });
-        
     } error:^(RCErrorCode status) {
         dispatch_main_async_safe(^{
             MJWeakSelf;
@@ -247,7 +247,6 @@
             }];
         });
     }];
-    
 }
 
 - (NSMutableArray *)sourceArray {

+ 4 - 0
KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupSettingBodyView.m

@@ -100,6 +100,10 @@ typedef void(^ChooseMemberCallback)(NSString *targetId);
 @end
 
 @implementation GroupSettingBodyView
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    self.isOn = NO;
+}
 
 + (instancetype)shareInstance  {
     GroupSettingBodyView *view = [[[NSBundle mainBundle] loadNibNamed:@"GroupSettingBodyView" owner:nil options:nil] firstObject];

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Module/Chat/Group/View/GroupSettingBodyView.xib

@@ -219,7 +219,7 @@
                                 <constraint firstAttribute="width" constant="47" id="30N-IR-OuO"/>
                                 <constraint firstAttribute="height" constant="40" id="ZIc-CE-ru7"/>
                             </constraints>
-                            <state key="normal" image="switch_on"/>
+                            <state key="normal" image="switch_off"/>
                             <connections>
                                 <action selector="notiferAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Lrb-Uv-0t3"/>
                             </connections>
@@ -402,7 +402,7 @@
     <resources>
         <image name="chat_group_Logo" width="44" height="44"/>
         <image name="mine_next_grey" width="6" height="11"/>
-        <image name="switch_on" width="47" height="24"/>
+        <image name="switch_off" width="47" height="24"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

+ 3 - 3
KulexiuForStudent/KulexiuForStudent/Module/Classroom/Controller/NewClassRoomViewController.m

@@ -1257,9 +1257,9 @@ typedef NS_ENUM(NSInteger, ACCOMPANYACTION) {
         CGRect frame = [self getWBoardFrame];
         _wBoardCtrl = [[KSWhiteboardControl alloc] initWithDelegate:self viewFrame:frame];
         NSString *roomId = [ClassroomService sharedService].currentRoom.roomId;
-        if ([roomId containsString:@"S"] || [roomId containsString:@"I"]) {
-            roomId = [roomId substringFromIndex:1];
-        }
+//        if ([roomId containsString:@"S"] || [roomId containsString:@"I"]) {
+//            roomId = [roomId substringFromIndex:1];
+//        }
         _wBoardCtrl.roomId = roomId;
         _wBoardCtrl.isRatationImage = self.isRorationImage;
         [_wBoardCtrl moveToSuperView:self.view];

+ 1 - 1
KulexiuForStudent/KulexiuForStudent/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.xib

@@ -26,7 +26,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5vd-tZ-CWT">
                     <rect key="frame" x="14" y="94" width="386" height="144.5"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注销后,您在相关产品/服务留存的信息将被清空无法找回,具体包括:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c7e-F8-dgF">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注销后,您在相关产品/服务留存的信息将被清空无法找回,具体包括:" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c7e-F8-dgF">
                             <rect key="frame" x="12" y="15" width="362" height="33.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>

+ 1 - 0
KulexiuForStudent/KulexiuForStudent/Module/SealClass/Sections/Classroom/View/Chat/MessageManager/MessageCell/MessageCell.m

@@ -167,6 +167,7 @@
 - (UIImageView *)headerImage {
     if (!_headerImage) {
         _headerImage = [[UIImageView alloc] init];
+        _headerImage.contentMode = UIViewContentModeScaleAspectFill;
         _headerImage.layer.masksToBounds = YES;
         _headerImage.layer.cornerRadius = 6;
     }