contorl swith by project

wugian
1 parent 256882e3
Showing 11 changed files with 489 additions and 32 deletions
gimiCinema/src/main/AndroidManifest.xml
gimiCinema/src/main/java/com/gimi/common/cinema/model/Constant.java
gimiCinema/src/main/java/com/gimi/common/cinema/utils/Utils.java
gimiCinema/src/main/java/com/qnbar/smc/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/ConfigWifiActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SwitchControlActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IMainView.java
gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
gimiCinema/src/main/res/layout/activity_config_wifi.xml
gimiCinema/src/main/res/layout/item_pop.xml
--- a/gimiCinema/src/main/AndroidManifest.xml
View file @ca06f44
+++ b/gimiCinema/src/main/AndroidManifest.xml
View file @ca06f44
@@ -148,11 +148,17 @@
         <activity android:name=".activity.QrCodeShowActivity">
         </activity>
+        <activity android:name=".activity.ConfigWifiActivity">
+        </activity>
         <activity
                 android:name="com.xgimi.gimicinema.activity.SwitchControlActivity"
                 android:theme="@style/AppTheme.NoActionBar">
+            <!--  <intent-filter>
+                  <action android:name="android.intent.action.MAIN"/>
+                  <category android:name="android.intent.category.LAUNCHER"/>
+              </intent-filter>-->
         </activity>
     </application>
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/model/Constant.java
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/model/Constant.java
View file @ca06f44
@@ -17,7 +17,7 @@ public class Constant {
     public static boolean isAdsOn = false;
     public static boolean gimiAuth = true;
-    public static int count = 2;
+    public static int count = 0;
     public static String MOVIE_MESSAGE_NAME_NEW = "/mm.qnt";
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/Utils.java
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/Utils.java
View file @ca06f44
@@ -77,6 +77,12 @@ public class Utils {
         return sharedPreferences.getLong(name, 0);
     }
+    public static long getLong(Context  context, String name) {
+        SharedPreferences sharedPreferences = context.getSharedPreferences(
+                Constant.XML_NAME, Context.MODE_PRIVATE);
+        return sharedPreferences.getLong(name, 0);
+    }
+
     public static void saveString(Context context, String name, String value) {
         SharedPreferences sharedPreferences = context.getSharedPreferences(
                 Constant.XML_NAME, Context.MODE_PRIVATE);
--- a/gimiCinema/src/main/java/com/qnbar/smc/MainActivity.java
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/qnbar/smc/MainActivity.java
View file @ca06f44
@@ -516,7 +516,8 @@ public class MainActivity extends Activity implements EventListener<String> {
         testData();
         View popupView = getLayoutInflater().inflate(R.layout.item_pop, null);
-        popupWindow = new PopupWindow(popupView, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        popupWindow = new PopupWindow(popupView, 200,
+                LinearLayout.LayoutParams.WRAP_CONTENT, true);
         popupWindow.setFocusable(true);
         popupWindow.setOutsideTouchable(true);
         popupWindow.setBackgroundDrawable(new BitmapDrawable(getResources(), (Bitmap) null));
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/ConfigWifiActivity.java 0 → 100644
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/ConfigWifiActivity.java 0 → 100644
View file @ca06f44
+package com.xgimi.gimicinema.activity;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+import com.gimi.common.cinema.utils.Utils;
+import com.xgimi.gimicinema.R;
+
+public class ConfigWifiActivity extends Activity {
+
+    private static final String TAG = "ConfigWifiActivity";
+
+    private EditText mEdtApSsid;
+    private EditText mEdtApPassword;
+    private Button mBtnConfig;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_config_wifi);
+        String ssid = Utils.getString(this, "wifi-ssid");
+        String pwd = Utils.getString(this, "wifi-ssid-pwd");
+
+        mEdtApSsid = (EditText) findViewById(R.id.ssid_et);
+        mEdtApPassword = (EditText) findViewById(R.id.pwd_et);
+
+        mEdtApSsid.setText(ssid);
+        mEdtApPassword.setText(pwd);
+
+        if (TextUtils.isEmpty(ssid)) {
+            mEdtApSsid.setText("LEMOMOFFICE2.4G");
+            mEdtApPassword.setText("88888888");
+        }
+
+        mBtnConfig = (Button) findViewById(R.id.btn_save);
+        mBtnConfig.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String apSsid = mEdtApSsid.getText().toString();
+                String apPassword = mEdtApPassword.getText().toString();
+                Utils.saveString(ConfigWifiActivity.this, "wifi-ssid", apSsid);
+                Utils.saveString(ConfigWifiActivity.this, "wifi-ssid-pwd", apPassword);
+                if (!TextUtils.isEmpty(apSsid) && !TextUtils.isEmpty(apPassword)) {
+                    Toast.makeText(ConfigWifiActivity.this, "保存成功", Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+
+    }
+}
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @ca06f44
@@ -59,6 +59,7 @@ import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.FolderItem;
 import com.gimi.common.cinema.model.LocalMovieMessage;
 import com.gimi.common.cinema.model.MessageEvent;
+import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import com.gimi.common.cinema.utils.AuthUtils;
 import com.gimi.common.cinema.utils.LeeImageLoader;
@@ -121,15 +122,14 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import static com.qnbar.smc.service.SocketService.OPEN_DOOR_CMD;
-
 /**
  * Created by wugian on 2016/9/23
  */
 public class MainActivity extends BaseActivity implements IMainView, EventListener<String> {
+    private static final String TAG = "MainActivity";
     private long switchNum = 4294967151L;
     private String deviceNum = "FF:FF:FF:FF:00:FF";
-    private static final String TAG = "MainActivity";
+    private String lockMac = "DC:F6:70:C1:AA:D6";
     private Context context;
     private ImageView controlQrCodeIv;
@@ -452,6 +452,9 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Override
     public void countDownOrderTime(int durationMinutes) {
+        if (durationMinutes <= 1) {
+            return;
+        }
         Constant.count = durationMinutes + 1;
         PollingUtils.startPollingService(context, 60, CountService.class, CountService.STATUS_ACTION);
     }
@@ -463,6 +466,15 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         this.info = info;
     }
+    @Override
+    public void notifyGetRoomInfo(RoomInfo info) {
+        if (!TextUtils.isEmpty(info.getData().getMac_address())) {
+            lockMac = info.getData().getMac_address();
+        } else {
+            show("没有配置门禁相关网信息，使用默认信息");
+        }
+    }
+
     int findCount = 0;
@@ -865,7 +877,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMoonEvent(MessageEvent messageEvent) {
         switch (messageEvent.getEventId()) {
-            case OPEN_DOOR_CMD:
+            case SocketService.OPEN_DOOR_CMD:
                 openDoor();
                 if (rightSn) {
                     down();
@@ -924,7 +936,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
                 Toast.makeText(MainActivity.this, "开门成功", Toast.LENGTH_SHORT).show();
                 BLEOpenRecord bleOpenRecord = new BLEOpenRecord();
-                bleOpenRecord.setLockmac("DC:F6:70:C1:AA:D6");
+                bleOpenRecord.setLockmac(lockMac);
                 bleOpenRecord.setTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.US).format(new Date()));
                 Intent intent = new Intent();
                 intent.setAction(GREENBluetoothLeService.ACTION_OPEN_SUCCESS);
@@ -940,7 +952,7 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         });
         String openCMD = "Open the door";
-        GREENBLE.send(this, "DC:F6:70:C1:AA:D6", openCMD.getBytes());
+        GREENBLE.send(this, lockMac, openCMD.getBytes());
         List<LocalMovieMessage> localMovieMessages = new NewDBManager(this).queryRandomMovies();
         if (localMovieMessages != null && localMovieMessages.size() > 0) {
             OpenMMUtils.openMMWithAds(this, localMovieMessages.get(0).getPlayPath(), null);
@@ -952,6 +964,8 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
     private boolean findSwitch = false;
     void initSwitch() {
+        switchNum = Utils.getLong(this, "sub-device-str");
+        deviceNum = Utils.getString(this, "hub-num-str");
         FistJni fistJni = FistJni.getInstance();
         fistJni.startSdk();
         fistJni.searchLocalDevice();
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SwitchControlActivity.java
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/SwitchControlActivity.java
View file @ca06f44
 package com.xgimi.gimicinema.activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.Bitmap;
 import android.graphics.Rect;
+import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.GridView;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
 import android.widget.Toast;
 import com.adroplat.fist_switch.jni.Device;
 import com.adroplat.fist_switch.jni.FistJni;
 import com.adroplat.fist_switch.jni.SubDevice;
 import com.adroplat.fist_switch.utils.protocol.one.FistProtocol;
+import com.gimi.common.cinema.utils.Utils;
 import com.google.gson.Gson;
+import com.qnbar.smc.model.Group;
+import com.qnbar.smc.model.Groups;
 import com.qnbar.switchcontrol.model.SwitchMessageEvent;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.adapter.DeviceListAdapter;
@@ -30,8 +49,12 @@ public class SwitchControlActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_switch_control);
+        mContext = this;
+
         EventBus.getDefault().register(this);
-        //TODO save DeviceNum,SubDeviceNum
+        deviceStrKey = Utils.getString(mContext, "hub-key-str");
+        // save DeviceNum,SubDeviceNum
+        // 显示菜单指定所控制的HUB 及开关并保存
         initList();
         FistJni fistJni = FistJni.getInstance();
         fistJni.startSdk();
@@ -79,9 +102,18 @@ public class SwitchControlActivity extends AppCompatActivity {
             @Override
             public void onMenuClick(View v, int position) {
-                deviceStrKey = FistJni.getHubs().get(position).getDeviceStrKey();
-                toast("重设控制口令");
-                Log.d("menu", "reset control hub:" + deviceStrKey);
+                testDataHub();
+                initPopupWindow();
+                if (popupWindow != null) {
+                    if (!popupWindow.isShowing()) {
+                        popupWindow.showAsDropDown(v);
+                        groupListAdapter.notifyDataSetChanged();
+                    }
+                }
+                //控制当前主机，保存控制密码
+//                deviceStrKey = FistJni.getHubs().get(position).getDeviceStrKey();
+//                toast("重设控制口令");
+//                Log.d("menu", "reset control hub:" + deviceStrKey);
             }
         });
         hubRv.setAdapter(hubAdapter);
@@ -125,23 +157,14 @@ public class SwitchControlActivity extends AppCompatActivity {
             @Override
             public void onMenuClick(View v, int position) {
-                Device device = null;
-                for (Device deviceCur : FistJni.getHubs()) {
-                    if (deviceCur.getDeviceStrKey().equals(deviceStrKey)) {
-                        device = deviceCur;
+                testDataLights();
+                initPopupWindow();
+                if (popupWindow != null) {
+                    if (!popupWindow.isShowing()) {
+                        popupWindow.showAsDropDown(v);
+                        groupListAdapter.notifyDataSetChanged();
                     }
                 }
-                if (device == null) {
-                    toast("当前控制口令出错，请重新选择控制主机按menu设置");
-                    return;
-                }
-
-                ArrayList<SubDevice> subDevices = new ArrayList<>();
-                subDevices.add(FistJni.getSubDevices().get(position));
-                device.setSubDevices(subDevices);
-                FistJni.getInstance().delSub(new Gson().toJson(device));
-                FistJni.getSubDevices().clear();
-                switchAdapter.notifyDataSetChanged();
             }
         });
         switchRv.setAdapter(switchAdapter);
@@ -167,6 +190,43 @@ public class SwitchControlActivity extends AppCompatActivity {
         fistJni.modifyPwd(new Gson().toJson(device), "123456");
     }
+    private void showAlert() {
+        String promte = "配置信息不全请重新配置";
+        final String ssid = Utils.getString(this, "wifi-ssid");
+        final String pwd = Utils.getString(this, "wifi-ssid-pwd");
+        if (!TextUtils.isEmpty(ssid) && !TextUtils.isEmpty(pwd)) {
+            promte = "当前配置信息为：\n\nssid:" + ssid + "\n\npwd:" + pwd;
+        }
+
+        new AlertDialog.Builder(this)
+                .setTitle("确认")
+                .setMessage(promte)
+                .setPositiveButton("是", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        Device device = null;
+                        for (Device deviceCur : FistJni.getHubs()) {
+                            if (deviceCur.getDeviceStrKey().equals(deviceStrKey)) {
+                                device = deviceCur;
+                            }
+                        }
+                        if (device == null) {
+                            toast("没有选中控制主机，请重新选择控制主机按menu设置");
+                            return;
+                        }
+                        FistJni fistJni = FistJni.getInstance();
+                        fistJni.getlinkRouter(new Gson().toJson(device), ssid, pwd);
+                    }
+                })
+                .setNegativeButton("重新配置", new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        startActivity(new Intent(SwitchControlActivity.this, ConfigWifiActivity.class));
+                    }
+                })
+                .show();
+    }
+
     public void getLinkStatus(View view) {
         FistJni fistJni = FistJni.getInstance();
         Device device = FistJni.getHubs().get(0);
@@ -174,10 +234,11 @@ public class SwitchControlActivity extends AppCompatActivity {
     }
     public void setLinkMsg(View view) {
-        FistJni fistJni = FistJni.getInstance();
-        Device device = FistJni.getHubs().get(0);
-//        fistJni.getlinkRouter(new Gson().toJson(device),"Xiaomi123","88888888");
-        fistJni.getlinkRouter(new Gson().toJson(device), "LEMOMOFFICE2.4G", "88888888");
+        showAlert();
+//        FistJni fistJni = FistJni.getInstance();
+//        Device device = FistJni.getHubs().get(0);
+////        fistJni.getlinkRouter(new Gson().toJson(device),"Xiaomi123","88888888");
+//        fistJni.getlinkRouter(new Gson().toJson(device), "LEMOMOFFICE2.4G", "88888888");
     }
     public void scanHubs(View view) {
@@ -206,6 +267,14 @@ public class SwitchControlActivity extends AppCompatActivity {
             case FistJni.DEVICE_HUBS_ONLINE_NOTIFY:
             case FistProtocol.CommondType.CMD_TYPE_SEARCH_RESPONSE:
                 Log.d("qnbar_switch", switchMessageEvent.getMessage());
+                for (Device device : FistJni.getHubs()) {
+                    if ("000000".equals(device.getDeviceStrKey())) {
+                        FistJni.getHubs().clear();
+                        FistJni fistJni = FistJni.getInstance();
+                        fistJni.modifyPwd(new Gson().toJson(device), "123456");
+                        return;
+                    }
+                }
                 hubAdapter.notifyDataSetChanged();
                 break;
             case FistJni.DEVICE_SWITCH_ONLINE_NOTIFY:
@@ -222,6 +291,11 @@ public class SwitchControlActivity extends AppCompatActivity {
                 Log.d("qnbar_switch", switchMessageEvent.getMessage());
                 toast("子设备有变动");
                 break;
+            case FistProtocol.CommondType.CMD_MODIFY_CTRL_PWD_RESPONSE:
+                searchLocalDevice();
+                Log.d("qnbar_switch", switchMessageEvent.getMessage());
+                toast("控制密码已重置");
+                break;
             default:
                 Log.d("qnbar_switch", "default:" + switchMessageEvent.getMessage() + "," + switchMessageEvent.getEventId());
                 break;
@@ -229,7 +303,7 @@ public class SwitchControlActivity extends AppCompatActivity {
     }
     private void toast(String msg) {
-        Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
     }
     @Override
@@ -237,4 +311,202 @@ public class SwitchControlActivity extends AppCompatActivity {
         super.onDestroy();
         EventBus.getDefault().unregister(this);
     }
+
+
+    private PopupWindow popupWindow;
+    private Context mContext;
+    private GroupListAdapter groupListAdapter;
+    private LayoutInflater inflate;
+    private boolean isHubs;
+
+    private void initPopupWindow() {
+//        testDataHub();
+        final View popupView = getLayoutInflater().inflate(R.layout.item_pop, null);
+
+        popupWindow = new PopupWindow(popupView, LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
+        popupWindow.setFocusable(true);
+        popupWindow.setOutsideTouchable(true);
+        popupWindow.setBackgroundDrawable(new BitmapDrawable(getResources(), (Bitmap) null));
+        inflate = getLayoutInflater();
+        GridView listView = (GridView) popupView.findViewById(R.id.list_groups);
+        TextView title = (TextView) popupView.findViewById(R.id.txt_header_title);
+        if (isHubs) {
+            title.setText("设置HUB");
+        } else {
+            title.setText("设置开关");
+        }
+        listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                if (isHubs) {
+                    switch (position) {
+                        case 0:
+                            //get current click
+                            //控制当前主机，保存控制密码
+                            deviceStrKey = FistJni.getHubs().get((Integer) hubRv.getFocusedChild().getTag()).getDeviceStrKey();
+                            String deviceNumStr = FistJni.getHubs().get(position).getStringDeviceNum();
+                            Utils.saveString(mContext, "hub-num-str", deviceNumStr);
+                            Utils.saveString(mContext, "hub-key-str", deviceStrKey);
+//                            toast("重设控制口令");
+                            toast("系统记录当前控制主机设备号,重设控制口令");
+                            Log.d("menu", "reset control hub:" + deviceStrKey);
+                            break;
+                    }
+                } else {
+                    switch (position) {
+                        case 0:
+                            long subDeviceNum = FistJni.getSubDevices().get((Integer) switchRv.getFocusedChild().getTag()).getSubDeviceNum();
+                            Utils.saveLong(mContext, "sub-device-str", subDeviceNum);
+                            toast("系统记录当前开关设备号,在特定时间会进行开关");
+                            break;
+                        case 1:
+                            Device device = null;
+                            for (Device deviceCur : FistJni.getHubs()) {
+                                if (deviceCur.getDeviceStrKey().equals(deviceStrKey)) {
+                                    device = deviceCur;
+                                }
+                            }
+                            if (device == null) {
+                                toast("些开关不属于当前控制主机，请重新选择控制主机按menu设置");
+                                return;
+                            }
+                            ArrayList<SubDevice> subDevices = new ArrayList<>();
+                            subDevices.add(FistJni.getSubDevices().get((Integer) switchRv.getFocusedChild().getTag()));
+                            device.setSubDevices(subDevices);
+                            FistJni.getInstance().delSub(new Gson().toJson(device));
+                            FistJni.getSubDevices().clear();
+                            switchAdapter.notifyDataSetChanged();
+
+                            break;
+                    }
+                    if (popupWindow != null && popupWindow.isShowing()) {
+                        popupWindow.dismiss();
+                    }
+                }
+//                Group group = groupListAdapter.getItem(position);
+//                allocDeviceGroup(group);
+            }
+        });
+        groupListAdapter = new GroupListAdapter();
+        listView.setAdapter(groupListAdapter);
+    }
+
+    class GroupListAdapter extends BaseAdapter implements
+            View.OnClickListener, View.OnLongClickListener {
+
+        public GroupListAdapter() {
+
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return false;
+        }
+
+        @Override
+        public int getCount() {
+            return Groups.getInstance().size();
+        }
+
+        @Override
+        public Group getItem(int position) {
+            return Groups.getInstance().get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return 0;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            GroupItemHolder holder;
+            if (convertView == null) {
+                convertView = inflate.inflate(R.layout.group_item, null);
+                TextView txtName = (TextView) convertView
+                        .findViewById(R.id.txt_name);
+                txtName.setOnLongClickListener(this);
+                holder = new GroupItemHolder();
+                holder.txtName = txtName;
+                convertView.setTag(holder);
+            } else {
+                holder = (GroupItemHolder) convertView.getTag();
+            }
+
+            Group group = getItem(position);
+            if (group != null) {
+                if (group.textColor == null)
+                    group.textColor = mContext.getResources()
+                            .getColorStateList(R.color.black);
+                holder.txtName.setText(group.name);
+                holder.txtName.setTag(group.meshAddress);
+
+                if (group.checked) {
+                    ColorStateList color = mContext.getResources()
+                            .getColorStateList(R.color.theme_positive_color);
+                    holder.txtName.setTextColor(color);
+                } else {
+                    ColorStateList color = mContext.getResources()
+                            .getColorStateList(R.color.black);
+                    holder.txtName.setTextColor(color);
+                }
+            }
+            return convertView;
+        }
+
+        @Override
+        public void onClick(View view) {
+        }
+
+        @Override
+        public boolean onLongClick(View v) {
+            return false;
+        }
+
+        public Group get(int groupAddress) {
+            return Groups.getInstance().getByMeshAddress(groupAddress);
+        }
+    }
+
+    static class GroupItemHolder {
+        public TextView txtName;
+    }
+
+    private void testDataHub() {
+        isHubs = true;
+
+        Groups.getInstance().clear();
+
+        Group living = new Group();
+        living.name = "控制当前主机";
+        living.meshAddress = 0x8001;
+        living.brightness = 100;
+        living.temperature = 100;
+        living.color = 0xFFFFFF;
+
+        Groups.getInstance().add(living);
+    }
+
+    private void testDataLights() {
+        isHubs = false;
+        Groups.getInstance().clear();
+
+        Group living = new Group();
+        living.name = "控制当前开关";
+        living.meshAddress = 0x8001;
+        living.brightness = 100;
+        living.temperature = 100;
+        living.color = 0xFFFFFF;
+
+        Group family = new Group();
+        family.name = "移除此开关";
+        family.meshAddress = 0x8002;
+        family.brightness = 100;
+        family.temperature = 100;
+        family.color = 0xFFFFFF;
+
+        Groups.getInstance().add(living);
+        Groups.getInstance().add(family);
+    }
+
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IMainView.java
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/mview/IMainView.java
View file @ca06f44
@@ -19,6 +19,7 @@ import android.graphics.Bitmap;
 import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.LocalMovieMessage;
+import com.gimi.common.cinema.model.RoomInfo;
 import com.gimi.common.cinema.model.RoomQrCodeInfo;
 import java.util.List;
@@ -58,4 +59,6 @@ public interface IMainView {
     void countDownOrderTime(int durationMinutes);
     void prepareRoomQrCodeInfo(RoomQrCodeInfo info);
+
+    void notifyGetRoomInfo(RoomInfo info);
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @ca06f44
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/presenter/MainPresenter.java
View file @ca06f44
@@ -214,11 +214,13 @@ public class MainPresenter extends BasePresenter
         roomInfoModel.getRoomInfo(imei, true, new RoomInfoModelImpl.GetRoomInfoListener() {
             @Override
             public void onGetRoomInfoSuccess(RoomInfo info) {
+                mainView.notifyGetRoomInfo(info);
                 Log.d("room-info", "get success:" + info.toString());
             }
             @Override
             public void onGetRoomInfoUpdate(RoomInfo info) {
+                mainView.notifyGetRoomInfo(info);
                 Log.d("room-info", "update success:" + info.toString());
             }
@@ -239,6 +241,7 @@ public class MainPresenter extends BasePresenter
                     public void onGetRoomStatusSuccess(RoomStatusInfo info) {
                         RoomStatusInfo.DataEntity data = info.getData();
                         int durationMinutes = data.getEnd_time() - data.getBegin_time();
+                        Log.d("CountService", "durationMinutes:" + durationMinutes);
                         mainView.countDownOrderTime(durationMinutes);
                         roomInfoModel.getRoomQrCode(data.getOrder_sn(), new RoomInfoModelImpl.GetRoomQrCodeListener() {
                             @Override
--- a/gimiCinema/src/main/res/layout/activity_config_wifi.xml 0 → 100644
View file @ca06f44
+++ b/gimiCinema/src/main/res/layout/activity_config_wifi.xml 0 → 100644
View file @ca06f44
+<!--
+  ~ Copyright 2017 wugian
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:background="@android:color/white"
+              android:orientation="vertical">
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+    >
+
+        <ImageView
+                android:id="@+id/img_header_menu_left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_centerVertical="true"
+                android:layout_marginStart="10dp"
+                android:contentDescription="@null"/>
+
+        <TextView
+                android:id="@+id/txt_header_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignWithParentIfMissing="false"
+                android:layout_centerHorizontal="true"
+                android:layout_centerInParent="true"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="30dp"
+                android:layout_marginStart="30dp"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:text="配置WIFI信息"
+                android:textAlignment="center"
+                android:textColor="@android:color/black"
+                android:textSize="18sp"/>
+    </RelativeLayout>
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginTop="15dp"
+            android:orientation="vertical">
+
+
+        <EditText
+                android:id="@+id/ssid_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:editable="false"
+                android:ems="10"
+                android:inputType="text"
+                android:labelFor="@+id/txt_mesh_name"
+                android:hint="ssid"/>
+
+        <EditText
+                android:id="@+id/pwd_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:layout_marginTop="10dp"
+                android:inputType="textPassword"
+                android:labelFor="@+id/txt_mesh_password"
+                android:hint="password"/>
+
+
+        <Button
+                android:id="@+id/btn_save"
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:layout_marginTop="15dp"
+                android:text="保存WIFI信息"
+                android:textColor="@android:color/black"
+                android:textSize="18sp"/>
+
+    </LinearLayout>
+
+
+</LinearLayout>
--- a/gimiCinema/src/main/res/layout/item_pop.xml
View file @ca06f44
+++ b/gimiCinema/src/main/res/layout/item_pop.xml
View file @ca06f44
@@ -30,6 +30,7 @@
     <GridView
             android:id="@+id/list_groups"
+            android:listSelector="@android:drawable/list_selector_background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:fadingEdge="none"