before play movie play ads ,and some other bugs fix

wugian
1 parent ff67cca7
Showing 9 changed files with 191 additions and 160 deletions
gimiCinema/build.gradle
gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
gimiCinema/src/main/java/com/gimi/common/cinema/utils/OpenMMUtils.java
gimiCinema/src/main/java/com/qnbar/smc/DeviceSettingActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/AdsPreVideoPlayerActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
gimiCinema/src/main/java/com/xgimi/gimicinema/model/UpdateModelImpl.java
gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
gimiCinema/src/main/res/layout/activity_device_setting.xml
--- a/gimiCinema/build.gradle
View file @d2f4c81
+++ b/gimiCinema/build.gradle
View file @d2f4c81
@@ -55,7 +55,7 @@ android {
     }
     defaultConfig {
-        applicationId "com.qnbar.fangtang.cinema"
+//        applicationId "com.qnbar.fangtang.cinema"
         minSdkVersion ANDROID_MIN_SDK_VERSION as int
         targetSdkVersion ANDROID_TARGET_SDK_VERSION as int
         versionCode APP_VERSION_CODE
@@ -93,7 +93,7 @@ android {
 //            manifestPlaceholders = [label: "青柠影咖", icon: "@drawable/ic_luancher", channel: "QNJM"]
             buildConfigField 'String', 'MACHINE_TYPE', "\"gimi\""
             buildConfigField 'boolean', 'USE_GLIDE', "false"
-            manifestPlaceholders = [label: "在线影院", icon: "@drawable/ic_launcher", channel: "JSZC"]
+            manifestPlaceholders = [label: "方糖", icon: "@drawable/ic_launcher", channel: "JSZC"]
             minifyEnabled false
             signingConfig signingConfigs.myConfig
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
View file @d2f4c81
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/db/NewDBManager.java
View file @d2f4c81
@@ -438,6 +438,22 @@ public class NewDBManager {
      *
      * @return persons
      */
+    public List<LocalMovieMessage> queryRandomMovies() {
+//        String sql = "SELECT * FROM movie_message order by cast(movie_dl_time as int) desc limit " + 1;/* + " path like '%" + key + "%'";*/
+//        ArrayList<LocalMovieMessage> persons = new ArrayList<LocalMovieMessage>();
+//        StringBuffer sb = new StringBuffer(sql);
+//
+//        Cursor c = db.rawQuery(sb.toString(), null);
+//        readCursor2List(persons, c);
+//        c.close();
+        return queryTJLimit(1);
+    }
+
+    /**
+     * query all recommend qn
+     *
+     * @return persons
+     */
     public List<LocalMovieMessage> queryAllDemandMovies() {
         String sql = "SELECT * FROM movie_message order by cast(" + NewDBHelper.MOVIE_COUNT + " as int) desc, cast(movie_dl_time as int) desc limit " + PXB_MOVIE_COUNT;/* + " path like '%" + key + "%'";*/
         ArrayList<LocalMovieMessage> persons = new ArrayList<LocalMovieMessage>();
@@ -623,7 +639,7 @@ public class NewDBManager {
         db.beginTransaction();
         ContentValues cv = constructCv(lmm);
 //        db.update(NewDBHelper.TABLE_NAME, cv, "id = ? ", new String[]{String.valueOf(lmm.getId())});
-        db.updateWithOnConflict(NewDBHelper.TABLE_NAME, cv, "id = ? ", new String[]{String.valueOf(lmm.getId())},SQLiteDatabase.CONFLICT_REPLACE);
+        db.updateWithOnConflict(NewDBHelper.TABLE_NAME, cv, "id = ? ", new String[]{String.valueOf(lmm.getId())}, SQLiteDatabase.CONFLICT_REPLACE);
         db.setTransactionSuccessful(); // changes get rolled back if this not called
         result = true;
         db.endTransaction(); // commit or rollback
--- a/gimiCinema/src/main/java/com/gimi/common/cinema/utils/OpenMMUtils.java
View file @d2f4c81
+++ b/gimiCinema/src/main/java/com/gimi/common/cinema/utils/OpenMMUtils.java
View file @d2f4c81
@@ -7,6 +7,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import com.gimi.common.cinema.model.Constant;
 import com.xgimi.gimicinema.BuildConfig;
+import com.xgimi.gimicinema.activity.AdsPreVideoPlayerActivity;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,6 +25,15 @@ public class OpenMMUtils {
 //        context.startActivity(intent);
     }
+
+    public static void openMMWithAds(Context context, String videoPath, String subtitlePath) {
+        //Splash Video Ads? find Ads,no ads play movie;ads exists play
+//        openMM(context, videoPath, null, subtitlePath);
+        Intent intent = new Intent(context, AdsPreVideoPlayerActivity.class);
+        intent.putExtra(AdsPreVideoPlayerActivity.MOVIE_PLAY_PATH, videoPath);
+        context.startActivity(intent);
+    }
+
     public static void openMM(Context context, String videoPath, ArrayList<String> list, String subtitlePath) {
         //Splash Video Ads? find Ads,no ads play movie;ads exists play
         openPlayer(context, videoPath, list, 0);
--- a/gimiCinema/src/main/java/com/qnbar/smc/DeviceSettingActivity.java
View file @d2f4c81
+++ b/gimiCinema/src/main/java/com/qnbar/smc/DeviceSettingActivity.java
View file @d2f4c81
@@ -24,7 +24,8 @@ import android.view.View.OnClickListener;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.SeekBar;
-
+import android.widget.TextView;
+import com.gimi.common.cinema.utils.Utils;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
 import com.qnbar.smc.service.TelinkLightService;
@@ -37,6 +38,8 @@ public class DeviceSettingActivity extends Activity implements OnClickListener {
     private SeekBar brightnessBar;
     private SeekBar temperatureBar;
+    private TextView temperatureTv;
+    private TextView brightnessTv;
     private Button remove;
     private View delete;
     private SeekBar.OnSeekBarChangeListener barChangeListener = new SeekBar.OnSeekBarChangeListener() {
@@ -81,17 +84,18 @@ public class DeviceSettingActivity extends Activity implements OnClickListener {
             if (view == brightnessBar) {
                 opcode = (byte) 0xD2;
                 params = new byte[]{(byte) progress};
-
+                brightnessTv.setText("亮度:" + progress);
                 TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, immediate);
             } else if (view == temperatureBar) {
+                temperatureTv.setText("色温:" + progress);
                 opcode = (byte) 0xE2;
                 params = new byte[]{0x05, (byte) progress};
                 TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, immediate);
             }
-    }
+        }
     };
     private int meshAddress;
@@ -113,13 +117,22 @@ public class DeviceSettingActivity extends Activity implements OnClickListener {
 //            txtTitle.setText(TextUtils.isEmpty(light.getLabel2()) ? "" : light.getLabel2());
 //        }
+        this.temperatureTv = (TextView) findViewById(R.id.temperatureTv);
+        this.brightnessTv = (TextView) findViewById(R.id.brightnessTv);
+
         this.brightnessBar = (SeekBar) findViewById(R.id.sb_brightness);
         this.temperatureBar = (SeekBar) findViewById(R.id.sb_temperature);
+        int brightness = Utils.getInt(this, "brightness", 50);
+        int temperature = Utils.getInt(this, "temperature", 50);
+        temperatureTv.setText("色温:" + temperature);
+        brightnessTv.setText("亮度:" + brightness);
+
+        brightnessBar.setProgress(brightness);
+        temperatureBar.setProgress(temperature);
         this.brightnessBar.setOnSeekBarChangeListener(barChangeListener);
         this.temperatureBar.setOnSeekBarChangeListener(barChangeListener);
-
         this.remove = (Button) findViewById(R.id.btn_remove);
         this.remove.setOnClickListener(this);
@@ -174,6 +187,13 @@ public class DeviceSettingActivity extends Activity implements OnClickListener {
     }
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Utils.saveInt(this,"brightness",brightnessBar.getProgress());
+        Utils.saveInt(this,"temperature",temperatureBar.getProgress());
+    }
+
     public void changeBrightness(View view) {
         brightnessUp();
     }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/AdsPreVideoPlayerActivity.java
View file @d2f4c81
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/AdsPreVideoPlayerActivity.java
View file @d2f4c81
@@ -147,6 +147,6 @@ public class AdsPreVideoPlayerActivity extends BaseActivity {
     }
     public String getAdsVideoUrl() {
-        return "/mnt/samba/192.168.4.214/root/fl/ads.ts";
+        return Utils.getSambaMsg(this).getLocalPath() + "ads.mp4";
     }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @d2f4c81
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/activity/MainActivity.java
View file @d2f4c81
@@ -47,6 +47,7 @@ import com.bluetoothle.BLEOpenRecord;
 import com.bluetoothle.GREENBluetoothLeService;
 import com.bluetoothle.greencity.GREENBLE;
 import com.bluetoothle.greencity.GREENCITYBLEProtocolFactory;
+import com.gimi.common.cinema.db.NewDBManager;
 import com.gimi.common.cinema.model.ClassificationItem;
 import com.gimi.common.cinema.model.Constant;
 import com.gimi.common.cinema.model.FolderItem;
@@ -55,6 +56,7 @@ import com.gimi.common.cinema.model.MessageEvent;
 import com.gimi.common.cinema.utils.AuthUtils;
 import com.gimi.common.cinema.utils.LeeImageLoader;
 import com.gimi.common.cinema.utils.M1905Utils;
+import com.gimi.common.cinema.utils.OpenMMUtils;
 import com.gimi.common.cinema.utils.ScreenUtils;
 import com.gimi.common.cinema.utils.SystemUtils;
 import com.qnbar.smc.model.Light;
@@ -882,5 +884,9 @@ public class MainActivity extends BaseActivity implements IMainView, EventListen
         });
         GREENBLE.send(this, "DC:F6:70:C1:AA:D6", openCMD.getBytes());
+        List<LocalMovieMessage> localMovieMessages = new NewDBManager(this).queryRandomMovies();
+        if (localMovieMessages != null && localMovieMessages.size() > 0) {
+            OpenMMUtils.openMMWithAds(this, localMovieMessages.get(0).getPlayPath(), null);
+        }
     }
 }
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/model/UpdateModelImpl.java
View file @d2f4c81
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/model/UpdateModelImpl.java
View file @d2f4c81
@@ -83,16 +83,16 @@ public class UpdateModelImpl implements IUpdateModel {
     @Override
     public void updateAppVersion(Context context, boolean bool) {
-        if (appUpdateUtils == null) {
-            appUpdateUtils = new AppUpdateUtils(context);
-        }
-        appUpdateUtils.setShowNoUpdate(bool);
-        ThreadUtils.subThread(new ThreadUtils.DoSomeThing() {
-            @Override
-            public void doSomeThing() {
-                appUpdateUtils.updateAppVersion();
-            }
-        });
+//        if (appUpdateUtils == null) {
+//            appUpdateUtils = new AppUpdateUtils(context);
+//        }
+//        appUpdateUtils.setShowNoUpdate(bool);
+//        ThreadUtils.subThread(new ThreadUtils.DoSomeThing() {
+//            @Override
+//            public void doSomeThing() {
+//                appUpdateUtils.updateAppVersion();
+//            }
+//        });
     }
     @Override
--- a/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @d2f4c81
+++ b/gimiCinema/src/main/java/com/xgimi/gimicinema/service/CinemaControlService.java
View file @d2f4c81
@@ -17,22 +17,19 @@
 package com.xgimi.gimicinema.service;
 import android.app.Service;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.Log;
-
+import com.gimi.common.cinema.utils.Utils;
 import com.qnbar.smc.model.Light;
 import com.qnbar.smc.model.Lights;
 import com.qnbar.smc.service.TelinkLightService;
 import com.telink.bluetooth.light.ConnectionStatus;
 import com.telink.bluetooth.light.DeviceInfo;
 import com.xgimi.gimicinema.ICinemaControl;
-import com.xgimi.gimicinema.ICinemaSMC;
 import com.xgimi.gimicinema.application.FangTangApplication;
 import java.util.ArrayList;
@@ -79,7 +76,6 @@ public class CinemaControlService extends Service {
             return currentState;
         }
-        //TODO 当状态改变时上报服务器状态,开始播放时,启动轮询上报当前状态及时间
         @Override
         public void setCurrentStatus(int state) throws RemoteException {
             Log.d("aidl", "setCurrentStatus: " + state);
@@ -95,15 +91,12 @@ public class CinemaControlService extends Service {
 //                }
                 switch (state) {
                     case 0://空闲
-//                        open();
                         fadeIn();
                         break;
                     case 1://播放
                         fadeOut();
-//                        close();
                         break;
                     case 2://暂停
-//                        open();
                         fadeIn();
                         break;
                 }
@@ -150,7 +143,7 @@ public class CinemaControlService extends Service {
         @Override
         public void run() {
             setLightValue(value);
-            if (value-- == 50) {
+            if (value-- == maxValue) {
                 handler.postDelayed(this, 4 * 1000);
             } else {
                 if (value == 0) {
@@ -161,7 +154,7 @@ public class CinemaControlService extends Service {
                         }
                     }, 3 * 1000);
                 } else {
-                    handler.postDelayed(this, 200);
+                    handler.postDelayed(this, 80);
                 }
             }
         }
@@ -170,12 +163,12 @@ public class CinemaControlService extends Service {
     private Runnable openRunnable = new Runnable() {
         @Override
         public void run() {
-            if (value++ == 0) {
+            if (value++ == 10) {
                 open();
-                handler.postDelayed(this, 4 * 1000);
+                handler.postDelayed(this, 2 * 1000);
             } else {
                 setLightValue(value);
-                if (value != 50) {
+                if (value != maxValue) {
                     handler.postDelayed(this, 200);
                 }
             }
@@ -183,13 +176,12 @@ public class CinemaControlService extends Service {
     };
     private FangTangApplication mApplication;
+    private Context context;
     @Override
     public void onCreate() {
         super.onCreate();
-        if (!mBound) {
-            attemptToBindService();
-        }
+        context = this;
         mApplication = (FangTangApplication) getApplication();
     }
@@ -198,36 +190,6 @@ public class CinemaControlService extends Service {
         return cinemaControl;
     }
-    //由AIDL文件生成的Java类
-    private ICinemaSMC cinemaSMC = null;
-
-    //标志当前与服务端连接状况的布尔值，false为未连接，true为连接中
-    private boolean mBound = false;
-
-
-    private ServiceConnection mServiceConnection = new ServiceConnection() {
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            cinemaSMC = ICinemaSMC.Stub.asInterface(service);
-            mBound = true;
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mBound = false;
-        }
-    };
-
-    /**
-     * 尝试与服务端建立连接
-     */
-    private void attemptToBindService() {
-        Intent intent = new Intent();
-        intent.setPackage("com.qnbar.smc");
-        intent.setAction("com.xgimi.cinemasmc");
-        bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);
-    }
-
 //    private boolean isSMCRun(Context context) {
 //        return isServiceRunning(context, "com.qnbar.smc.service.SMCService");
 //    }
@@ -259,7 +221,7 @@ public class CinemaControlService extends Service {
         int address = 0xFFFF;
         byte[] params = new byte[]{0x01, 0x00, 0x00};
         if (TelinkLightService.Instance().sendCommandNoResponse(opcode, address, params)) {
-//            show("open all success");
+            Log.d("aidl","open all success");
         }
     }
@@ -268,10 +230,12 @@ public class CinemaControlService extends Service {
         int address = 0xFFFF;
         byte[] params = new byte[]{0x00, 0x00, 0x00};
         if (TelinkLightService.Instance().sendCommandNoResponse(opcode, address, params)) {
-//            show("open all success");
+            Log.d("aidl","open all success");
         }
     }
+    private int maxValue = 50;
+
     private void fadeIn() {
         DeviceInfo connectDevice = mApplication.getConnectDevice();
         if (connectDevice == null) {
@@ -280,11 +244,13 @@ public class CinemaControlService extends Service {
         }
         Light byMeshAddress = Lights.getInstance().getByMeshAddress(connectDevice.meshAddress);
         if (byMeshAddress.status == ConnectionStatus.ON) {
+            handler.removeCallbacks(closeRunnable);
             return;
         }
+        maxValue = Utils.getInt(context, "brightness", 50);
 //        int status = mApplication.getConnectDevice().status;
 //        Log.d("status_charge", "fadeIn: " + status);
-        value = 0;
+        value = 10;
         handler.post(openRunnable);
     }
@@ -296,11 +262,14 @@ public class CinemaControlService extends Service {
         }
         Light byMeshAddress = Lights.getInstance().getByMeshAddress(connectDevice.meshAddress);
         if (byMeshAddress.status == ConnectionStatus.OFF) {
+            handler.removeCallbacks(openRunnable);
             return;
         }
+        maxValue = Utils.getInt(context, "brightness", 50);
+
 //        int status = connectDevice.status;
 //        Log.d("status_charge", "fadeOut: " + status);
-        value = 50;
+        value = maxValue;
         handler.post(closeRunnable);
     }
@@ -316,8 +285,8 @@ public class CinemaControlService extends Service {
         TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, true);
-        opcode = (byte) 0xE2;
-        params = new byte[]{0x05, (byte) value};
-        TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, true);
+//        opcode = (byte) 0xE2;
+//        params = new byte[]{0x05, (byte) value};
+//        TelinkLightService.Instance().sendCommandNoResponse(opcode, addr, params, true);
     }
 }
--- a/gimiCinema/src/main/res/layout/activity_device_setting.xml
View file @d2f4c81
+++ b/gimiCinema/src/main/res/layout/activity_device_setting.xml
View file @d2f4c81
@@ -15,138 +15,148 @@
   -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <!-- Brightness -->
-
-        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
             android:orientation="vertical">
-            <TextView
+        <!-- Brightness -->
+
+        <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:text="亮度" />
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:orientation="vertical">
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:id="@+id/brightnessTv"
+                    android:text="亮度"/>
             <SeekBar
-                android:id="@+id/sb_brightness"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:max="100"
-                android:padding="5dp"
-                android:progress="10" />
+                    android:id="@+id/sb_brightness"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:max="100"
+                    android:padding="5dp"
+                    android:progress="10"/>
         </LinearLayout>
         <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/gray" />
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray"/>
         <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/gray" />
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray"/>
         <!-- Temperature -->
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
-            android:orientation="vertical">
-
-            <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:text="色温" />
+                android:layout_marginLeft="5dp"
+                android:layout_marginRight="5dp"
+                android:orientation="vertical">
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="5dp"
+                    android:id="@+id/temperatureTv"
+                    android:text="色温"/>
             <SeekBar
-                android:id="@+id/sb_temperature"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:max="100"
-                android:padding="5dp"
-                android:progress="10" />
+                    android:id="@+id/sb_temperature"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:max="100"
+                    android:padding="5dp"
+                    android:progress="10"/>
         </LinearLayout>
+        <TextView android:layout_width="match_parent"
+                  android:padding="15dp"
+                  android:textColor="@android:color/holo_red_dark"
+                  android:layout_marginTop="30dp"
+                  android:layout_height="wrap_content"
+                  android:text="调节亮度进度条可设置开灯时的亮度,10以下表示关闭，调节色温进度条可设置恒定色温，设置后返回即可保存"
+
+        />
         <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/gray" />
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray"/>
         <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/gray" />
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray"/>
         <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:background="@color/gray" />
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="10dp"
+                android:layout_marginTop="10dp"
+                android:background="@color/gray"/>
         <!-- Remove DeviceSchema -->
         <Button
-            android:id="@+id/btn_remove"
-            android:layout_width="match_parent"
-            android:layout_height="46dp"
-            android:layout_margin="10dp"
-            android:background="@color/theme_positive_color"
-            android:text="Remove Device(Kick out)"
-            android:textColor="@android:color/white" />
+                android:id="@+id/btn_remove"
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:layout_margin="10dp"
+                android:background="@color/theme_positive_color"
+                android:text="Remove Device(Kick out)"
+                android:textColor="@android:color/white"/>
         <Button
-            android:id="@+id/btn_delete"
-            android:layout_width="match_parent"
-            android:layout_height="46dp"
-            android:layout_margin="10dp"
-            android:background="@color/theme_positive_color"
-            android:text="Remove Device(Pair Delete)"
-            android:textColor="@android:color/white" />
+                android:id="@+id/btn_delete"
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:layout_margin="10dp"
+                android:background="@color/theme_positive_color"
+                android:text="Remove Device(Pair Delete)"
+                android:textColor="@android:color/white"/>
         <Button
-            android:layout_width="match_parent"
-            android:layout_height="46dp"
-            android:layout_margin="10dp"
-            android:background="@color/theme_positive_color"
-            android:text="change brightness"
-            android:onClick="changeBrightness"
-            android:textColor="@android:color/white" />
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:layout_margin="10dp"
+                android:background="@color/theme_positive_color"
+                android:text="change brightness"
+                android:onClick="changeBrightness"
+                android:textColor="@android:color/white"/>
         <Button
-            android:layout_width="match_parent"
-            android:layout_height="46dp"
-            android:layout_margin="10dp"
-            android:background="@color/theme_positive_color"
-            android:text="change color temperature"
-            android:onClick="changeTemperature"
-            android:textColor="@android:color/white" />
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:layout_margin="10dp"
+                android:background="@color/theme_positive_color"
+                android:text="change color temperature"
+                android:onClick="changeTemperature"
+                android:textColor="@android:color/white"/>
     </LinearLayout>
 </LinearLayout>