Skip to content

O
OffcnIMSDKiOS
Commit d0c4407d by zhangyunjie
Options

调试

parent 48373e53
Showing with 138 additions and 44 deletions
OffcnIMSDKiOS.xcodeproj/project.pbxproj
...@@ -203,8 +203,8 @@ ...@@ -203,8 +203,8 @@
A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F324EA83C90024EB54 /* libsqlite3.tbd */; }; A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F324EA83C90024EB54 /* libsqlite3.tbd */; };
A96621F724EA842E0024EB54 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F224EA83BB0024EB54 /* libresolv.tbd */; }; A96621F724EA842E0024EB54 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A96621F224EA83BB0024EB54 /* libresolv.tbd */; };
A966274D24EBA56C0024EB54 /* OffcnIMSDKiOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */; }; A966274D24EBA56C0024EB54 /* OffcnIMSDKiOS.m in Sources */ = {isa = PBXBuildFile; fileRef = A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */; };
A9662CE724ED29D00024EB54 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9662CE524ED29C90024EB54 /* oimcore.framework */; }; A9D1B31424EE0772000F4662 /* oimcore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B31224EE076B000F4662 /* oimcore.framework */; };
A9662CE824ED29D00024EB54 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9662CE524ED29C90024EB54 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A9D1B31524EE0772000F4662 /* oimcore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = A9D1B31224EE076B000F4662 /* oimcore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49CE5E230A14D9B821170F61 /* libPods-OffcnIMSDKiOS.a */; }; B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 49CE5E230A14D9B821170F61 /* libPods-OffcnIMSDKiOS.a */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
A9662CE824ED29D00024EB54 /* oimcore.framework in Embed Frameworks */, A9D1B31524EE0772000F4662 /* oimcore.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -634,7 +634,7 @@ ...@@ -634,7 +634,7 @@
A966274B24EBA56C0024EB54 /* OffcnIMSDKiOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnIMSDKiOS.h; sourceTree = "<group>"; }; A966274B24EBA56C0024EB54 /* OffcnIMSDKiOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OffcnIMSDKiOS.h; sourceTree = "<group>"; };
A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnIMSDKiOS.m; sourceTree = "<group>"; }; A966274C24EBA56C0024EB54 /* OffcnIMSDKiOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OffcnIMSDKiOS.m; sourceTree = "<group>"; };
A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OffcnIMSDKiOS.entitlements; sourceTree = "<group>"; }; A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OffcnIMSDKiOS.entitlements; sourceTree = "<group>"; };
A9662CE524ED29C90024EB54 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; }; A9D1B31224EE076B000F4662 /* oimcore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = oimcore.framework; sourceTree = "<group>"; };
D7DCDED1DEE7F99F223D5C73 /* Pods-OffcnIMSDKiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OffcnIMSDKiOS.release.xcconfig"; path = "Target Support Files/Pods-OffcnIMSDKiOS/Pods-OffcnIMSDKiOS.release.xcconfig"; sourceTree = "<group>"; }; D7DCDED1DEE7F99F223D5C73 /* Pods-OffcnIMSDKiOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OffcnIMSDKiOS.release.xcconfig"; path = "Target Support Files/Pods-OffcnIMSDKiOS/Pods-OffcnIMSDKiOS.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
...@@ -647,7 +647,7 @@ ...@@ -647,7 +647,7 @@
A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */, A96621F624EA84230024EB54 /* libsqlite3.tbd in Frameworks */,
A96621F524EA84160024EB54 /* libxml2.tbd in Frameworks */, A96621F524EA84160024EB54 /* libxml2.tbd in Frameworks */,
A96621EF24EA83A80024EB54 /* SystemConfiguration.framework in Frameworks */, A96621EF24EA83A80024EB54 /* SystemConfiguration.framework in Frameworks */,
A9662CE724ED29D00024EB54 /* oimcore.framework in Frameworks */, A9D1B31424EE0772000F4662 /* oimcore.framework in Frameworks */,
A96621F124EA83B10024EB54 /* CoreTelephony.framework in Frameworks */, A96621F124EA83B10024EB54 /* CoreTelephony.framework in Frameworks */,
B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */, B94FCB1053F8932068A11CC9 /* libPods-OffcnIMSDKiOS.a in Frameworks */,
); );
...@@ -687,7 +687,7 @@ ...@@ -687,7 +687,7 @@
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */, A9662CBF24ECD98B0024EB54 /* OffcnIMSDKiOS.entitlements */,
A9662CE524ED29C90024EB54 /* oimcore.framework */, A9D1B31224EE076B000F4662 /* oimcore.framework */,
A966274724EBA36A0024EB54 /* ExposedInterface-(外放接口) */, A966274724EBA36A0024EB54 /* ExposedInterface-(外放接口) */,
A9661FC824EA7AD10024EB54 /* Common-(宏) */, A9661FC824EA7AD10024EB54 /* Common-(宏) */,
A9661F8124EA7AD10024EB54 /* Tools-(工具) */, A9661F8124EA7AD10024EB54 /* Tools-(工具) */,
......
OffcnIMSDKiOS/AppDelegate.m
...@@ -97,12 +97,8 @@ ...@@ -97,12 +97,8 @@
// 25bb75ac 3ffcebd7 90d9f517 1ebca904 154a367a 87781e5d b9ea288e 37fdf487 // 25bb75ac 3ffcebd7 90d9f517 1ebca904 154a367a 87781e5d b9ea288e 37fdf487
NSLog(@"-----deviceToken ---- ---- %@ devDesc ---%@", deviceToken,deviceToken.description); NSLog(@"-----deviceToken ---- ---- %@ devDesc ---%@", deviceToken,deviceToken.description);
//tokenStr 得到可用的token。
// NSString *tokenStr = [NSString stringWithFormat:@"%@",deviceToken];
// tokenStr = [tokenStr stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"<>"]];//将其中的<>去掉
// tokenStr = [tokenStr stringByReplacingOccurrencesOfString:@" " withString:@""];//将其中的空格去掉
NSString *str = [self hexStringForData:deviceToken]; NSString *str = [self hexStringForData:deviceToken];
[OffcnIMSDKiOS defaultService].deviceToken = str;
NSLog(@"token--- %@",str); NSLog(@"token--- %@",str);
//注册成功，返回token //注册成功，返回token
UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"APNS返回的Token:" message:str delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确定", nil]; UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"APNS返回的Token:" message:str delegate:self cancelButtonTitle:@"取消" otherButtonTitles:@"确定", nil];
......
OffcnIMSDKiOS/Base.lproj/Main.storyboard
...@@ -123,33 +123,66 @@ ...@@ -123,33 +123,66 @@
<action selector="sendMeg:" destination="BYZ-38-t0r" eventType="touchUpInside" id="FvS-MG-NH7"/> <action selector="sendMeg:" destination="BYZ-38-t0r" eventType="touchUpInside" id="FvS-MG-NH7"/>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m3k-LM-GSV">
<rect key="frame" x="15" y="375" width="62" height="30"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="注册用户"/>
<connections>
<action selector="registeredUser:" destination="BYZ-38-t0r" eventType="touchUpInside" id="6BH-gR-fcD"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uRU-q5-QzB">
<rect key="frame" x="15" y="410" width="62" height="30"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="注销用户"/>
<connections>
<action selector="UnRegisteredUser:" destination="BYZ-38-t0r" eventType="touchUpInside" id="lsz-2T-JSe"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Cy1-S1-DPz">
<rect key="frame" x="15" y="445" width="132" height="30"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="上传图片/视频/文件"/>
<connections>
<action selector="uploadFile:" destination="BYZ-38-t0r" eventType="touchUpInside" id="f1e-t6-rq0"/>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
<constraint firstItem="7fD-Hf-Afy" firstAttribute="top" secondItem="F7y-mH-mpC" secondAttribute="bottom" constant="5" id="3iZ-Fk-2i8"/> <constraint firstItem="7fD-Hf-Afy" firstAttribute="top" secondItem="F7y-mH-mpC" secondAttribute="bottom" constant="5" id="3iZ-Fk-2i8"/>
<constraint firstItem="uRU-q5-QzB" firstAttribute="leading" secondItem="dRe-f0-gnl" secondAttribute="leading" id="4wn-eR-XoF"/>
<constraint firstItem="F7y-mH-mpC" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" constant="1" id="6b7-ni-Ag1"/> <constraint firstItem="F7y-mH-mpC" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" constant="1" id="6b7-ni-Ag1"/>
<constraint firstItem="FOH-XA-D8x" firstAttribute="leading" secondItem="dRe-f0-gnl" secondAttribute="leading" constant="1" id="7Vb-59-bMM"/> <constraint firstItem="FOH-XA-D8x" firstAttribute="leading" secondItem="dRe-f0-gnl" secondAttribute="leading" constant="1" id="7Vb-59-bMM"/>
<constraint firstAttribute="trailing" secondItem="so4-rI-aRi" secondAttribute="trailing" id="83W-xz-1xP"/> <constraint firstAttribute="trailing" secondItem="so4-rI-aRi" secondAttribute="trailing" id="83W-xz-1xP"/>
<constraint firstItem="Cy1-S1-DPz" firstAttribute="height" secondItem="dRe-f0-gnl" secondAttribute="height" id="8qa-si-8ig"/>
<constraint firstItem="m3k-LM-GSV" firstAttribute="leading" secondItem="dRe-f0-gnl" secondAttribute="leading" id="97H-yt-Mwa"/>
<constraint firstItem="dRe-f0-gnl" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="15" id="A4C-6b-WCr"/> <constraint firstItem="dRe-f0-gnl" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="15" id="A4C-6b-WCr"/>
<constraint firstItem="so4-rI-aRi" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="Acv-YJ-6xY"/> <constraint firstItem="so4-rI-aRi" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="Acv-YJ-6xY"/>
<constraint firstItem="dRe-f0-gnl" firstAttribute="top" secondItem="so4-rI-aRi" secondAttribute="bottom" constant="10" id="AvN-lQ-0c4"/> <constraint firstItem="dRe-f0-gnl" firstAttribute="top" secondItem="so4-rI-aRi" secondAttribute="bottom" constant="10" id="AvN-lQ-0c4"/>
<constraint firstItem="Cy1-S1-DPz" firstAttribute="top" secondItem="uRU-q5-QzB" secondAttribute="bottom" constant="5" id="CFi-VG-VAh"/>
<constraint firstItem="F7y-mH-mpC" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="HV9-jc-VLg"/> <constraint firstItem="F7y-mH-mpC" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="HV9-jc-VLg"/>
<constraint firstItem="F7y-mH-mpC" firstAttribute="top" secondItem="9JE-Lz-Dma" secondAttribute="bottom" constant="5" id="HdJ-KZ-Mo0"/> <constraint firstItem="F7y-mH-mpC" firstAttribute="top" secondItem="9JE-Lz-Dma" secondAttribute="bottom" constant="5" id="HdJ-KZ-Mo0"/>
<constraint firstItem="so4-rI-aRi" firstAttribute="top" secondItem="HDM-va-7kG" secondAttribute="bottom" constant="5" id="JGR-v7-Dr6"/> <constraint firstItem="so4-rI-aRi" firstAttribute="top" secondItem="HDM-va-7kG" secondAttribute="bottom" constant="5" id="JGR-v7-Dr6"/>
<constraint firstItem="uRU-q5-QzB" firstAttribute="top" secondItem="m3k-LM-GSV" secondAttribute="bottom" constant="5" id="JUk-SN-mJi"/>
<constraint firstItem="HDM-va-7kG" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="LVQ-dP-gyt"/> <constraint firstItem="HDM-va-7kG" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="LVQ-dP-gyt"/>
<constraint firstItem="m3k-LM-GSV" firstAttribute="top" secondItem="7fD-Hf-Afy" secondAttribute="bottom" constant="5" id="Lxq-EJ-ByY"/>
<constraint firstItem="2eb-Vp-qLt" firstAttribute="height" secondItem="dRe-f0-gnl" secondAttribute="height" id="M7d-CM-zWv"/> <constraint firstItem="2eb-Vp-qLt" firstAttribute="height" secondItem="dRe-f0-gnl" secondAttribute="height" id="M7d-CM-zWv"/>
<constraint firstItem="2eb-Vp-qLt" firstAttribute="top" secondItem="dRe-f0-gnl" secondAttribute="bottom" constant="5" id="QLW-Tp-TY4"/> <constraint firstItem="2eb-Vp-qLt" firstAttribute="top" secondItem="dRe-f0-gnl" secondAttribute="bottom" constant="5" id="QLW-Tp-TY4"/>
<constraint firstItem="TnX-iH-azN" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="15" id="UOK-BA-rIV"/> <constraint firstItem="TnX-iH-azN" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="15" id="UOK-BA-rIV"/>
<constraint firstItem="Cy1-S1-DPz" firstAttribute="leading" secondItem="dRe-f0-gnl" secondAttribute="leading" id="Y9c-yU-8ZX"/>
<constraint firstAttribute="trailing" secondItem="HDM-va-7kG" secondAttribute="trailing" id="YX6-FQ-G4J"/> <constraint firstAttribute="trailing" secondItem="HDM-va-7kG" secondAttribute="trailing" id="YX6-FQ-G4J"/>
<constraint firstItem="FOH-XA-D8x" firstAttribute="top" secondItem="2eb-Vp-qLt" secondAttribute="bottom" constant="5" id="ZKE-q9-PH4"/> <constraint firstItem="FOH-XA-D8x" firstAttribute="top" secondItem="2eb-Vp-qLt" secondAttribute="bottom" constant="5" id="ZKE-q9-PH4"/>
<constraint firstItem="2eb-Vp-qLt" firstAttribute="leading" secondItem="dRe-f0-gnl" secondAttribute="leading" constant="1" id="e0h-4k-Ucp"/> <constraint firstItem="2eb-Vp-qLt" firstAttribute="leading" secondItem="dRe-f0-gnl" secondAttribute="leading" constant="1" id="e0h-4k-Ucp"/>
<constraint firstItem="TnX-iH-azN" firstAttribute="top" secondItem="FOH-XA-D8x" secondAttribute="bottom" constant="5" id="ecq-kq-ylx"/> <constraint firstItem="TnX-iH-azN" firstAttribute="top" secondItem="FOH-XA-D8x" secondAttribute="bottom" constant="5" id="ecq-kq-ylx"/>
<constraint firstItem="9JE-Lz-Dma" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="fRe-gX-tKo"/> <constraint firstItem="9JE-Lz-Dma" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="fRe-gX-tKo"/>
<constraint firstItem="uRU-q5-QzB" firstAttribute="height" secondItem="dRe-f0-gnl" secondAttribute="height" id="gfY-7F-lgC"/>
<constraint firstItem="1dp-RW-FhV" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" constant="1" id="gpR-z2-ljd"/> <constraint firstItem="1dp-RW-FhV" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" constant="1" id="gpR-z2-ljd"/>
<constraint firstItem="7fD-Hf-Afy" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="j3W-5R-k7D"/> <constraint firstItem="7fD-Hf-Afy" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="j3W-5R-k7D"/>
<constraint firstItem="9JE-Lz-Dma" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" constant="1" id="kqV-nZ-dh4"/> <constraint firstItem="9JE-Lz-Dma" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" constant="1" id="kqV-nZ-dh4"/>
<constraint firstItem="HDM-va-7kG" firstAttribute="top" secondItem="a21-3W-10n" secondAttribute="bottom" id="lS8-hA-rmu"/> <constraint firstItem="HDM-va-7kG" firstAttribute="top" secondItem="a21-3W-10n" secondAttribute="bottom" id="lS8-hA-rmu"/>
<constraint firstItem="7fD-Hf-Afy" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" id="lea-oR-ecV"/> <constraint firstItem="7fD-Hf-Afy" firstAttribute="leading" secondItem="TnX-iH-azN" secondAttribute="leading" id="lea-oR-ecV"/>
<constraint firstItem="m3k-LM-GSV" firstAttribute="height" secondItem="dRe-f0-gnl" secondAttribute="height" id="nTZ-4F-JJU"/>
<constraint firstItem="1dp-RW-FhV" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="pCJ-es-iPl"/> <constraint firstItem="1dp-RW-FhV" firstAttribute="height" secondItem="TnX-iH-azN" secondAttribute="height" id="pCJ-es-iPl"/>
<constraint firstItem="1dp-RW-FhV" firstAttribute="top" secondItem="TnX-iH-azN" secondAttribute="bottom" constant="5" id="ta0-ZL-iPP"/> <constraint firstItem="1dp-RW-FhV" firstAttribute="top" secondItem="TnX-iH-azN" secondAttribute="bottom" constant="5" id="ta0-ZL-iPP"/>
<constraint firstItem="Vmx-zP-DRW" firstAttribute="height" secondItem="dRe-f0-gnl" secondAttribute="height" id="uLF-IL-l61"/> <constraint firstItem="Vmx-zP-DRW" firstAttribute="height" secondItem="dRe-f0-gnl" secondAttribute="height" id="uLF-IL-l61"/>
......
OffcnIMSDKiOS/Common-(宏)/SDConfigrationNetwork.h
// //
...@@ -54,5 +54,11 @@ ...@@ -54,5 +54,11 @@
#define getRecentSessionsURL [NSString stringWithFormat:@"%@getRecentSessions",BASE_URL] #define getRecentSessionsURL [NSString stringWithFormat:@"%@getRecentSessions",BASE_URL]
//获取会话历史消息列表 //获取会话历史消息列表
#define getSessionHistoryMsgURL [NSString stringWithFormat:@"%@getSessionHistoryMsg",BASE_URL] #define getSessionHistoryMsgURL [NSString stringWithFormat:@"%@getSessionHistoryMsg",BASE_URL]
//获取七牛Token
#define uploadToken [NSString stringWithFormat:@"%@uploadToken",BASE_URL]
//注册用户设备
#define registerDevices [NSString stringWithFormat:@"%@devices/register",BASE_URL]
//注销用户设备
#define unregisterDevices [NSString stringWithFormat:@"%@devices/unregister",BASE_URL]
#endif /* ConfigrationNetwork_h */ #endif /* ConfigrationNetwork_h */
OffcnIMSDKiOS/ExposedInterface-(外放接口)/OffcnIMSDKiOS.h
// //
...@@ -44,6 +44,10 @@ typedef void(^OffcnSDKReachabilityStatusCallBack)(OffcnSDKReachabilityStatus sta ...@@ -44,6 +44,10 @@ typedef void(^OffcnSDKReachabilityStatusCallBack)(OffcnSDKReachabilityStatus sta
//是否选用测试环境 //是否选用测试环境
@property (nonatomic, assign) BOOL isTest; @property (nonatomic, assign) BOOL isTest;
//deviceToken
@property (nonatomic, copy) NSString *deviceToken;
@property (nonatomic, assign) OffcnSDKReachabilityStatus OffcnReachabilityStatus; @property (nonatomic, assign) OffcnSDKReachabilityStatus OffcnReachabilityStatus;
@property (nonatomic, copy) OffcnSDKReachabilityStatusCallBack reachabilityStatusCallBack; @property (nonatomic, copy) OffcnSDKReachabilityStatusCallBack reachabilityStatusCallBack;
......
OffcnIMSDKiOS/Tools-(工具)/NetworkManager/OffcnBaseNetworking.m
// //
...@@ -214,25 +214,8 @@ static OffcnBaseNetworking *baseNetWorkApi; ...@@ -214,25 +214,8 @@ static OffcnBaseNetworking *baseNetWorkApi;
//SHA1(AppSecret + Nonce + CurTime)，三个参数拼接的字符串，进行SHA1哈希计算，转化成16进制字符(String，小写) //SHA1(AppSecret + Nonce + CurTime)，三个参数拼接的字符串，进行SHA1哈希计算，转化成16进制字符(String，小写)
NSString *margeStr = [NSString stringWithFormat:@"%@%@%@",KCustomerSecre,nonceStr,curtimeStr]; NSString *margeStr = [NSString stringWithFormat:@"%@%@%@",KCustomerSecre,nonceStr,curtimeStr];
NSString *checksumStr = [ZYJOSSUtil sha1WithString:margeStr]; NSString *checksumStr = [ZYJOSSUtil sha1WithString:margeStr];
checksumStr = [[SDGeneralTool hexStringFromString:checksumStr] lowercaseString]; checksumStr = [checksumStr lowercaseString];
[manager.requestSerializer setValue:checksumStr forHTTPHeaderField:@"checksum"]; [manager.requestSerializer setValue:checksumStr forHTTPHeaderField:@"checksum"];
// [manager.requestSerializer setValue:@"ZgLiveStudent" forHTTPHeaderField:@"zgl-clienttype"];
// [manager.requestSerializer setValue:[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"] forHTTPHeaderField:@"zgl-clientversion"];
// [manager.requestSerializer setValue:@"iOS" forHTTPHeaderField:@"zgl-systemtype"];
// NSString *systemString = [NSString stringWithFormat:@"%@",[UIDevice currentDevice].systemVersion];
// [manager.requestSerializer setValue:systemString forHTTPHeaderField:@"zgl-systemversion"];
// [manager.requestSerializer setValue:[UIDevice currentDevice].identifierForVendor.UUIDString forHTTPHeaderField:@"zgl-phonekey"];
// [manager.requestSerializer setValue:[SDGeneralTool deviceVersion] forHTTPHeaderField:@"zgl-phonetype"];
// NSString *screenString = [NSString stringWithFormat:@"%.0fx%.0f",[UIScreen mainScreen].bounds.size.width * [UIScreen mainScreen].scale,[UIScreen mainScreen].bounds.size.height * [UIScreen mainScreen].scale];
// [manager.requestSerializer setValue:screenString forHTTPHeaderField:@"zgl-resolution"];
// if ([OffcnBaseNetworking sharedInstance].token.length) {
// [manager.requestSerializer setValue:[OffcnBaseNetworking sharedInstance].token forHTTPHeaderField:@"Authorization"];
// }else{
// [manager.requestSerializer setValue:@"" forHTTPHeaderField:@"Authorization"];
// }
} }
- (ZYJAFHTTPSessionManager *)manager - (ZYJAFHTTPSessionManager *)manager
......
OffcnIMSDKiOS/Tools-(工具)/NetworkManager/OffcnNetworkExecutor.h
// //
...@@ -25,9 +25,12 @@ ...@@ -25,9 +25,12 @@
+ (void)requestGetRecentSessionsWithAccid:(NSString *)accid Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished; + (void)requestGetRecentSessionsWithAccid:(NSString *)accid Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished;
//获取会话历史消息列表 //获取会话历史消息列表
+ (void)requestGetSessionHistoryMsgWithFromID:(NSString *)fromID toID:(NSString *)toID msg_seq:(NSString *)msg_seq Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished; + (void)requestGetSessionHistoryMsgWithFromID:(NSString *)fromID toID:(NSString *)toID msg_seq:(NSString *)msg_seq Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished;
//获取七牛Token
+ (void)requestUploadTokenFinished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished;
//注册用户设备
+ (void)requestRegisterDevicesWithAccid:(NSString *)accid device_token:(NSString *)device_token Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished;
//注销用户设备
+ (void)requestUnregisterDevicesWithAccid:(NSString *)accid device_token:(NSString *)device_token Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished;
@end @end
OffcnIMSDKiOS/Tools-(工具)/NetworkManager/OffcnNetworkExecutor.m
// //
...@@ -223,6 +223,56 @@ ...@@ -223,6 +223,56 @@
}]; }];
} }
//获取七牛Token
+ (void)requestUploadTokenFinished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished{
[OffcnBaseNetworking getFromURL:uploadToken params:nil finished:^(BaseResponse *baseResponse) {
if (baseResponse.isSuccess) {
finished(YES,baseResponse.responseObject,nil);
}else{
finished(NO,nil,baseResponse);
}
}];
}
//注册用户设备
+ (void)requestRegisterDevicesWithAccid:(NSString *)accid device_token:(NSString *)device_token Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished{
NSMutableDictionary *dic = [NSMutableDictionary dictionary];
[dic setObjectOnSafe:accid forKey:@"accid"];
[dic setObjectOnSafe:@"ios" forKey:@"device"];
[dic setObjectOnSafe:device_token forKey:@"device_token"];
[OffcnBaseNetworking postToURL:registerDevices bodyParams:dic finished:^(BaseResponse *baseResponse) {
if (baseResponse.isSuccess) {
finished(YES,baseResponse.responseObject,nil);
}else{
finished(NO,nil,baseResponse);
}
}];
}
//注销用户设备
+ (void)requestUnregisterDevicesWithAccid:(NSString *)accid device_token:(NSString *)device_token Finished:(void(^)(BOOL success,id response,BaseResponse *baseResponse))finished{
NSMutableDictionary *dic = [NSMutableDictionary dictionary];
[dic setObjectOnSafe:accid forKey:@"accid"];
[dic setObjectOnSafe:@"ios" forKey:@"device"];
[dic setObjectOnSafe:device_token forKey:@"device_token"];
[OffcnBaseNetworking postToURL:unregisterDevices bodyParams:dic finished:^(BaseResponse *baseResponse) {
if (baseResponse.isSuccess) {
finished(YES,baseResponse.responseObject,nil);
}else{
finished(NO,nil,baseResponse);
}
}];
}
@end @end
//{ //{
......
OffcnIMSDKiOS/ViewController.mm
...@@ -41,13 +41,14 @@ ...@@ -41,13 +41,14 @@
[self.view endEditing:YES]; [self.view endEditing:YES];
} }
- (IBAction)connectAction:(UIButton *)sender { - (IBAction)connectAction:(UIButton *)sender {
NSString *param = @"{\"server_ip\":\"39.102.42.185\", \"server_port\":6000, \"user_id\":\"ce0819db8391f1e7258a71cc9e2c3235\",\"app_id\":\"offcn_live\", \"device_type\":\"android\", \"token\":\"fadbce3f4929b6bdee0617fee34e32ae\"}"; NSString *param = @"{\"server_ip\":\"39.102.42.185\", \"server_port\":6000, \"user_id\":\"ce0819db8391f1e7258a71cc9e2c3235\",\"app_id\":\"offcn_live\", \"device_type\":\"ios\", \"token\":\"fadbce3f4929b6bdee0617fee34e32ae\"}";
self.adapter = [OIMCoreAdapter sharedOIMCore]; self.adapter = [OIMCoreAdapter sharedOIMCore];
self.adapter.delegate = self; self.adapter.delegate = self;
[self.adapter Initialize];
[self.adapter ConnectImServerWithParam:param]; [self.adapter ConnectImServerWithParam:param];
} }
-(void)OnOImCoreMessageWithMessage:(const char *_Nonnull)message msgLength:(int)len{ -(void)OnOImCoreMessageWithMessage:(const char *_Nonnull)message msgLength:(int)len{
// "{\"type\":1,\"body\":{\"session_id\":\"a05517f0-ddec-11ea-88a4-4a5555fb6ab4\",\"msg_id\":\"d5f9b600-e28f-11ea-88a4-4a5555fb6ab4\",\"version\":1,\"send_time\":\"2020-08-20 10:49:58\",\"msg_seq\":1597891798,\"msg_from\":\"jfdfjei0343\",\"msg_scope\":1,\"msg_type\":1,\"msg_content\":{\"msg\":\"随机数298\"}}}"
} }
-(void)OnOImCoreEventWithCode:(int)code context:(const char *)context{ -(void)OnOImCoreEventWithCode:(int)code context:(const char *)context{
...@@ -58,8 +59,8 @@ ...@@ -58,8 +59,8 @@
[self.adapter DisConnectImServer]; [self.adapter DisConnectImServer];
} }
- (IBAction)sendMegAction:(UIButton *)sender { - (IBAction)sendMegAction:(UIButton *)sender {
NSString *meg = @"qwe"; // NSString *meg = @"qwe";
[self.adapter SendUserMessage:meg length:(int)meg.length type:kMsg_Type_Normal]; // [self.adapter SendUserMessage:meg length:(int)meg.length type:kMsg_Type_Normal];
} }
//发送本地通知 //发送本地通知
...@@ -97,6 +98,24 @@ ...@@ -97,6 +98,24 @@
}]; }];
} }
- (IBAction)registeredUser:(UIButton *)sender {
[OffcnNetworkExecutor requestRegisterDevicesWithAccid:self.fromId device_token:[OffcnIMSDKiOS defaultService].deviceToken Finished:^(BOOL success, id response, BaseResponse *baseResponse) {
}];
}
- (IBAction)UnRegisteredUser:(UIButton *)sender {
[OffcnNetworkExecutor requestUnregisterDevicesWithAccid:self.fromId device_token:[OffcnIMSDKiOS defaultService].deviceToken Finished:^(BOOL success, id response, BaseResponse *baseResponse) {
}];
}
- (IBAction)uploadFile:(UIButton *)sender {
[OffcnNetworkExecutor requestUploadTokenFinished:^(BOOL success, id response, BaseResponse *baseResponse) {
NSString *token = [NSString stringWithFormat:@"%@",response];
NSLog(@"七牛token---%@",token);
}];
}
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
...@@ -105,8 +124,8 @@ ...@@ -105,8 +124,8 @@
self.changeEnvironmentBtn.selected = [OffcnIMSDKiOS defaultService].isTest; self.changeEnvironmentBtn.selected = [OffcnIMSDKiOS defaultService].isTest;
self.fromId = @"ce0819db8391f1e7258a71cc9e2c3235"; self.toId = @"ce0819db8391f1e7258a71cc9e2c3235";
self.toId = @"jfdfjei0343"; self.fromId = @"jfdfjei0343";
self.msg_type = OffcnSDKMsgTypeText; self.msg_type = OffcnSDKMsgTypeText;
self.dataDic = [NSMutableDictionary dictionaryWithObject:@"我是一只小青龙" forKey:@"msg"]; self.dataDic = [NSMutableDictionary dictionaryWithObject:@"我是一只小青龙" forKey:@"msg"];
} }
......
OffcnIMSDKiOS/oimcore.framework/Headers/oimcoreAdapter.h
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "oim_types.h"
@protocol OIMCoreDelegate <NSObject> @protocol OIMCoreDelegate <NSObject>
-(void)OnOImCoreMessageWithMessage:(const char *_Nonnull)message msgLength:(int)len; -(void)OnOImCoreMessageWithMessage:(const char *_Nonnull)message msgLength:(int)len;
...@@ -30,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -30,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
- (id)copy NS_UNAVAILABLE; - (id)copy NS_UNAVAILABLE;
- (id)mutableCopy NS_UNAVAILABLE; - (id)mutableCopy NS_UNAVAILABLE;
- (void)Initialize;
/** /**
* 连接服务器 * 连接服务器
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment