Merge pull request #4 from TiJOSteam/develop

update to TiJOS Framework 3.0
TiJOSteam · May 28, 2018 · 9abb7f5 · 9abb7f5
2 parents 43ec1d2 + 201f303
commit 9abb7f5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/src/MQTT/MQTTClientSample/src/MqttClientDemo.java b/src/MQTT/MQTTClientSample/src/MqttClientDemo.java
@@ -1,6 +1,7 @@
 
-import tijos.framework.networkcenter.TiDNS;
-import tijos.framework.networkcenter.TiWLAN;
+import tijos.framework.networkcenter.dns.TiDNS;
+import tijos.framework.platform.wlan.TiWiFi;
+
 import tijos.framework.networkcenter.mqtt.MqttClientListener;
 
 import java.io.IOException;
@@ -83,7 +84,7 @@ public static void main(String args[]) {
 
 		// 启动WLAN及DNS
 		try {
-			TiWLAN.getInstance().startup(10);
+			TiWiFi.getInstance().startup(10);
 			TiDNS.getInstance().startup();
 		} catch (IOException ie) {
 			ie.printStackTrace();

diff --git a/src/network/NTP/NTPClientSample/src/NtpClient.java b/src/network/NTP/NTPClientSample/src/NtpClient.java
@@ -5,7 +5,9 @@
 
 import tijos.framework.networkcenter.ntp.NTPUDPClient;
 import tijos.framework.networkcenter.ntp.TimeInfo;
-import tijos.framework.networkcenter.*;
+
+import tijos.framework.networkcenter.dns.TiDNS;
+import tijos.framework.platform.wlan.TiWiFi;
 
 /**
  * Network Time Protocol Client 例程
@@ -20,7 +22,7 @@ public static void main(String[] args) {
 
 		try {
 			//启动WLAN及DNS
-			TiWLAN.getInstance().startup(10);
+			TiWiFi.getInstance().startup(10);
 			TiDNS.getInstance().startup();
 
 			NTPUDPClient ntpcli = new NTPUDPClient();

diff --git a/src/network/dns/DNSSample/src/DnsDemo.java b/src/network/dns/DNSSample/src/DnsDemo.java
@@ -3,8 +3,8 @@
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import tijos.framework.networkcenter.TiDNS;
-import tijos.framework.networkcenter.TiWLAN;
+import tijos.framework.networkcenter.dns.TiDNS;
+import tijos.framework.platform.wlan.TiWiFi;
 
 /**
  * 
@@ -19,7 +19,7 @@ public static void main(String[] args) {
 
 		try {
 			//启动WLAN及DNS
-			TiWLAN.getInstance().startup(10);
+			TiWiFi.getInstance().startup(10);
 			TiDNS.getInstance().startup();
 
 			//System properties

diff --git a/src/network/tcp_client/TCPClientSample/src/TcpClient.java b/src/network/tcp_client/TCPClientSample/src/TcpClient.java
@@ -5,8 +5,8 @@
 
 import java.net.Socket;
 
-import tijos.framework.networkcenter.TiDNS;
-import tijos.framework.networkcenter.TiWLAN;
+import tijos.framework.networkcenter.dns.TiDNS;
+import tijos.framework.platform.wlan.TiWiFi;
 
 /**
  * TCP client 例程， 在运行时请设置正确的TCP Server IP地址
@@ -25,7 +25,7 @@ public static void main(String[] args) {
 		try 
 		{
 			//启动WLAN及DNS
-			TiWLAN.getInstance().startup(10);
+			TiWiFi.getInstance().startup(10);
 			TiDNS.getInstance().startup();
 
 			//Connect to the server with TCP 

diff --git a/src/network/tcp_server/TCPServerSample/src/TcpServer.java b/src/network/tcp_server/TCPServerSample/src/TcpServer.java
@@ -6,9 +6,9 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import tijos.framework.networkcenter.TiDNS;
-import tijos.framework.networkcenter.TiWLAN;
- 
+import tijos.framework.networkcenter.dns.TiDNS;
+import tijos.framework.platform.wlan.TiWiFi;
+
 /**
  * TCP Server 例程
  * @author TiJOS
@@ -24,7 +24,7 @@ public static void main(String[] args)
 		Socket socket = null;
 		try {
 			//启动WLAN及DNS
-			TiWLAN.getInstance().startup(10);
+			TiWiFi.getInstance().startup(10);
 			TiDNS.getInstance().startup();
 
 			System.out.println("local ip = " + InetAddress.getByName("localhost"));

diff --git a/src/network/udp/UDPSample/src/UdpDemo.java b/src/network/udp/UDPSample/src/UdpDemo.java
@@ -3,8 +3,8 @@
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 
-import tijos.framework.networkcenter.TiDNS;
-import tijos.framework.networkcenter.TiWLAN;
+import tijos.framework.networkcenter.dns.TiDNS;
+import tijos.framework.platform.wlan.TiWiFi;
 
 
 /**
@@ -26,7 +26,7 @@ public static void main(String[] args)
     	try
     	{
     		//启动WLAN及DNS
-    		TiWLAN.getInstance().startup(10);
+    		TiWiFi.getInstance().startup(10);
     		TiDNS.getInstance().startup();