display-ambient-light/desktop
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases Wiki Activity

chore: 细节调整。#5.

Browse Source
This commit is contained in:
Ivan Li 2023-01-31 16:29:56 +08:00
parent 4e3b765059
commit 5422cca393
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-tauri/src/core/core.rs
View File

@ -184,7 +184,7 @@ impl CoreManager {
if global_sub_pixels.len() >= total_colors_count * 3 { if global_sub_pixels.len() >= total_colors_count * 3 {
let mut colors = vec![]; let mut colors = vec![];
for index in 0..global_sub_pixels.len() { for index in 0..global_sub_pixels.len() {
colors.push(*global_sub_pixels.get(&index).unwrap()); colors.push(*global_sub_pixels.get(&index).unwrap_or(&100));
} }
// info!("{:?}", colors); // info!("{:?}", colors);
global_sub_pixels = HashMap::new(); global_sub_pixels = HashMap::new();

6
src-tauri/src/display/manager.rs
View File

@ -1,5 +1,5 @@
use ddc_hi::Display; use ddc_hi::Display;
use paris::{info, error}; use paris::{error, info};
use tokio::sync::{broadcast, OnceCell}; use tokio::sync::{broadcast, OnceCell};
use crate::{display::Brightness, rpc}; use crate::{display::Brightness, rpc};
@ -26,12 +26,14 @@ impl Manager {
} }
pub async fn subscribe_display_brightness(mut rx: broadcast::Receiver<DisplayBrightness>) { pub async fn subscribe_display_brightness(mut rx: broadcast::Receiver<DisplayBrightness>) {
while let Ok(display_brightness) = rx.recv().await { loop {
if let Ok(display_brightness) = rx.recv().await {
if let Err(err) = Self::set_display_brightness(display_brightness) { if let Err(err) = Self::set_display_brightness(display_brightness) {
error!("set_display_brightness failed. {:?}", err); error!("set_display_brightness failed. {:?}", err);
} }
} }
} }
}
pub fn set_display_brightness(display_brightness: DisplayBrightness) -> anyhow::Result<()> { pub fn set_display_brightness(display_brightness: DisplayBrightness) -> anyhow::Result<()> {
match Display::enumerate().get_mut(display_brightness.display_index) { match Display::enumerate().get_mut(display_brightness.display_index) {

3
src-tauri/src/rpc/mqtt.rs
View File

@ -2,13 +2,12 @@ use crate::display;
use image::EncodableLayout; use image::EncodableLayout;
use paris::warn; use paris::warn;
use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, QoS}; use rumqttc::{AsyncClient, Event, Incoming, MqttOptions, QoS};
use serde::Deserialize;
use std::time::Duration; use std::time::Duration;
use time::{format_description, OffsetDateTime}; use time::{format_description, OffsetDateTime};
use tokio::{sync::broadcast, task}; use tokio::{sync::broadcast, task};
const DISPLAY_TOPIC: &'static str = "display-ambient-light/display"; const DISPLAY_TOPIC: &'static str = "display-ambient-light/display";
const DISPLAY_BRIGHTNESS_TOPIC: &'static str = "display-ambient-light/display/brightness"; const DISPLAY_BRIGHTNESS_TOPIC: &'static str = "display-ambient-light/board/brightness";
pub struct MqttRpc { pub struct MqttRpc {
client: AsyncClient, client: AsyncClient,