将PlayerIno的参数改为了pub，并测试了sha1生成hash的功能

将PlayerServer的&str改为使用String

2 files changed, 9 insertions, 10 deletions

diff --git a/core/src/pads_player.rs b/core/src/pads_player.rs
index d23ef39..eb9c661 100644
--- a/core/src/pads_player.rs
+++ b/core/src/pads_player.rs
@@ -50,13 +50,13 @@ pub trait PadClientEvent {
 
 /// 玩家信息
 pub struct PlayerInfo {
-    display_name: String,
-    name_hash: String,
+    pub display_name: String,
+    pub name_hash: String,
 
     // 颜色 HSV
-    color_hue: i32, // 0 - 360
-    color_saturation: f64, // 0 - 1
-    color_value: f64 // 0 - 1
+    pub color_hue: i32, // 0 - 360
+    pub color_saturation: f64, // 0 - 1
+    pub color_value: f64 // 0 - 1
 }
 
 impl Default for PlayerInfo {
@@ -89,7 +89,7 @@ impl PlayerInfo {
     /// display_name : 玩家显示名称
     /// id : 玩家 ID
     /// return -> 自身
-    pub fn name(&mut self, display_name: String, id: &String) -> &mut Self {
+    pub fn name(&mut self, display_name: String, id: String) -> &mut Self {
         self.display_name = display_name;
 
         let combined = format!("{}{}{}", &self.display_name, id, SALT);
diff --git a/core/src/pads_server.rs b/core/src/pads_server.rs
index 71f9acd..a9f3acb 100644
--- a/core/src/pads_server.rs
+++ b/core/src/pads_server.rs
@@ -4,7 +4,7 @@ use crate::pads_player::{PlayerInfo, PlayerMessage};
 /// # 监听服务器
 /// 监听服务器用于连接玩家设备，并接收玩家的按键输入
 pub struct PadServer {
-    server_name: &'static str,
+    server_name: String,
     port: u16
 }
 
@@ -14,7 +14,7 @@ impl Default for PadServer {
     /// 创建一个使用默认布局的服务器
     fn default() -> Self {
         PadServer {
-            server_name: "This Is No Pads",
+            server_name: String::from("This Is No Pads"),
             port: 8916
             // TODO :: 补充布局文件
         }
@@ -76,6 +76,5 @@ pub enum ServerMessage {
     Command(String),
     Animation(String),
     Shock(Duration, f64),
-    Kick,
-
+    Kick
 }
\ No newline at end of file