From 112c00ecb85e2f1ae16841d01949f009a709fd5e Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 09 十二月 2016 10:38:37 +0800
Subject: [PATCH] merge my fix
---
ProxyServer/main.c | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ProxyServer/main.c b/ProxyServer/main.c
index ae8b6ca..3a15018 100644
--- a/ProxyServer/main.c
+++ b/ProxyServer/main.c
@@ -19,12 +19,34 @@
char* user="supervisor";
char* pass="supervisor";
int Channel=0;
- int s_year=2016,s_month=12,s_day=6,s_hour=17,s_min=27,s_sec=41;
- int e_year=2016,e_month=12,e_day=7,e_hour=19,e_min=27,e_sec=41;
+ int s_year=2016,s_month=12,s_day=8,s_hour=10,s_min=27,s_sec=41;
+ int e_year=2016,e_month=12,e_day=8,e_hour=14,e_min=27,e_sec=41;
printf("========================start============\n");
result=GetPHPSearchMetaInfo(AnaylserIP,user,pass,Channel,s_year,s_month,s_day,s_hour,s_min,s_sec,e_year,e_month,e_day,e_hour,e_min,e_sec); //potection function
//result=GetDeviceInfo(AnaylserIP);
printf("serchresult=%s\n",result);
+ //Channel=1;
+ //s_day=7;
+ //printf("========================start============\n");
+ //result=GetPHPSearchMetaInfo(AnaylserIP,user,pass,Channel,s_year,s_month,s_day,s_hour,s_min,s_sec,e_year,e_month,e_day,e_hour,e_min,e_sec); //potection function
+ ////result=GetDeviceInfo(AnaylserIP);
+ //printf("serchresult=%s\n",result);
+ //
+ //Channel=0;
+ //s_day=8;
+ //printf("========================start============\n");
+ //result=GetPHPSearchMetaInfo(AnaylserIP,user,pass,Channel,s_year,s_month,s_day,s_hour,s_min,s_sec,e_year,e_month,e_day,e_hour,e_min,e_sec); //potection function
+ ////result=GetDeviceInfo(AnaylserIP);
+ //printf("serchresult=%s\n",result);
+ //
+ //
+ //Channel=1;
+ //s_day=7;
+ //printf("========================start============\n");
+ //result=GetPHPSearchMetaInfo(AnaylserIP,user,pass,Channel,s_year,s_month,s_day,s_hour,s_min,s_sec,e_year,e_month,e_day,e_hour,e_min,e_sec); //potection function
+ ////result=GetDeviceInfo(AnaylserIP);
+ //printf("serchresult=%s\n",result);
+
return 1;
}
--
Gitblit v1.8.0