|
|
@@ -29,7 +29,7 @@ import com.kuyuntech.cofarcooking.device.sdk.util.core.CofarSDK
|
|
|
|
|
|
@Route(path = Screens.Setting.BRIGHTNESS)
|
|
|
class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
|
|
|
- private var sn = getSN()
|
|
|
+ private var sn = getSN()
|
|
|
override fun createViewBinding(inflater: LayoutInflater): ActivityBirghtnessBinding {
|
|
|
return ActivityBirghtnessBinding.inflate(layoutInflater)
|
|
|
}
|
|
|
@@ -44,24 +44,26 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
|
|
|
binding.ivClose.setOnClickListener {
|
|
|
finish()
|
|
|
}
|
|
|
- if (sn.startsWith("011")){
|
|
|
+ if (sn.startsWith("011")) {
|
|
|
binding.tvScreenLockTime.visibility = View.INVISIBLE
|
|
|
binding.tvTitle.updateText(getString(com.develop.common.R.string.brightness_011))
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
binding.tvTitle.updateText(getString(com.develop.common.R.string.brightness))
|
|
|
}
|
|
|
- if (baseSn.startsWith("011F")){
|
|
|
- binding.birghtnessLayout.background = resources.getDrawable(com.develop.common.R.drawable.home_bg_011_f)
|
|
|
+ if (baseSn.startsWith("011F")) {
|
|
|
+ binding.birghtnessLayout.background =
|
|
|
+ resources.getDrawable(com.develop.common.R.drawable.home_bg_011_f)
|
|
|
}
|
|
|
|
|
|
- binding.rb3Min.text = " " + resources.getString(com.develop.common.R.string.time_5min)
|
|
|
- binding.rb10Min.text = " " + resources.getString(com.develop.common.R.string.time_10min)
|
|
|
- binding.rb30Min.text = " " + resources.getString(com.develop.common.R.string.time_20min)
|
|
|
+ binding.rb3Min.text = " " + resources.getString(com.develop.common.R.string.time_5min)
|
|
|
+ binding.rb10Min.text = " " + resources.getString(com.develop.common.R.string.time_10min)
|
|
|
+ binding.rb30Min.text = " " + resources.getString(com.develop.common.R.string.time_20min)
|
|
|
|
|
|
binding.ivClose.setVisible()
|
|
|
- binding.ivClose.setImageResource( com.develop.common.R.drawable.ic_close)
|
|
|
+ binding.ivClose.setImageResource(com.develop.common.R.drawable.ic_close)
|
|
|
setScreenManualMode()
|
|
|
binding.sbBrightness.max = 255
|
|
|
+ binding.sbBrightness.min = 0
|
|
|
binding.sbBrightness.progress = getScreenBrightness()
|
|
|
var lastInt = 0
|
|
|
var config = false
|
|
|
@@ -72,7 +74,7 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
|
|
|
|
|
|
binding.sbBrightness.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
|
|
|
override fun onProgressChanged(p0: SeekBar?, p1: Int, p2: Boolean) {
|
|
|
- setScreenBrightness(p1)
|
|
|
+// setScreenBrightness(p1)
|
|
|
}
|
|
|
|
|
|
override fun onStartTrackingTouch(p0: SeekBar?) {
|
|
|
@@ -80,18 +82,26 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
|
|
|
}
|
|
|
|
|
|
override fun onStopTrackingTouch(p0: SeekBar?) {
|
|
|
+ Log.e("TAG Brightness", " onStopTrackingTouch p1:${p0!!.progress}")
|
|
|
+
|
|
|
if (p0 != null) {
|
|
|
- val v = (128 - p0.progress)
|
|
|
- if(v >= 0){
|
|
|
+
|
|
|
+ var progress = p0.progress
|
|
|
+
|
|
|
+ setScreenBrightness(progress)
|
|
|
+
|
|
|
+
|
|
|
+ val v = (128 - progress)
|
|
|
+ if (v >= 0) {
|
|
|
lastInt = v
|
|
|
- if(config){
|
|
|
+ if (config) {
|
|
|
return
|
|
|
}
|
|
|
config = true
|
|
|
ThreadUtils.runOnMainThread({
|
|
|
config = false
|
|
|
CofarSDK.configBrightness(lastInt)
|
|
|
- },1000)
|
|
|
+ }, 1000)
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -117,6 +127,7 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
|
|
|
R.id.rb_3_min -> {
|
|
|
minute = 5
|
|
|
}
|
|
|
+
|
|
|
R.id.rb_10_min -> {
|
|
|
minute = 10
|
|
|
}
|
|
|
@@ -155,29 +166,11 @@ class BrightnessActivity : CommonBindingActivity<ActivityBirghtnessBinding>() {
|
|
|
}
|
|
|
|
|
|
fun setScreenBrightness(brightness: Int) {
|
|
|
- try {
|
|
|
- val resolver = contentResolver
|
|
|
- val uri = Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS)
|
|
|
- resolver.update(uri, ContentValues(1), null, null)
|
|
|
-
|
|
|
- // 设置亮度值
|
|
|
- Settings.System.putInt(resolver, Settings.System.SCREEN_BRIGHTNESS, brightness)
|
|
|
-
|
|
|
- // 设置亮度模式为手动
|
|
|
- Settings.System.putInt(
|
|
|
- resolver,
|
|
|
- Settings.System.SCREEN_BRIGHTNESS_MODE,
|
|
|
- Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL
|
|
|
- )
|
|
|
|
|
|
- // 立即应用设置的亮度值
|
|
|
- val uri2 = Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE)
|
|
|
- resolver.notifyChange(uri2, null)
|
|
|
- Log.d("Brightness", "Screen brightness set to $brightness")
|
|
|
- } catch (e: SettingNotFoundException) {
|
|
|
- Log.e("Brightness", "Cannot access system brightness")
|
|
|
- e.printStackTrace()
|
|
|
- }
|
|
|
+ // 设置屏幕亮度
|
|
|
+ Settings.System.putInt(contentResolver, Settings.System.SCREEN_BRIGHTNESS, brightness)
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
private fun getScreenBrightness(): Int {
|
