control switch reload

@@ -148,6 +148,12 @@
 
 
         <activity android:name=".activity.QrCodeShowActivity">
         <activity android:name=".activity.QrCodeShowActivity">
         </activity>
         </activity>
+
+        <activity
+                android:name="com.xgimi.gimicinema.activity.SwitchControlActivity"
+                android:theme="@style/AppTheme.NoActionBar">
+
+        </activity>
     </application>
     </application>
 
 
 </manifest>
 </manifest>

@@ -22,7 +22,6 @@ import android.widget.Toast;
 import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.model.SambaMsg;
 import com.gimi.common.cinema.utils.T;
 import com.gimi.common.cinema.utils.T;
 import com.gimi.common.cinema.utils.WifiApManger;
 import com.gimi.common.cinema.utils.WifiApManger;
-import com.qnbar.switchcontrol.SwitchControlActivity;
 import com.xgimi.gimicinema.BuildConfig;
 import com.xgimi.gimicinema.BuildConfig;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.mview.ISettingView;
 import com.xgimi.gimicinema.mview.ISettingView;

-package com.qnbar.switchcontrol;
+package com.xgimi.gimicinema.activity;
 
 
 import android.graphics.Rect;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Bundle;
@@ -13,9 +13,10 @@ import com.adroplat.fist_switch.jni.FistJni;
 import com.adroplat.fist_switch.jni.SubDevice;
 import com.adroplat.fist_switch.jni.SubDevice;
 import com.adroplat.fist_switch.utils.protocol.one.FistProtocol;
 import com.adroplat.fist_switch.utils.protocol.one.FistProtocol;
 import com.google.gson.Gson;
 import com.google.gson.Gson;
-import com.qnbar.switchcontrol.adapter.DeviceListAdapter;
-import com.qnbar.switchcontrol.adapter.SwitchListAdapter;
 import com.qnbar.switchcontrol.model.SwitchMessageEvent;
 import com.qnbar.switchcontrol.model.SwitchMessageEvent;
+import com.xgimi.gimicinema.R;
+import com.xgimi.gimicinema.adapter.DeviceListAdapter;
+import com.xgimi.gimicinema.adapter.SwitchListAdapter;
 import org.greenrobot.eventbus.EventBus;
 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;
@@ -28,14 +29,8 @@ public class SwitchControlActivity extends AppCompatActivity {
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.content_main);
-//        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-//        setSupportActionBar(toolbar);
-//        if (getSupportActionBar() != null) {
-//            getSupportActionBar().setTitle("智能开关设置");
-//        }
+        setContentView(R.layout.activity_switch_control);
         EventBus.getDefault().register(this);
         EventBus.getDefault().register(this);
-        //EventBus,List of Hub,List of Lights
         //TODO save DeviceNum,SubDeviceNum
         //TODO save DeviceNum,SubDeviceNum
         initList();
         initList();
         FistJni fistJni = FistJni.getInstance();
         FistJni fistJni = FistJni.getInstance();

@@ -14,7 +14,7 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package com.qnbar.switchcontrol.adapter;
+package com.xgimi.gimicinema.adapter;
 
 
 import android.graphics.Color;
 import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView;
@@ -26,7 +26,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.TextView;
 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.qnbar.switchcontrol.R;
+import com.xgimi.gimicinema.R;
 
 
 public class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.DeviceHolder>
 public class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.DeviceHolder>
         implements View.OnClickListener, View.OnLongClickListener {
         implements View.OnClickListener, View.OnLongClickListener {

@@ -14,7 +14,7 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package com.qnbar.switchcontrol.adapter;
+package com.xgimi.gimicinema.adapter;
 
 
 import android.graphics.Color;
 import android.graphics.Color;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.RecyclerView;
@@ -26,7 +26,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.TextView;
 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;
-import com.qnbar.switchcontrol.R;
+import com.xgimi.gimicinema.R;
 
 
 public class SwitchListAdapter extends RecyclerView.Adapter<SwitchListAdapter.DeviceHolder>
 public class SwitchListAdapter extends RecyclerView.Adapter<SwitchListAdapter.DeviceHolder>
         implements View.OnClickListener, View.OnLongClickListener {
         implements View.OnClickListener, View.OnLongClickListener {

@@ -45,7 +45,7 @@ public class MainActivity extends Activity {
     @Override
     @Override
     protected void onCreate(Bundle savedInstanceState) {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.content_main);
+        setContentView(R.layout.activity_switch_control);
         EventBus.getDefault().register(this);
         EventBus.getDefault().register(this);
         startService(new Intent(this, ConfigService.class));
         startService(new Intent(this, ConfigService.class));
 
 

@@ -10,7 +10,7 @@
         android:orientation="vertical"
         android:orientation="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:showIn="@layout/activity_switch_control"
         tools:showIn="@layout/activity_switch_control"
-        tools:context="com.qnbar.switchcontrol.SwitchControlActivity">
+        tools:context=".activity.SwitchControlActivity">
 
 
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal">
     <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal">
 
 

@@ -7,7 +7,7 @@
               android:orientation="vertical"
               android:orientation="vertical"
 >
 >
     <ImageView android:layout_width="80dp" android:layout_height="80dp"
     <ImageView android:layout_width="80dp" android:layout_height="80dp"
-    android:background="@mipmap/host"/>
+    android:background="@drawable/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"

@@ -20,6 +20,6 @@
 
 
     </android.support.design.widget.AppBarLayout>
     </android.support.design.widget.AppBarLayout>
 
 
-    <include layout="@layout/content_main" />
+    <include layout="@layout/activity_switch_control" />
 
 
 </android.support.design.widget.CoordinatorLayout>
 </android.support.design.widget.CoordinatorLayout>

@@ -7,7 +7,7 @@
               android:orientation="vertical"
               android:orientation="vertical"
 >
 >
     <ImageView android:layout_width="80dp" android:layout_height="80dp"
     <ImageView android:layout_width="80dp" android:layout_height="80dp"
-    android:background="@mipmap/equipment_switch"/>
+    android:background="@drawable/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"

@@ -8,11 +8,7 @@
             android:allowBackup="true"
             android:allowBackup="true"
             android:label="@string/app_name"
             android:label="@string/app_name"
             android:supportsRtl="true">
             android:supportsRtl="true">
-        <activity
-                android:name=".SwitchControlActivity"
-                android:theme="@style/AppTheme.NoActionBar">
 
 
-        </activity>
     </application>
     </application>
 
 
 </manifest>
 </manifest>

-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <android.support.design.widget.AppBarLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"
-                app:popupTheme="@style/AppTheme.PopupOverlay"/>
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_main"/>
-
-    <android.support.design.widget.FloatingActionButton
-            android:id="@+id/fab"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/fab_margin"
-            app:srcCompat="@android:drawable/ic_dialog_email"/>
-
-</android.support.design.widget.CoordinatorLayout>