root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
127 Commits 1 Branch 0 Tags 393 MiB
Commit Graph

127 Commits

Author SHA1 Message Date
一只会编程的狮子 f8056dbea2 Merge branch 'develop' 
# Conflicts:
#	.DS_Store
 2019-05-15 20:26:51 +08:00
一只会编程的狮子 c586949438 features:4月新绚多设备适配 & 修复一些已知bug 2019-05-15 20:24:53 +08:00
一只会编程的狮子 4b74588759 features:新绚多设备灯的控制 2019-04-25 00:35:53 +08:00
一只会编程的狮子 083bbf164a features:1.新绚多设备灯的开关控制 
2.鱼缸温度&耗电量切换
 2019-04-22 22:15:25 +08:00
一只会编程的狮子 e1103b04af features:1.新绚多设备适配 
2.修复品牌展示页&摄像头页面适配bug
 2019-04-21 22:13:06 +08:00
一只会编程的狮子 bc264e2d1f features:新绚多页面&设置页面&修改名字页面 2019-04-14 22:06:35 +08:00
jiangxuefei718 f86f21bd42 fixed:设备里 摄像头页面适配修复 2019-04-04 14:49:52 +08:00
jiangxuefei718 91ef51ff82 fixed:1.wifi频段弹框判断逻辑修改 2019-03-21 20:20:57 +08:00
jiangxuefei718 d781e7d901 Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop 
# Conflicts:
#	Ifish.xcodeproj/project.pbxproj
 2019-03-20 15:34:22 +08:00
jiangxuefei718 aff0dd6233 fixed:build号修改 2019-03-20 15:32:37 +08:00
jiangxuefei718 d27709b0cd fixed:wifi 5G弹框样式修改 2019-03-20 15:31:16 +08:00
wbzhan_macbook 3941cd475b Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop 
# Conflicts:
#	.DS_Store
#	Ifish.xcodeproj/project.pbxproj
 2019-03-20 09:35:23 +08:00
wbzhan_macbook 79db335195 no message 2019-03-20 09:31:34 +08:00
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 73b993aea9 fixed:1.wifi频段判断 
2.解决绑定设备页面 iphonex 文字遮盖问题
 2019-03-19 16:37:57 +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 aef80f5505 fixed:1,摄像头绑定页面适配 
2.wifi密码校验规则修改
 2019-03-15 18:09:13 +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 aef0570ebc fixed: 登录和注册页面适配 2019-03-14 11:15:04 +08:00
jiangxuefei718 91aee9dac1 fixed: 1.适配小屏幕机型 
feature: 1.忘记密码新增语音和短信验证码切换功能
 2019-03-14 08:41:00 +08:00
一只会编程的狮子 ff4ef1556d fixed 2019-03-13 20:26:57 +08:00
一只会编程的狮子 8b5166f789 fixed 2019-03-13 20:26:19 +08:00
roy 5746d392a3 新版4 2019-03-12 09:31:12 +08:00
roy 5d32616d4d 新加3 2019-03-12 09:30:38 +08:00
roy d826750226 新版2 2019-03-12 09:30:07 +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 ab391e1f27 build 509 2018-09-07 23:09:40 +08:00
xuemh 42f378221a build 507 2018-08-27 22:06:51 +08:00
xuemh 7943624225 这下修改好了吧 2018-08-27 22:06:29 +08:00
xuemh ee03c2b4c8 temp 2018-08-27 21:34:34 +08:00
xuemh eb993bbe01 build 506 2018-08-26 23:40:17 +08:00
xuemh d0e290bea6 优化连接过程 2018-08-26 23:39:52 +08:00
xuemh ff26073344 build 505 2018-08-26 17:19:21 +08:00
xuemh d59ca3bb80 优化设置连接和重置设备过程 2018-08-26 17:19:07 +08:00
xuemh 8c5623acdc build 504 2018-08-23 21:31:02 +08:00
xuemh 9b0019c72d 获取到设备mac地址后，等待网络连接变化时再发送设备绑定请求 2018-08-23 21:30:38 +08:00
xuemh 5f88edf8fe build 503 2018-08-17 06:59:11 +08:00
xuemh 6782887878 socket使用结束时调用close方法 2018-08-17 06:58:50 +08:00
xuemh 28be9a9ea6 build 496 2018-08-09 21:14:40 +08:00
xuemh 9a0048ab45 重置设备后删除设备 2018-08-09 21:14:15 +08:00
xuemh ec73c65b83 build 495 2018-08-08 21:35:59 +08:00
xuemh 5f7611ba91 最后的尝试 2018-08-08 21:35:36 +08:00
xuemh 0a2f673918 修改设备绑定过程 2018-08-08 21:12:29 +08:00