Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(iOS-sample): add missing file and methods #941

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(iOS-sample): add missing file and methods #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions samples/iOS/iOSDemo/PublicComponentV2/longlink_packer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ static int __unpack_test(const void* _packed, size_t _packed_len, uint32_t& _cmd
return LONGLINK_UNPACK_OK;
}

int LongLinkEncoder::packer_encoder_version = PackerEncoderVersion::kOld;
void LongLinkEncoder::SetEncoderVersion(int _version) {packer_encoder_version = _version;}

LongLinkEncoder::LongLinkEncoder() {
longlink_pack = [](uint32_t _cmdid,
uint32_t _seq,
Expand Down
2 changes: 2 additions & 0 deletions samples/iOS/iOSDemo/PublicComponentV2/longlink_packer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ class LongLinkEncoder {
*/
std::function<bool (uint32_t _cmdid, uint32_t _taskid, const AutoBuffer& _body, const AutoBuffer& _extend)> longlink_ispush;
std::function<bool (uint32_t _sent_seq, uint32_t _cmdid, uint32_t _recv_seq, const AutoBuffer& _body, const AutoBuffer& _extend)> longlink_identify_isresp;
static int packer_encoder_version;
static void SetEncoderVersion(int _version);
};

extern LongLinkEncoder gDefaultLongLinkEncoder;
Expand Down
2 changes: 1 addition & 1 deletion samples/iOS/iOSDemo/PublicComponentV2/stn_callback.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class StnCallBack : public Callback {
//底层回包返回给上层解析
virtual int Buf2Resp(uint32_t _taskid, void* const _user_context, const std::string& _user_id, const AutoBuffer& _inbuffer, const AutoBuffer& _extend, int& _error_code, const int _channel_select);
//任务执行结束
virtual int OnTaskEnd(uint32_t _taskid, void* const _user_context, const std::string& _user_id, int _error_type, int _error_code);
virtual int OnTaskEnd(uint32_t _taskid, void* const _user_context, const std::string& _user_id, int _error_type, int _error_code, const CgiProfile& _profile);

//上报网络连接状态
virtual void ReportConnectStatus(int _status, int longlink_status);
Expand Down
2 changes: 1 addition & 1 deletion samples/iOS/iOSDemo/PublicComponentV2/stn_callback.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
return handle_type;
}

int StnCallBack::OnTaskEnd(uint32_t _taskid, void* const _user_context, const std::string& _user_id, int _error_type, int _error_code) {
int StnCallBack::OnTaskEnd(uint32_t _taskid, void* const _user_context, const std::string& _user_id, int _error_type, int _error_code, const CgiProfile& _profile) {

return (int)[[NetworkService sharedInstance] OnTaskEndWithTaskID:_taskid userContext:_user_context errType:_error_type errCode:_error_code];

Expand Down
5 changes: 3 additions & 2 deletions samples/iOS/iOSDemo/iOSDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -828,7 +829,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = iOSDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.mars;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -850,7 +851,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = iOSDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.mars;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down