From a55db2553bb3f2e68efd1971ef32721d7b8d3a0a Mon Sep 17 00:00:00 2001
From: Ivan Li <ivanli2048@gmail.com>
Date: Mon, 16 Jan 2023 23:39:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BE=93=E5=87=BA=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E7=9A=84=20led=20=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/core/core.rs | 50 ++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/src-tauri/src/core/core.rs b/src-tauri/src/core/core.rs
index 4bbcd88..a4deee6 100644
--- a/src-tauri/src/core/core.rs
+++ b/src-tauri/src/core/core.rs
@@ -116,7 +116,8 @@ impl CoreManager {
             futs.push(fut);
         }
 
-        let total_colors_count = configs.iter()
+        let total_colors_count = configs
+            .iter()
             .flat_map(|c| {
                 vec![
                     c.led_strip_of_borders.top,
@@ -136,36 +137,53 @@ impl CoreManager {
             .collect::<HashSet<_>>()
             .len();
         tokio::spawn(async move {
-            let mut global_colors = HashMap::new();
+            let mut global_sub_pixels = HashMap::new();
             while let Some(screenshot) = rx.recv().await {
                 let start_at = Instant::now();
-                let colors = screenshot.get_top_colors();
-                let start = screenshot
-                    .get_top_of_led_start_at()
-                    .min(screenshot.get_top_of_led_end_at());
-
-                for (index, color) in colors.into_iter().enumerate() {
-                    global_colors.insert(index + start, color);
+                let colors = screenshot.get_colors();
+                let config = screenshot.get_config();
+                for (colors, config) in vec![
+                    (colors.top, config.led_strip_of_borders.top),
+                    (colors.right, config.led_strip_of_borders.right),
+                    (colors.bottom, config.led_strip_of_borders.bottom),
+                    (colors.left, config.led_strip_of_borders.left),
+                ] {
+                    match config {
+                        Some(config) => {
+                            let (sign, start) = if config.global_start_position <= config.global_end_position
+                            {
+                                (1, config.global_start_position as isize * 3)
+                            } else {
+                                (-1, (config.global_start_position as isize + 1)  * 3 - 1)
+                            };
+                            for (index, color) in colors.into_iter().enumerate() {
+                                global_sub_pixels
+                                    .insert((sign * index as isize + start) as usize, color);
+                            }
+                        }
+                        None => {}
+                    }
                 }
 
                 info!(
                     "led count: {}, spend: {:?}",
-                    global_colors.len(),
+                    global_sub_pixels.len(),
                     start_at.elapsed()
                 );
 
-                if global_colors.len() >= total_colors_count {
+                if global_sub_pixels.len() >= total_colors_count * 3 {
                     let mut colors = vec![];
-                    for index in 0..global_colors.len() {
-                        colors.push(*global_colors.get(&index).unwrap());
+                    for index in 0..global_sub_pixels.len() {
+                        colors.push(*global_sub_pixels.get(&index).unwrap());
                     }
-                    global_colors = HashMap::new();
+                    // info!("{:?}", colors);
+                    global_sub_pixels = HashMap::new();
                     match rpc::manager::Manager::global()
-                        .publish_led_colors(&colors)
+                        .publish_led_sub_pixels(colors)
                         .await
                     {
                         Ok(_) => {
-                            info!("publish successful",);
+                            // info!("publish successful",);
                         }
                         Err(error) => {
                             warn!("publish led colors failed. {}", error);