fix: 输出信号的 led 顺序问题。

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);

src-tauri/src/picker/screenshot.rs

@@ -41,7 +41,7 @@ impl Screenshot {
                 config.display_width,
                 led_strip_config
                     .global_start_position
-                    .abs_diff(led_strip_config.global_end_position),
+                    .abs_diff(led_strip_config.global_end_position) + 1,
                 5,
             ),
             None => {
@@ -56,7 +56,7 @@ impl Screenshot {
                     config.display_width,
                     led_strip_config
                         .global_start_position
-                        .abs_diff(led_strip_config.global_end_position),
+                        .abs_diff(led_strip_config.global_end_position) + 1,
                     5,
                 );
                 points
@@ -81,7 +81,7 @@ impl Screenshot {
                     config.display_height,
                     led_strip_config
                         .global_start_position
-                        .abs_diff(led_strip_config.global_end_position),
+                        .abs_diff(led_strip_config.global_end_position) + 1,
                     5,
                 );
                 points
@@ -103,7 +103,7 @@ impl Screenshot {
                     config.display_height,
                     led_strip_config
                         .global_start_position
-                        .abs_diff(led_strip_config.global_end_position),
+                        .abs_diff(led_strip_config.global_end_position) + 1,
                     5,
                 );
                 points
@@ -212,23 +212,6 @@ impl Screenshot {
         colors
     }
 
-    pub fn get_top_colors(&self) -> Vec<LedColor> {
-        self.get_one_edge_colors(&self.sample_points.top)
-    }
-
-    pub fn get_top_of_led_start_at(&self) -> usize {
-        self.config
-            .led_strip_of_borders.top
-            .and_then(|c| Some(c.global_start_position))
-            .unwrap_or(0)
-    }
-    pub fn get_top_of_led_end_at(&self) -> usize {
-        self.config
-            .led_strip_of_borders.top
-            .and_then(|c| Some(c.global_end_position))
-            .unwrap_or(0)
-    }
-
     pub async fn to_webp_base64(&self) -> String {
         let bitmap = &self.bitmap;
         let stride = bitmap.len() / self.config.display_height;
@@ -280,6 +263,11 @@ impl Screenshot {
             colors,
         }
     }
+
+
+    pub fn get_config(&self) -> DisplayConfig {
+        self.config
+    }
 }
 
 #[derive(Clone, Serialize, Deserialize, Debug)]

src-tauri/src/rpc/manager.rs

@@ -38,4 +38,18 @@ impl Manager {
             .await
             .map_err(|error| anyhow::anyhow!("mqtt publish failed. {}", error))
     }
+
+    pub async fn publish_led_sub_pixels(&self, payload: Vec<u8>) -> anyhow::Result<()> {
+
+        self.mqtt
+            .client
+            .publish(
+                "display-ambient-light/desktop/colors",
+                rumqttc::QoS::AtLeastOnce,
+                false,
+                payload,
+            )
+            .await
+            .map_err(|error| anyhow::anyhow!("mqtt publish failed. {}", error))
+    }
 }

src/configurator/components/draggable-strip.tsx

@@ -183,8 +183,11 @@ export const DraggableStrip: FC<DraggableStripProp> = ({
       <div
         tw="border border-gray-700 h-3 w-full rounded-full"
         css={css`
-          grid-column-start: ${(config?.global_start_position ?? 0) + 1};
-          grid-column-end: ${(config?.global_end_position ?? 0) + 1};
+          grid-column: ${Math.min(
+              config?.global_start_position ?? 0,
+              config?.global_end_position ?? 0,
+            ) + 1} / span
+            ${Math.abs(config?.global_start_position - config?.global_end_position) + 1};
           grid-row-start: ${index + 1};
           cursor: ew-resize;
           transform: translateX(${boxTranslateX}px);

src/configurator/components/led-strip-editor.tsx

@@ -37,7 +37,7 @@ export const LedStripEditor: FC<LedStripEditorProps> = ({
         });
       }
     } else {
-      onChange?.(new LedStripConfig(0, 0, 1));
+      onChange?.(new LedStripConfig(0, 0, 0));
     }
   }, [config, onChange]);
   const removeLed = useCallback(() => {