From 1b6dfd02b81c38108eacfa56aa2d21184cec01e7 Mon Sep 17 00:00:00 2001
From: houxiao <houxiao@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 05 四月 2017 10:37:50 +0800
Subject: [PATCH] add config.mediaalarm14.json

---
 ProxyConsole/config.mediaalarm14.json |  631 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ProxyConsole/auto-net-ip.sh           |    4 
 2 files changed, 633 insertions(+), 2 deletions(-)

diff --git a/ProxyConsole/auto-net-ip.sh b/ProxyConsole/auto-net-ip.sh
index c9c3719..0593ffe 100644
--- a/ProxyConsole/auto-net-ip.sh
+++ b/ProxyConsole/auto-net-ip.sh
@@ -3,10 +3,10 @@
 #crontab:
 #*/2 * * * * /bin/sh /opt/auto-net-ip.sh > /dev/null 2>&1
 
-HAS_NET=`ifconfig | grep enp1s0 | grep 172.16`
+HAS_NET=`ifconfig | grep enp1s0 | grep 172.24`
 
 if [ -z "$HAS_NET" ]; then
 	echo "set ip address"
-	ifconfig enp1s0 172.16.23.10/16
+	ifconfig enp1s0 172.16.24.10/16
 	ifconfig enp2s0 192.168.1.100/24
 fi
diff --git a/ProxyConsole/config.mediaalarm14.json b/ProxyConsole/config.mediaalarm14.json
new file mode 100644
index 0000000..7ec4ea2
--- /dev/null
+++ b/ProxyConsole/config.mediaalarm14.json
@@ -0,0 +1,631 @@
+{
+	"hcsdk" : {
+		"serverIP" : "172.16.15.99",
+		"serverport" : 8000,
+		"username" : "admin",
+		"passwd" : "a1234567"
+	},
+
+	"equipments" : [
+		{
+			"id" : 1,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.150",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 2,
+				"lAlarmOutPort" : 0
+			}
+		},
+		{
+			"id" : 2,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.150",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 1,
+				"lAlarmOutPort" : 0
+			}
+		},
+		{
+			"id" : 3,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.151",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 3,
+				"lAlarmOutPort" : 0
+			}
+		},
+		
+		{
+			"id" : 4,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.151",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 4,
+				"lAlarmOutPort" : 0
+			}
+		},
+		{
+			"id" : 5,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.152",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 5,
+				"lAlarmOutPort" : 0
+			}
+		},
+		
+		{
+			"id" : 6,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.152",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 6,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 7,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.153",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 7,
+				"lAlarmOutPort" : 0
+			}
+		},
+		
+		{
+			"id" : 8,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.153",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 8,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 9,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.154",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 9,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 10,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.154",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 10,
+				"lAlarmOutPort" : 0
+			}
+		},
+
+		{
+			"id" : 11,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.155",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 11,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 12,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.155",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 12,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 13,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.156",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 13,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 14,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.156",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 14,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 15,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.157",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 15,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 16,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.157",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 16,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 17,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.158",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 17,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 18,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.158",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 18,
+				"lAlarmOutPort" : 0
+			}
+		},
+
+		{
+			"id" : 19,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.159",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 19,
+				"lAlarmOutPort" : 0
+			}
+		},
+		{
+			"id" : 20,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.159",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 20,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+		{
+			"id" : 21,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.160",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 21,
+				"lAlarmOutPort" : 0
+			}
+		},
+		{
+			"id" : 22,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.160",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 22,
+				"lAlarmOutPort" : 0
+			}
+		},
+	
+	
+		{
+			"id" : 23,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.161",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 0,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 23,
+				"lAlarmOutPort" : 0
+			}
+		},
+		{
+			"id" : 24,
+			"type" : 6,
+			"type_str" : "ET_HCNET_DECODER_LOGO_ALARMOUT",
+			"ip" : "172.16.15.161",
+			"port" : "80",
+			"user" : "supervisor",
+			"pass" : "supervisor",
+			
+			"serverIP" : "172.16.15.99",
+			"serverport" : "8000",
+			"reboot" : 0,
+			
+			"user_config" : {
+				"ip" : "127.0.0.1",
+				"port" : 8000,
+				"username" : "admin",
+				"passwd" : "admin12345",
+				"channel" : 1,
+				"byWallNo" : 1,
+				"dwSubWinNo" : 1,
+				"dwWinNo" : 24,
+				"lAlarmOutPort" : 0
+			}
+		}
+		
+	
+	]
+}
\ No newline at end of file

--
Gitblit v1.8.0