ifish/Ifish
jiangxuefei718 a1f9494a73 Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop
# Conflicts:
#	Ifish/controllers/FishTinkController/maincontroller/CenterViewController.m
#	Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/RuSunTemp/RuSunIndependence/RunSun84biteCenterViewController.m
2019-03-19 16:42:03 +08:00
..
AFNet Initial commit 2017-08-15 16:59:01 +08:00
AlibcTradeSDK-3.1.1.96+AlibcTradeBiz-3.1.1.96+AlibcTradeCommon-3.1.1.93+AlibcLinkPartnerSDK-1.1.0.9-FullPackage Initial commit 2017-08-15 16:59:01 +08:00
Assets.xcassets 新版4 2019-03-12 09:31:12 +08:00
AsyncSocket 新版本 2019-03-12 09:26:46 +08:00
BaiLingSoundSdk Initial commit 2017-08-15 16:59:01 +08:00
Base.lproj Merge remote-tracking branch 'origin/master' 2018-09-22 21:41:24 +08:00
Bugly-v2.4.7 Initial commit 2017-08-15 16:59:01 +08:00
Common fixed: 1.适配小屏幕机型 2019-03-14 08:41:00 +08:00
ESPTouch Initial commit 2017-08-15 16:59:01 +08:00
JHRefresh Initial commit 2017-08-15 16:59:01 +08:00
MBProgressHUD Initial commit 2017-08-15 16:59:01 +08:00
MMProgressHUD Initial commit 2017-08-15 16:59:01 +08:00
MyHelper Initial commit 2017-08-15 16:59:01 +08:00
Reachability Initial commit 2017-08-15 16:59:01 +08:00
SDWebImage3.8.2/SDWebImage Initial commit 2017-08-15 16:59:01 +08:00
SMS_SDK Initial commit 2017-08-15 16:59:01 +08:00
SVProgressHUD Initial commit 2017-08-15 16:59:01 +08:00
TalkingDataV2.2.88 Initial commit 2017-08-15 16:59:01 +08:00
UMCommunity fixed: 1.适配小屏幕机型 2019-03-14 08:41:00 +08:00
UMSocial 新版本 2019-03-12 09:26:46 +08:00
Utinitys fixed: 1.适配小屏幕机型 2019-03-14 08:41:00 +08:00
YunXinIM 修改云信聊天汽包尺寸计算延迟的问题 2018-05-19 10:50:27 +08:00
ZbarSDK 新版本 2019-03-12 09:26:46 +08:00
controllers Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop 2019-03-19 16:42:03 +08:00
fmdb Initial commit 2017-08-15 16:59:01 +08:00
ifishImgSouce 新版4 2019-03-12 09:31:12 +08:00
models Initial commit 2017-08-15 16:59:01 +08:00
views 新版本 2019-03-12 09:26:46 +08:00
zh-Hans.lproj Initial commit 2017-08-15 16:59:01 +08:00
.DS_Store 新版本 2019-03-12 09:26:46 +08:00
AppDelegate.h 新版本 2019-03-12 09:26:46 +08:00
AppDelegate.m fixed:设备连接页面适配 2019-03-15 21:01:42 +08:00
Ifish-Prefix.pch 三控、两控页面适配iPhone X 2018-04-03 00:02:49 +08:00
Ifish.entitlements fixed: 1.适配小屏幕机型 2019-03-14 08:41:00 +08:00
Info.plist fixed:1,摄像头绑定页面适配 2019-03-15 18:09:13 +08:00
ViewController.h Initial commit 2017-08-15 16:59:01 +08:00
ViewController.m Initial commit 2017-08-15 16:59:01 +08:00
main.m Initial commit 2017-08-15 16:59:01 +08:00