switch receive message

@@ -36,6 +36,6 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     compile 'com.android.support:appcompat-v7:25.2.0'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.4'
+    compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
     testCompile 'junit:junit:4.12'
 }

@@ -9,7 +9,7 @@ import android.util.Log;
 public class GlobalVar {
     public static final String CHARSET_UTF8 = "utf-8";
     public static final byte MAX_BYTE = (byte) 0xFF;
-    static GlobalVar globalVar;
+    static GlobalVar globalVar = new GlobalVar();
 
 
     public static GlobalVar getLogUtils() {

@@ -4,22 +4,24 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.support.v4.content.LocalBroadcastManager;
-
+import android.text.TextUtils;
+import android.util.Log;
 import com.adroplat.fist_switch.SwitchApplication;
 import com.adroplat.fist_switch.config.GlobalVar;
 import com.adroplat.fist_switch.utils.ToastUtils;
 import com.adroplat.fist_switch.utils.WifiUtils;
 import com.adroplat.fist_switch.utils.protocol.one.FistProtocol;
 import com.google.gson.Gson;
+import io.realm.Realm;
 
 import java.util.ArrayList;
 
-import io.realm.Realm;
-
 /**
  * Created by WLJ on 2016/1/14.
  */
 public class FistJni {
+    private static final String TAG = FistJni.class.getSimpleName();
+
     static {
         System.loadLibrary("fist_ndk");
     }
@@ -119,16 +121,21 @@ public class FistJni {
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
     }
 
+    static String deviceJsonAA;
+
     public static void fistListener(String jsonDevice) {
         if (null == jsonDevice || jsonDevice.isEmpty()) return;
-        GlobalVar.getLogUtils().i("fistListener jsonDevice =" + jsonDevice);
+//        GlobalVar.getLogUtils().i("fistListener jsonDevice =" + jsonDevice);
+        Log.d(TAG, jsonDevice);
         Gson gson = getGson();
         Device device = gson.fromJson(jsonDevice, Device.class);
         char cmdTpye = (char) device.getCmdType();
-
+        if (TextUtils.isEmpty(deviceJsonAA)) {
+            deviceJsonAA = jsonDevice;
+        }
         if (FistProtocol.CommondType.CMD_TYPE_SEARCH_RESPONSE == cmdTpye) {//查询响应
             removeId(device);
-            online(device, jsonDevice);
+//            online(device, jsonDevice);
             sendJsonDevice(SEARCH_RESPONSE, device);
 
         } else if (FistProtocol.CommondType.CMD_TYPE_CONFIG_DONE == cmdTpye) {//配置完成处理
@@ -143,7 +150,7 @@ public class FistJni {
             sendJsonDevice(ADD_DONE, device);
             ArrayList<SubDevice> subDevices = device.getSubDevices();
             if (!subDevices.isEmpty()) {//查询结果不为空
-                Realm realm = Realm.getDefaultInstance();
+//                Realm realm = Realm.getDefaultInstance();
 //                long hostNum = device.getLongDeviceNum();
 //                RealmResults<Hub> hubs = realm.where(Hub.class)
 //                        .equalTo(Hub.Companion.getDEVICE_NUM(), hostNum)
@@ -175,7 +182,7 @@ public class FistJni {
 //                    }
 //                }
 
-                realm.close();
+//                realm.close();
             }
 //            sendJsonDevice(LightingGroupAdapter.REFRESH, device);
 
@@ -254,6 +261,7 @@ public class FistJni {
             @Override
             protected Void doInBackground(Void... params) {
                 start();
+                Log.d(TAG, "start sdk");
                 return null;
             }
         }.execute();
@@ -298,6 +306,19 @@ public class FistJni {
         }.execute();
     }
 
+    public void query( ) {
+//        if (!HeService.isConn()) {
+//            return;
+//        }
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                querySubDevice(deviceJsonAA);
+                return null;
+            }
+        }.execute();
+    }
+
     /**
      * 开始添加子设备
      */
@@ -470,6 +491,7 @@ public class FistJni {
             @Override
             protected Void doInBackground(Void... params) {
                 searchDevice();
+                Log.d(TAG, "search local device");
                 return null;
             }
         }.execute();

 package com.qnbar.switchcontrol;
 
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.View;
-
 import com.adroplat.fist_switch.jni.FistJni;
 
 public class MainActivity extends AppCompatActivity {
@@ -16,29 +12,30 @@ public class MainActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        Handler handler = new Handler() {
-            @Override
-            public void dispatchMessage(Message msg) {
-                super.dispatchMessage(msg);
-                switch (msg.what) {
-                    case UdpPostSender.MSG_What:
-                        Log.d("lovely_switch", "msg what:" + msg.toString());
-                        break;
-                    default:
-                        Log.d("lovely_switch", msg.toString());
-                }
-            }
-        };
+//        Handler handler = new Handler() {
+//            @Override
+//            public void dispatchMessage(Message msg) {
+//                super.dispatchMessage(msg);
+//                switch (msg.what) {
+//                    case UdpPostSender.MSG_What:
+//                        Log.d("lovely_switch", "msg what:" + msg.toString());
+//                        break;
+//                    default:
+//                        Log.d("lovely_switch", msg.toString());
+//                }
+//            }
+//        };
 //        new UdpPostSender("", 9000, 9000, handler).start();
-        new Thread(){
-            @Override
-            public void run() {
-                super.run();
-                new UdpHelper().StartListen();
-            }
-        }.start();
+//        new Thread(){
+//            @Override
+//            public void run() {
+//                super.run();
+//                new UdpHelper().StartListen();
+//            }
+//        }.start();
 //        new UdpHelper().run();
 //        new UdpHelper().run();
+
     }
 
     public void startSdk(View view) {
@@ -50,4 +47,10 @@ public class MainActivity extends AppCompatActivity {
         FistJni fistJni = FistJni.getInstance();
         fistJni.searchLocalDevice();
     }
+
+    public void startFist(View view) {
+
+        FistJni fistJni = FistJni.getInstance();
+        fistJni.query();
+    }
 }

@@ -33,8 +33,7 @@ public class UdpHelper{
                             message.length);
                     datagramSocket.receive(datagramPacket);
                     String strMsg=new String(datagramPacket.getData()).trim();
-                    Log.d("UDP_Demo", datagramPacket.getAddress()
-                            .getHostAddress().toString()
+                    Log.d("UDP_Demo", datagramPacket.getAddress().getHostAddress()
                             + ":" +strMsg );
                 }
             } catch (IOException e) {//IOException

@@ -22,6 +22,12 @@
     <Button
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:onClick="startFist"
+        android:text="FindSubDevice"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:onClick="searchLocalDevice"
         android:text="searchLocalDevice"/>