fasfd

app/src/main/java/com/example/blu/toys/activity/SelectTimerActivity.java

@@ -35,8 +35,8 @@ public class SelectTimerActivity extends BaseActivity {
 	Switch musicSwitch;
 	@BindView(R.id.green_switch)
 	Switch greenSwitch;
-	@BindView(R.id.brightness_bar)
-	SeekBar brightnessBar;
+//	@BindView(R.id.brightness_bar)
+//	SeekBar brightnessBar;
 
 	@Override
 	public int getLayout() {
@@ -84,7 +84,7 @@ public class SelectTimerActivity extends BaseActivity {
 		greenSwitch.setChecked(green == 1 ? true : false);
 
 		musicSwitch.setChecked(open == 1 ? true : false);
-		brightnessBar.setProgress(brightness);
+//		brightnessBar.setProgress(brightness);
 
 
 		alarmSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
@@ -116,29 +116,30 @@ public class SelectTimerActivity extends BaseActivity {
 			sendBle();
 		});
 
-		brightnessBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-			@Override
-			public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-				spUtils.putSPValue("brightness", progress);
-				sendBle();
-			}
-
-			@Override
-			public void onStartTrackingTouch(SeekBar seekBar) {
-
-			}
-
-			@Override
-			public void onStopTrackingTouch(SeekBar seekBar) {
-
-			}
-		});
+//		brightnessBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+//			@Override
+//			public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+//				spUtils.putSPValue("brightness", progress);
+//				sendBle();
+//			}
+//
+//			@Override
+//			public void onStartTrackingTouch(SeekBar seekBar) {
+//
+//			}
+//
+//			@Override
+//			public void onStopTrackingTouch(SeekBar seekBar) {
+//
+//			}
+//		});
 
 
 	}
 
 	@Override
 	public void initData() {
+		LogUtils.e("---初始化");
 
 	}
 

app/src/main/java/com/example/blu/toys/app/App.java

@@ -55,7 +55,7 @@ public class App extends Application {
 		spUtils.putSPValue("close",1);
 		spUtils.putSPValue("open",10);
 		spUtils.putSPValue("alarm",1);
-		spUtils.putSPValue("green",1);
+		spUtils.putSPValue("green",0);
 		spUtils.putSPValue("brightness",50);
 	}
 

app/src/main/res/layout/activity_select_timer.xml

@@ -182,50 +182,7 @@
 	</LinearLayout>
 
 
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_below="@+id/center"
-		android:layout_marginLeft="@dimen/dp_20"
-		android:layout_marginTop="@dimen/dp_20"
-		android:layout_marginRight="@dimen/dp_20"
-		android:background="@drawable/black_thumb"
-		android:orientation="horizontal">
-
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="left|center_vertical"
 
-			android:src="@mipmap/sunlight_1" />
-
-
-		<SeekBar
-			android:id="@+id/brightness_bar"
-			style="?android:attr/progressBarStyleHorizontal"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_vertical"
-			android:layout_weight="1"
-			android:max="100"
-			android:maxHeight="3.4dp"
-			android:minHeight="3.4dp"
-			android:paddingTop="10dp"
-			android:paddingBottom="10dp"
-			android:progress="50"
-			android:progressDrawable="@drawable/seekbar_bg"
-			android:splitTrack="false"
-			android:thumb="@drawable/white_thumb" />
-
-
-		<ImageView
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="right|center_vertical"
-
-			android:src="@mipmap/sunlight_2" />
-
-	</LinearLayout>
 
 
 	<LinearLayout