Commit Graph

32 Commits

Author SHA1 Message Date
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
jiangxuefei718 a4ce800e3e fixed:1.首页tabbar 白条占位问题
2.我的设备页面修改
2019-03-19 14:21:34 +08:00
一只会编程的狮子 5f488b14b8 fixed:设备连接页面适配 2019-03-15 21:01:42 +08:00
jiangxuefei718 6f23d287c0 fixed: 1.我的金币页面导航显示修复
2.金币详情页兑换按钮不显示
	  3.实时动态页面调整
	  4.金币兑换页面调整
2019-03-15 10:33:08 +08:00
jiangxuefei718 eb8a41ace9 fixed:首页&消息页面&看看页面&服务等页面的适配 2019-03-14 14:34:24 +08:00
jiangxuefei718 310a8f0230 fixed:爱鱼看看页面适配 2019-03-14 12:08:30 +08:00
jiangxuefei718 91aee9dac1 fixed: 1.适配小屏幕机型
feature: 1.忘记密码新增语音和短信验证码切换功能
2019-03-14 08:41:00 +08:00
roy 5d32616d4d 新加3 2019-03-12 09:30:38 +08:00
roy c08d198e11 新版本 2019-03-12 09:26:46 +08:00
roy cbbfcb098a Merge remote-tracking branch 'origin/master' 2018-09-22 21:41:24 +08:00
roy 8a43861303 新配置界面 2018-09-22 21:40:37 +08:00
xuemh e3c7e47779 build 511 2018-09-08 11:28:18 +08:00
xuemh 3b633f7355 build 510 2018-09-07 23:59:13 +08:00
xuemh ee03c2b4c8 temp 2018-08-27 21:34:34 +08:00
xuemh d0e290bea6 优化连接过程 2018-08-26 23:39:52 +08:00
xuemh d59ca3bb80 优化设置连接和重置设备过程 2018-08-26 17:19:07 +08:00
xuemh 9b0019c72d 获取到设备mac地址后,等待网络连接变化时再发送设备绑定请求 2018-08-23 21:30:38 +08:00
xuemh 9a0048ab45 重置设备后删除设备 2018-08-09 21:14:15 +08:00
xuemh f8009af9c0 移除重启设备功能 2018-08-08 20:20:35 +08:00
xuemh 4a4194a6f4 提示和跳转; 2018-08-07 21:39:14 +08:00
xuemh 37b3ce32d5 细节微调; 2018-08-07 21:08:59 +08:00
xuemh d15e9301a4 添加设备绑定过程; 2018-08-06 23:40:49 +08:00
xuemh 1028ffa9ac 添加重启、恢复出厂的udp指令实现 2018-08-06 22:35:06 +08:00
xuemh 4546e0b981 完善连接热点udp指令 2018-08-06 21:37:34 +08:00
xuemh 65446cebfc 替换图片资源 2018-08-06 16:37:41 +08:00
xuemh e1fef71a9a build to 486 2018-07-24 22:47:33 +08:00
xuemh 7c02da06fe 修复崩溃问题 2018-05-02 11:57:38 +08:00
xuemh c9935f3186 修改返回按钮 2018-04-03 00:32:12 +08:00
xuemh cc9eedd198 iOS 11首页适配 2018-03-30 22:06:17 +08:00
xuemh bdd19906dd 【iPhoneX适配】‘爱鱼看看’分页标题栏 2018-03-16 09:27:26 +08:00
xuemh 46bf2c8cc1 【iPhoneX适配】底部工具栏 2018-03-15 22:33:32 +08:00
ifish bdc83e07ef Initial commit 2017-08-15 16:59:01 +08:00