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

fix(ambient_light): 全局颜色中屏幕顺序问题。

Browse Source
This commit is contained in:
Ivan Li
2023-04-01 15:39:21 +08:00
parent 85a00cf4f2
commit 56137b52a5
6 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src-tauri/src/ambient_light/publisher.rs
View File

@ -10,6 +10,8 @@ use crate::{
screenshot_manager::ScreenshotManager,
};
use itertools::Itertools;
pub struct LedColorsPublisher {
rx: Arc<RwLock<watch::Receiver<Vec<u8>>>>,
tx: Arc<RwLock<watch::Sender<Vec<u8>>>>,
@ -45,15 +47,30 @@ impl LedColorsPublisher {
let configs = config_manager.configs().await;
let channels = screenshot_manager.channels.read().await;
let display_ids = configs
.strips
.iter()
.map(|c| c.display_id)
.unique().collect::<Vec<_>>();
let mut colors_configs = Vec::new();
for (display_id, rx) in channels.iter() {
for display_id in display_ids {
let led_strip_configs: Vec<_> = configs
.strips
.iter()
.filter(|c| c.display_id == *display_id)
.filter(|c| c.display_id == display_id)
.collect();
let rx = channels.get(&display_id);
if rx.is_none() {
warn!("no channel for display_id: {}", display_id);
continue;
}
let rx = rx.unwrap();
if led_strip_configs.len() == 0 {
warn!("no led strip config for display_id: {}", display_id);
continue;
@ -72,14 +89,16 @@ impl LedColorsPublisher {
.collect();
let colors_config = config::SamplePointConfig {
display_id: *display_id,
display_id,
points,
};
colors_configs.push(colors_config);
}
}
let colors = screenshot_manager.get_all_colors(&colors_configs, &configs.mappers, &channels).await;
let colors = screenshot_manager
.get_all_colors(&colors_configs, &configs.mappers, &channels)
.await;
match tx.send(colors) {
Ok(_) => {
// log::info!("colors updated");