swithc basic show change,basic opration promote

@@ -91,15 +91,17 @@ public class FistJni {
     }
     }
 
 
     private static void online(Device device, String jsonDevice) {
     private static void online(Device device, String jsonDevice) {
-        boolean hasAdded = false;
+//        boolean hasAdded = false;
         for (Device device1 : getHubs()) {
         for (Device device1 : getHubs()) {
             if (Arrays.equals(device1.getDeviceIp(), device.getDeviceIp())) {
             if (Arrays.equals(device1.getDeviceIp(), device.getDeviceIp())) {
-                hasAdded = true;
+//                hasAdded = true;
+                getHubs().remove(device1);
+                break;
             }
             }
         }
         }
-        if (!hasAdded) {
-            getHubs().add(device);
-        }
+//        if (!hasAdded) {
+        getHubs().add(device);
+//        }
         sendMessage(DEVICE_HUBS_ONLINE_NOTIFY, DEVICE_HUBS_ONLINE_NOTIFY_STR);
         sendMessage(DEVICE_HUBS_ONLINE_NOTIFY, DEVICE_HUBS_ONLINE_NOTIFY_STR);
     }
     }
 
 
@@ -182,8 +184,9 @@ public class FistJni {
             sendJsonDevice(ADD_DONE, device);
             sendJsonDevice(ADD_DONE, device);
             ArrayList<SubDevice> subDevices = device.getSubDevices();
             ArrayList<SubDevice> subDevices = device.getSubDevices();
             if (!subDevices.isEmpty()) {//查询结果不为空
             if (!subDevices.isEmpty()) {//查询结果不为空
-                getSubDevices().addAll(subDevices);
-                sendMessage(DEVICE_SWITCH_ONLINE_NOTIFY, DEVICE_SWITCH_ONLINE_NOTIFY_STR);
+                subDeviceOnline(subDevices);
+//                getSubDevices().addAll(subDevices);
+//                sendMessage(DEVICE_SWITCH_ONLINE_NOTIFY, DEVICE_SWITCH_ONLINE_NOTIFY_STR);
             }
             }
 //            sendJsonDevice(LightingGroupAdapter.REFRESH, device);
 //            sendJsonDevice(LightingGroupAdapter.REFRESH, device);
 
 
@@ -202,7 +205,13 @@ public class FistJni {
 
 
         } else if (FistProtocol.CommondType.CMD_TYPE_CONTROL_DONE_RESPONSE == cmdTpye) {//单个控制结果
         } else if (FistProtocol.CommondType.CMD_TYPE_CONTROL_DONE_RESPONSE == cmdTpye) {//单个控制结果
             sendJsonDevice(CONTROL_DONE, device);
             sendJsonDevice(CONTROL_DONE, device);
-
+            getInstance().query(getGson().toJson(getHubs().get(0)));
+//            ArrayList<SubDevice> subDevices = device.getSubDevices();
+//            if (!subDevices.isEmpty()) {//查询结果不为空
+//                subDeviceOnline(subDevices);
+////                getSubDevices().addAll(subDevices);
+////                sendMessage(DEVICE_SWITCH_ONLINE_NOTIFY, DEVICE_SWITCH_ONLINE_NOTIFY_STR);
+//            }
         } else if (FistProtocol.CommondType.CMD_TYPE_CONTROL_OVER == cmdTpye) {
         } else if (FistProtocol.CommondType.CMD_TYPE_CONTROL_OVER == cmdTpye) {
             sendJsonDevice(CONTROL_OVER, device);
             sendJsonDevice(CONTROL_OVER, device);
             GlobalVar.getLogUtils().i("CONTROL_OVER");
             GlobalVar.getLogUtils().i("CONTROL_OVER");
@@ -249,6 +258,23 @@ public class FistJni {
         }*/
         }*/
     }
     }
 
 
+    private static void subDeviceOnline(ArrayList<SubDevice> subDevices) {
+        for (SubDevice subDevice : subDevices) {
+//            boolean hasAdd = false;
+            for (SubDevice subDevice1 : getSubDevices()) {
+                if (subDevice.getSubDeviceNum() == subDevice1.getSubDeviceNum()) {
+//                    hasAdd = true;
+                    getSubDevices().remove(subDevice1);
+                    break;
+                }
+            }
+//            if (!hasAdd) {
+            getSubDevices().add(subDevice);
+            sendMessage(DEVICE_SWITCH_ONLINE_NOTIFY, DEVICE_SWITCH_ONLINE_NOTIFY_STR);
+//            }
+        }
+    }
+
     /**
     /**
      * 开始
      * 开始
      */
      */

@@ -7,6 +7,7 @@ import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.util.Log;
 import android.view.View;
 import android.view.View;
+import android.widget.Toast;
 import com.adroplat.fist_switch.jni.Device;
 import com.adroplat.fist_switch.jni.Device;
 import com.adroplat.fist_switch.jni.FistJni;
 import com.adroplat.fist_switch.jni.FistJni;
 import com.adroplat.fist_switch.jni.SubDevice;
 import com.adroplat.fist_switch.jni.SubDevice;
@@ -18,17 +19,17 @@ import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.greenrobot.eventbus.ThreadMode;
 
 
+import java.util.ArrayList;
+
 public class SwitchControlActivity extends AppCompatActivity {
 public class SwitchControlActivity extends AppCompatActivity {
+    private String deviceStrKey = "x85bau";
 
 
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_switch_control);
         setContentView(R.layout.activity_switch_control);
         EventBus.getDefault().register(this);
         EventBus.getDefault().register(this);
-
         //TODO EventBus,List of Hub,List of Lights
         //TODO EventBus,List of Hub,List of Lights
-//        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-//        setSupportActionBar(toolbar);
         initList();
         initList();
         FistJni fistJni = FistJni.getInstance();
         FistJni fistJni = FistJni.getInstance();
         fistJni.startSdk();
         fistJni.startSdk();
@@ -36,15 +37,6 @@ public class SwitchControlActivity extends AppCompatActivity {
         if (getSupportActionBar() != null) {
         if (getSupportActionBar() != null) {
             getSupportActionBar().setTitle("智能开关控制");
             getSupportActionBar().setTitle("智能开关控制");
         }
         }
-
-//        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
-//        fab.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-//                        .setAction("Action", null).show();
-//            }
-//        });
     }
     }
 
 
     public void searchLocalDevice() {
     public void searchLocalDevice() {
@@ -94,7 +86,9 @@ public class SwitchControlActivity extends AppCompatActivity {
 
 
             @Override
             @Override
             public void onMenuClick(View v, int position) {
             public void onMenuClick(View v, int position) {
-
+                deviceStrKey = FistJni.getHubs().get(position).getDeviceStrKey();
+                Toast.makeText(SwitchControlActivity.this, "重设控制口令", Toast.LENGTH_SHORT).show();
+                Log.d("menu", "reset control hub:" + deviceStrKey);
             }
             }
         });
         });
         hubRv.setAdapter(hubAdapter);
         hubRv.setAdapter(hubAdapter);
@@ -109,9 +103,28 @@ public class SwitchControlActivity extends AppCompatActivity {
         switchAdapter.setListener(new SwitchListAdapter.OnRecyclerViewItemClickListener() {
         switchAdapter.setListener(new SwitchListAdapter.OnRecyclerViewItemClickListener() {
             @Override
             @Override
             public void onItemClick(SubDevice light, int position) {
             public void onItemClick(SubDevice light, 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;
+                }
+                if (light.getSubDeviceStatus() == 0) {
+                    light.setSubDeviceStatus(1);
+                } else {
+                    light.setSubDeviceStatus(0);
+                }
+                final ArrayList<SubDevice> subDevices = new ArrayList<>();
+                subDevices.add(light);
+                device.setSubDevices(subDevices);
+                FistJni.getInstance().normalC(new Gson().toJson(device));
             }
             }
 
 
+
             @Override
             @Override
             public void onLongClick(SubDevice light, int position) {
             public void onLongClick(SubDevice light, int position) {
 
 

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

@@ -129,8 +129,9 @@ public class SwitchListAdapter extends RecyclerView.Adapter<SwitchListAdapter.De
         }
         }
 
 
         void render(SubDevice light) {
         void render(SubDevice light) {
-            subDeviceNum.setText(light.getSubDeviceNum() + "");
-            subDeviceStatus.setText(light.getSubDeviceOnlineStatus() + "");
+            subDeviceNum.setText("设备号：" + light.getSubDeviceNum() + "");
+            String statusStr = light.getSubDeviceStatus() == 1 ? "状态：开" : "状态：关";
+            this.subDeviceStatus.setText(statusStr);
         }
         }
     }
     }
 
 

@@ -3,6 +3,7 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:background="#ac0097ca"
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_height="match_parent"
         android:padding="16dp"
         android:padding="16dp"
@@ -11,8 +12,10 @@
         tools:showIn="@layout/activity_switch_control"
         tools:showIn="@layout/activity_switch_control"
         tools:context="com.qnbar.switchcontrol.SwitchControlActivity">
         tools:context="com.qnbar.switchcontrol.SwitchControlActivity">
 
 
-    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
-              android:text="主机" android:textSize="20sp"/>
+    <TextView android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="控制主机"
+              android:textSize="20sp"/>
 
 
     <android.support.v7.widget.RecyclerView
     <android.support.v7.widget.RecyclerView
             android:id="@+id/hubsRv"
             android:id="@+id/hubsRv"

@@ -2,12 +2,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_width="match_parent"
               android:padding="5dp"
               android:padding="5dp"
-              android:layout_height="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center"
               android:orientation="vertical"
               android:orientation="vertical"
 >
 >
+    <ImageView android:layout_width="80dp" android:layout_height="80dp"
+    android:background="@mipmap/host"/>
     <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:textColor="@android:color/black"
               android:textColor="@android:color/black"
               android:text="device num"
               android:text="device num"
     />
     />

@@ -2,9 +2,13 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_width="match_parent"
               android:padding="5dp"
               android:padding="5dp"
-              android:layout_height="match_parent"
+              android:gravity="center"
+              android:layout_height="wrap_content"
               android:orientation="vertical"
               android:orientation="vertical"
 >
 >
+    <ImageView android:layout_width="80dp" android:layout_height="80dp"
+    android:background="@mipmap/equipment_switch"/>
+
     <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/subDeviceNum"
               android:id="@+id/subDeviceNum"
               android:textSize="16sp"
               android:textSize="16sp"