all function need use

@@ -111,7 +111,7 @@ public class Device implements Serializable, Cloneable {
             char point = '.';
             char point = '.';
             StringBuilder builder = new StringBuilder();
             StringBuilder builder = new StringBuilder();
             for (byte b : DeviceIp) {
             for (byte b : DeviceIp) {
-                builder.append(b & GlobalVar.MAX_BYTE).append(point);
+                builder.append((b & GlobalVar.MAX_BYTE)).append(point);
             }
             }
             builder.deleteCharAt(builder.length() - 1);
             builder.deleteCharAt(builder.length() - 1);
             strIp = builder.toString();
             strIp = builder.toString();
@@ -151,6 +151,34 @@ public class Device implements Serializable, Cloneable {
         return DeviceNum;
         return DeviceNum;
     }
     }
 
 
+    //添加 转化成16进制显示 17.03.23
+    public String getStringDeviceNum() {
+        String strIp = "null";
+        if (null != DeviceNum) {
+            char point = ':';
+            StringBuilder builder = new StringBuilder();
+            for (byte b : DeviceNum) {
+                builder.append(decimal2hex(b & GlobalVar.MAX_BYTE)).append(point);
+            }
+            builder.deleteCharAt(builder.length() - 1);
+            strIp = builder.toString();
+        }
+        return strIp;
+    }
+    // precondition:  d is a nonnegative integer
+    public static String decimal2hex(int d) {
+        String digits = "0123456789ABCDEF";
+        if (d <= 0) return "00";
+        int base = 16;   // flexible to change in any base under 16
+        String hex = "";
+        while (d > 0) {
+            int digit = d % base;              // rightmost digit
+            hex = digits.charAt(digit) + hex;  // string concatenation
+            d = d / base;
+        }
+        return hex;
+    }
+
     public void setDeviceNum(byte[] deviceNum) {
     public void setDeviceNum(byte[] deviceNum) {
         DeviceNum = deviceNum;
         DeviceNum = deviceNum;
     }
     }

@@ -192,11 +192,18 @@ public class FistJni {
 
 
         } else if (FistProtocol.CommondType.CMD_TYPE_ADD_RESPONSE == cmdTpye) {
         } else if (FistProtocol.CommondType.CMD_TYPE_ADD_RESPONSE == cmdTpye) {
             sendJsonDevice(START_ADD, device);
             sendJsonDevice(START_ADD, device);
-
-        } else if (FistProtocol.CommondType.CMD_TYPE_ADD_OVER == cmdTpye) {//子设备结束入网
-//            if (0 == device.getIntDeviceIp()) return;
 //            FistJni.stopAddSubDevice(jsonDevice);
 //            FistJni.stopAddSubDevice(jsonDevice);
-
+            device.setCmdType(49);
+            getInstance().query(gson.toJson(device));
+//            getInstance().query(gson.toJson(device));
+            FistJni.stopAddSubDevice(jsonDevice);
+        } else if (FistProtocol.CommondType.CMD_TYPE_ADD_OVER == cmdTpye) {//子设备结束入网
+            if (0 == device.getIntDeviceIp()) return;
+            device.setCmdType(49);
+//            getInstance().query(gson.toJson(device));
+            getInstance().query(gson.toJson(device));
+            FistJni.stopAddSubDevice(jsonDevice);
+//            getInstance().query(jsonDevice);
         } else if (FistProtocol.CommondType.CMD_TYPE_CONTROL == cmdTpye) {//控制超时
         } else if (FistProtocol.CommondType.CMD_TYPE_CONTROL == cmdTpye) {//控制超时
             sendJsonDevice(CONTROL_REQUEST_TIMEOUT, device);
             sendJsonDevice(CONTROL_REQUEST_TIMEOUT, device);
 
 

@@ -22,7 +22,7 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.ArrayList;
 import java.util.ArrayList;
 
 
 public class SwitchControlActivity extends AppCompatActivity {
 public class SwitchControlActivity extends AppCompatActivity {
-    private String deviceStrKey = "x85bau";
+    private String deviceStrKey = "MtfuJL";
 
 
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
@@ -132,13 +132,58 @@ public class SwitchControlActivity extends AppCompatActivity {
 
 
             @Override
             @Override
             public void onMenuClick(View v, int position) {
             public void onMenuClick(View v, int position) {
+                Device device = null;
+                for (Device deviceCur : FistJni.getHubs()) {
+                    if (deviceCur.getDeviceStrKey().equals(deviceStrKey)) {
+                        device = deviceCur;
+                    }
+                }
+                if (device == null) {
+                    Toast.makeText(SwitchControlActivity.this, "当前控制口令出错，请重新选择控制主机按menu设置", Toast.LENGTH_SHORT).show();
+                    return;
+                }
 
 
+                ArrayList<SubDevice> subDevices = new ArrayList<>();
+                subDevices.add(FistJni.getSubDevices().get(position));
+                device.setSubDevices(subDevices);
+                FistJni.getInstance().delSub(new Gson().toJson(device));
             }
             }
         });
         });
         switchRv.setAdapter(switchAdapter);
         switchRv.setAdapter(switchAdapter);
         switchRv.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
         switchRv.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_OVERLAY);
     }
     }
 
 
+    public void startAdd(View view) {
+        FistJni fistJni = FistJni.getInstance();
+        final Device device = FistJni.getHubs().get(0);
+        fistJni.startAdd(new Gson().toJson(device));
+    }
+
+    public void stopAdd(View view) {
+        FistJni fistJni = FistJni.getInstance();
+
+        final Device device = FistJni.getHubs().get(0);
+        fistJni.stopAdd(new Gson().toJson(device));
+    }
+
+    public void resetPwd(View view) {
+        FistJni fistJni = FistJni.getInstance();
+        Device device = FistJni.getHubs().get(0);
+        fistJni.modifyPwd(new Gson().toJson(device), "123456");
+    }
+
+    public void getLinkStatus(View view) {
+        FistJni fistJni = FistJni.getInstance();
+        Device device = FistJni.getHubs().get(0);
+        fistJni.getLinkStatus(new Gson().toJson(device));
+    }
+
+    public void setLinkMsg(View view) {
+        FistJni fistJni = FistJni.getInstance();
+        Device device = FistJni.getHubs().get(0);
+        fistJni.getlinkRouter(new Gson().toJson(device),"Xiaomi123","88888888");
+    }
+
     public class MovieItemDecoration extends RecyclerView.ItemDecoration {
     public class MovieItemDecoration extends RecyclerView.ItemDecoration {
         @Override
         @Override
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
         public void getItemOffsets(Rect outRect, View view, RecyclerView parent,

@@ -131,7 +131,7 @@ public class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.De
         }
         }
 
 
         void render(Device light) {
         void render(Device light) {
-            deviceNumTv.setText(light.getLongDeviceNum() + "");
+            deviceNumTv.setText("设备号:" + light.getStringDeviceNum() + "");
             deviceIp.setText("IP:" + light.getStringDeviceIp());
             deviceIp.setText("IP:" + light.getStringDeviceIp());
             deviceKey.setText("控制口令:" + light.getDeviceStrKey());
             deviceKey.setText("控制口令:" + light.getDeviceStrKey());
         }
         }

@@ -12,6 +12,26 @@
         tools:showIn="@layout/activity_switch_control"
         tools:showIn="@layout/activity_switch_control"
         tools:context="com.qnbar.switchcontrol.SwitchControlActivity">
         tools:context="com.qnbar.switchcontrol.SwitchControlActivity">
 
 
+
+    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal">
+
+        <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="开始添加"
+        android:onClick="startAdd"/>
+
+        <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="结束添加"
+        android:onClick="stopAdd"/>
+
+        <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="重设置密码"
+        android:onClick="resetPwd"/>
+
+        <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="设置路由信息"
+        android:onClick="setLinkMsg"/>
+
+        <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="获取路由信息"
+        android:onClick="getLinkStatus"/>
+
+
+    </LinearLayout>
     <TextView android:layout_width="wrap_content"
     <TextView android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_height="wrap_content"
               android:text="控制主机"
               android:text="控制主机"

@@ -11,7 +11,7 @@
     <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
     <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
               android:id="@+id/deviceNumTv"
               android:id="@+id/deviceNumTv"
               android:textSize="16sp"
               android:textSize="16sp"
-              android:visibility="gone"
+              android:visibility="visible"
               android:textColor="@android:color/black"
               android:textColor="@android:color/black"
               android:text="device num"
               android:text="device num"
     />
     />