Merge branch 'develop' of http://139.196.24.156/ifish/ifish into develop

# Conflicts: # .DS_Store # Ifish/Info.plist
2019-05-27 16:43:44 +08:00
parent 8e027e82c9 a3adda793e
commit 40815eb7d5
2 changed files with 2 additions and 0 deletions
@@ -374,6 +374,7 @@
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>使用相机</string>
+	<string>爱鱼奇需要您的同意,才能使用相机</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>为获取爱鱼奇智能硬件产品及用户的地址区域分布，以提供更好的特色服务，爱鱼奇将获取您的地址</string>
 	<key>NSLocationWhenInUseUsageDescription</key>