v0.8.0

GIGA/Config/ApiRequestConfig.h

@@ -28,15 +28,20 @@
 //修改密码
 #define kPAiUSerEditpwd @"user/v1/editpwd"
 //修改手机号
-#define kApiChangePhone @"user/v1/editmobil"
-//修改手机号发送验证码
-#define kApiChangeMobleCode @"msg/sms/v1/editsendcode"
-//发送验证码
-#define kApiSendPhoneCode @"msg/sms/v1/sendcode";
+#define kApiChangePhone @"user/v1/editmobile"
+//修改手机号发送旧手机验证码
+#define kApiChangeMobleOldCode @"msg/sms/v1/editsendcode"
+//修改手机号发送新手机验证码
+#define kApiChangeMobleNewCode @"msg/sms/v1/editsendcode2"
+
+
 //找回密码发送验证码
 #define kApiChangePassSendCode @"msg/sms/v1/retrievesendcode"
 //异步验证手机验证码
 #define kApiVersifyPhoneCode @"user/v1/validateSmsCode"
+//注册发送短信
+#define kApiUserRegistSendCode @"msg/sms/v1/registersendcode"
+
 
 //获取意见反馈类型 （设置意见反馈）
 #define kApiGetFeedList @"sys/sysdict/v1/maskproposaltype"
@@ -57,6 +62,14 @@
 #define kApiEndMaskTime @"activity/maskuselog/v1/end"
 //每日分享
 #define kApiShareAction @"activity/maskuselog/v1/sharedata"
+//微信登陆
+#define kApiWeiChatLogin @"sys/v1/wechatlogin"
+
+//版本说明
+//测试
+//#define kIMPRITNT @"http://yts.s1.natapp.cc/mask/imprint.html"
+//正式
+#define kIMPRITNT @"http://app.mianmoshijian.com/imprint.html?device=ios"
 
 
 #endif /* ApiRequestConfig_h */

GIGA/Config/GIGA.h

@@ -101,7 +101,7 @@ alpha:((float)(rgbValue & 0xFF))/255.0]
 // 状态栏高度 所有机型
 #define Phone_STATUBAR_H   [[UIApplication sharedApplication] statusBarFrame].size.height
 //状态栏—➕导航栏
-#define SAFE_NAV_HEIGHT ([[UIApplication sharedApplication] statusBarFrame].size.height +  self.navigationController.navigationBar.frame.size.height)
+#define SAFE_NAV_HEIGHT ([[UIApplication sharedApplication] statusBarFrame].size.height == 44.0 ? 88.0 : 64.0)
 
 
 #define GIGA_FONTNAME @"PingFangSC-Medium"

GIGA/Config/GiGaServerConfig.h

@@ -12,5 +12,6 @@
 
 + (void)setServerType:(NSInteger) type;
 + (NSString *)getMainUrl;
++(NSString*)getsocketUrl;
 
 @end

GIGA/Config/GiGaServerConfig.m

@@ -18,12 +18,19 @@
     switch (type) {
         case 0://测试环境
         {
-            [[NSUserDefaults standardUserDefaults] setValue:@"http://apiyts.s1.natapp.cc/v1/" forKey:@"MainUrl"];
+        [[NSUserDefaults standardUserDefaults] setValue:@"http://apiyts.s1.natapp.cc/v1/" forKey:@"MainUrl"];
+        [[NSUserDefaults standardUserDefaults] setValue:@"http://wsyts.s1.natapp.cc" forKey:@"gigasocketUrl"];
+//            [[NSUserDefaults standardUserDefaults] setValue:@"https://api.mianmoshijian.com/v1/" forKey:@"MainUrl"];
+//            [[NSUserDefaults standardUserDefaults] setValue:@"https://ws.mianmoshijian.com" forKey:@"gigasocketUrl"];
+            
         }
             break;
         case 1: //生产环境
         {
-            [[NSUserDefaults standardUserDefaults] setValue:@"https://" forKey:@"MainUrl"];
+            //https://api.mianmoshijian.com/v1/
+            [[NSUserDefaults standardUserDefaults] setValue:@"https://api.mianmoshijian.com/v1/" forKey:@"MainUrl"];
+            [[NSUserDefaults standardUserDefaults] setValue:@"https://ws.mianmoshijian.com" forKey:@"gigasocketUrl"];
+            
         }
             break;
             
@@ -37,4 +44,8 @@
     return [[NSUserDefaults standardUserDefaults] objectForKey:@"MainUrl"];
 }
 
++(NSString*)getsocketUrl{
+    return [[NSUserDefaults standardUserDefaults] objectForKey:@"gigasocketUrl"];
+}
+
 @end