mesh change package control group test

Penley
1 parent c79a1b99
Showing 9 changed files with 15 additions and 10 deletions
gimiCinema/src/main/java/com/qnbar/smc/AddMeshActivity.java
gimiCinema/src/main/java/com/qnbar/smc/DeviceScanningActivity.java
gimiCinema/src/main/java/com/qnbar/smc/DeviceSettingActivity.java
gimiCinema/src/main/java/com/qnbar/smc/MainActivity.java
gimiCinema/src/main/java/com/qnbar/smc/SimpleLightDemo.java
gimiCinema/src/main/java/com/qnbar/smc/adapter/DeviceListAdapter.java
gimiCinema/src/main/java/com/qnbar/smc/model/Mesh.java → gimiCinema/src/main/java/com/telink/bluetooth/light/model/Mesh.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
--- a/gimiCinema/src/main/java/com/qnbar/smc/AddMeshActivity.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/qnbar/smc/AddMeshActivity.java
View file @25fc993
@@ -27,8 +27,8 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.Toast;
-import com.qnbar.smc.model.Mesh;
 import com.qnbar.smc.service.TelinkLightService;
+import com.telink.bluetooth.light.model.Mesh;
 import com.xgimi.gimicinema.R;
 import com.xgimi.gimicinema.application.FangTangApplication;
--- a/gimiCinema/src/main/java/com/qnbar/smc/DeviceScanningActivity.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/qnbar/smc/DeviceScanningActivity.java
View file @25fc993
@@ -19,7 +19,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 import com.qnbar.smc.model.Light;
-import com.qnbar.smc.model.Mesh;
 import com.qnbar.smc.service.TelinkLightService;
 import com.telink.bluetooth.event.DeviceEvent;
 import com.telink.bluetooth.event.LeScanEvent;
@@ -29,6 +28,7 @@ import com.telink.bluetooth.light.LeScanParameters;
 import com.telink.bluetooth.light.LeUpdateParameters;
 import com.telink.bluetooth.light.LightAdapter;
 import com.telink.bluetooth.light.Parameters;
+import com.telink.bluetooth.light.model.Mesh;
 import com.telink.util.Event;
 import com.telink.util.EventListener;
 import com.xgimi.gimicinema.R;
--- a/gimiCinema/src/main/java/com/qnbar/smc/DeviceSettingActivity.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/qnbar/smc/DeviceSettingActivity.java
View file @25fc993
@@ -73,6 +73,8 @@ public class DeviceSettingActivity extends Activity implements OnClickListener {
         private void onValueChange(View view, int progress, boolean immediate) {
             int addr = meshAddress;
+            //change group brightness or color temperature
+//            addr = 0x8003;
             byte opcode;
             byte[] params;
--- a/gimiCinema/src/main/java/com/qnbar/smc/MainActivity.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/qnbar/smc/MainActivity.java
View file @25fc993
@@ -24,6 +24,7 @@ import android.view.Window;
 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;
@@ -33,7 +34,6 @@ import com.qnbar.smc.model.Group;
 import com.qnbar.smc.model.Groups;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
-import com.qnbar.smc.model.Mesh;
 import com.qnbar.smc.service.TelinkLightService;
 import com.telink.bluetooth.LeBluetooth;
 import com.telink.bluetooth.TelinkLog;
@@ -49,6 +49,7 @@ import com.telink.bluetooth.light.LightAdapter;
 import com.telink.bluetooth.light.NotificationInfo;
 import com.telink.bluetooth.light.OnlineStatusNotificationParser;
 import com.telink.bluetooth.light.Parameters;
+import com.telink.bluetooth.light.model.Mesh;
 import com.telink.util.BuildUtils;
 import com.telink.util.Event;
 import com.telink.util.EventListener;
@@ -514,7 +515,7 @@ public class MainActivity extends Activity implements EventListener<String> {
         testData();
         View popupView = getLayoutInflater().inflate(R.layout.item_pop, null);
-        popupWindow = new PopupWindow(popupView, 200, 300, true);
+        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));
--- a/gimiCinema/src/main/java/com/qnbar/smc/SimpleLightDemo.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/qnbar/smc/SimpleLightDemo.java
View file @25fc993
@@ -17,7 +17,6 @@ import android.widget.Toast;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
-import com.qnbar.smc.model.Mesh;
 import com.qnbar.smc.service.TelinkLightService;
 import com.telink.bluetooth.LeBluetooth;
 import com.telink.bluetooth.TelinkLog;
@@ -32,6 +31,7 @@ import com.telink.bluetooth.light.LeRefreshNotifyParameters;
 import com.telink.bluetooth.light.LightAdapter;
 import com.telink.bluetooth.light.OnlineStatusNotificationParser;
 import com.telink.bluetooth.light.Parameters;
+import com.telink.bluetooth.light.model.Mesh;
 import com.telink.util.BuildUtils;
 import com.telink.util.Event;
 import com.telink.util.EventListener;
--- a/gimiCinema/src/main/java/com/qnbar/smc/adapter/DeviceListAdapter.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/qnbar/smc/adapter/DeviceListAdapter.java
View file @25fc993
@@ -92,7 +92,7 @@ public class DeviceListAdapter extends RecyclerView.Adapter<DeviceListAdapter.De
     @Override
     public int getItemCount() {
-        return Lights.getInstance().size() == 0 ? 0 : Lights.getInstance().size() + 2;
+        return Lights.getInstance().size()/* == 0 ? 0 : Lights.getInstance().size() + 2*/;
     }
     @Override
--- a/gimiCinema/src/main/java/com/qnbar/smc/model/Mesh.java → gimiCinema/src/main/java/com/telink/bluetooth/light/model/Mesh.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/qnbar/smc/model/Mesh.java → gimiCinema/src/main/java/com/telink/bluetooth/light/model/Mesh.java
View file @25fc993
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
-package com.qnbar.smc.model;
+package com.telink.bluetooth.light.model;
+
 import com.qnbar.smc.utils.FileSystem;
 import com.telink.bluetooth.light.DeviceInfo;
@@ -27,7 +28,8 @@ import java.util.List;
 public class Mesh implements Serializable {
     private static final long serialVersionUID = 1L;
-    public static final String MESH_FILE_NAME = "telink-qn.meshs";
+    public static final String MESH_FILE_NAME = "telink.meshs";
+//    public static final String MESH_FILE_NAME = "telink-qn.meshs";
     public String name;
     public String password;
     public String factoryName;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @25fc993
@@ -60,7 +60,6 @@ import com.gimi.common.cinema.utils.ScreenUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
-import com.qnbar.smc.model.Mesh;
 import com.qnbar.smc.service.TelinkLightService;
 import com.telink.bluetooth.LeBluetooth;
 import com.telink.bluetooth.TelinkLog;
@@ -75,6 +74,7 @@ import com.telink.bluetooth.light.LeRefreshNotifyParameters;
 import com.telink.bluetooth.light.LightAdapter;
 import com.telink.bluetooth.light.OnlineStatusNotificationParser;
 import com.telink.bluetooth.light.Parameters;
+import com.telink.bluetooth.light.model.Mesh;
 import com.telink.util.BuildUtils;
 import com.telink.util.Event;
 import com.telink.util.EventListener;
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @25fc993
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/application/FangTangApplication.java
View file @25fc993
@@ -3,11 +3,11 @@ package com.xgimi.gimicinema.application;
 import android.util.Log;
 import com.qnbar.smc.application.MySampleAdvanceStrategy;
-import com.qnbar.smc.model.Mesh;
 import com.qnbar.smc.service.TelinkLightService;
 import com.qnbar.smc.utils.FileSystem;
 import com.telink.TelinkApplication;
 import com.telink.bluetooth.light.AdvanceStrategy;
+import com.telink.bluetooth.light.model.Mesh;
 public class FangTangApplication extends TelinkApplication {
     private Mesh mesh;