Merge branch 'master' of https://github.com/phiree/namename

phiree · Jun 2, 2012 · e925630 · e925630
2 parents 72216fd + 651e4bf
commit e925630
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 60 deletions.
diff --git a/ShopClient/Cash.Designer.cs b/ShopClient/Cash.Designer.cs
diff --git a/ShopClient/Cash.cs b/ShopClient/Cash.cs
@@ -6,14 +6,56 @@
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using NameName.DAL;
+using NameName.Model;
 
 namespace ShopClient
 {
     public partial class Cash : Form
     {
         public Cash()
         {
+            ClientLogin();
             InitializeComponent();
         }
+
+        private void Cash_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private void ClientLogin()
+        {
+
+
+            string strShopId = Properties.Settings.Default.ShopId;
+
+            if (string.IsNullOrEmpty(strShopId))
+            {
+                new ShopSelect().ShowDialog();
+            }
+            else
+            {
+                Guid shopId;
+                Guid.TryParse(strShopId, out shopId);
+                if (shopId != Guid.Empty)
+                {
+                    ShopInfo shop = new DALShopInfo().GetByShopID(shopId);
+                    if (shop == null)
+                    {
+                        new ShopSelect().ShowDialog();
+                    }
+                    else
+                    {
+                        GlobalValue.ShopID = shop.ShopID;
+                        new UserSelect().ShowDialog();
+                    }
+                }
+                else
+                {
+                    new ShopSelect().ShowDialog();
+                }
+            }
+        }
     }
 }
diff --git a/ShopClient/Login.cs b/ShopClient/Login.cs
@@ -42,6 +42,7 @@ private void Login_Load(object sender, EventArgs e)
         private void btnClear_Click(object sender, EventArgs e)
         {
             tbxPwd.Text = string.Empty;
+
         }
 
         private void button4_Click(object sender, EventArgs e)

diff --git a/ShopClient/Program.cs b/ShopClient/Program.cs
@@ -17,55 +17,55 @@ static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-           //InitClient();
+
-            Application.Run(new ShopSelect());
+            Application.Run(new Cash());
         }
         /// <summary>
         /// 之前是否已经选择过.
         /// 是:读取配置信息 直接打开登录界面
         /// 否:打开选择页面
         /// </summary>
-        private static void InitClient()
+        //private static void InitClient()
-        {
+        //{
-            bool HasSelected = false;
+        //    bool HasSelected = false;
-            string strShopId = Properties.Settings.Default.ShopId;
+        //    string strShopId = Properties.Settings.Default.ShopId;
-            Application.Run(new ShopSelect());
+        //    Application.Run(new ShopSelect());
-            return;
+        //    return;
-            if (string.IsNullOrEmpty(strShopId))
+        //    if (string.IsNullOrEmpty(strShopId))
-            {
+        //    {
-                HasSelected = false;
+        //        HasSelected = false;
 
-            }
+        //    }
-            else
+        //    else
-            {
+        //    {
 
-                Guid shopId;
+        //        Guid shopId;
-                Guid.TryParse(strShopId, out shopId);
+        //        Guid.TryParse(strShopId, out shopId);
-                if (shopId != Guid.Empty)
+        //        if (shopId != Guid.Empty)
-                {
+        //        {
-                    ShopInfo shop = new DALShopInfo().GetByShopID(shopId);
+        //            ShopInfo shop = new DALShopInfo().GetByShopID(shopId);
-                    if (shop == null)
+        //            if (shop == null)
-                    {
+        //            {
-                        HasSelected = false;
+        //                HasSelected = false;
-                    }
+        //            }
-                    else
+        //            else
-                    {
+        //            {
-                        HasSelected = true;
+        //                HasSelected = true;
-                        GlobalValue.ShopID = shop.ShopID;
+        //                GlobalValue.ShopID = shop.ShopID;
-                        Application.Run(new Login());
+        //                Application.Run(new Login());
-                    }
+        //            }
-                }
+        //        }
-                else
+        //        else
-                {
+        //        {
-                    HasSelected = false;
+        //            HasSelected = false;
-                }
+        //        }
-            }
+        //    }
-            if (!HasSelected)
+        //    if (!HasSelected)
-            {
+        //    {
-                Application.Run(new ShopSelect());
+        //        Application.Run(new ShopSelect());
 
-            }
+        //    }
 
-        }
+        //}
     }
 }
diff --git a/ShopClient/ShopSelect.Designer.cs b/ShopClient/ShopSelect.Designer.cs
diff --git a/ShopClient/ShopSelect.cs b/ShopClient/ShopSelect.cs
@@ -46,7 +46,7 @@ public void LoadShops(AreaInfo area, TabPage tp)
 
             GridBuilder<ShopInfo> g = new GridBuilder<ShopInfo>(d, new Size(100, 100), tp, 10, 20, 20);
             g.OnBindButtonClick += new GridBuilder<ShopInfo>.BindButtonClick(g_OnBindButtonClick);
-            g.BuildButtons();            
+            g.BuildButtons();
         }
 
         void g_OnBindButtonClick(Button b)
@@ -62,9 +62,8 @@ void btn_Click(object sender, EventArgs e)
             P.Settings.Default.Save();
 
             GlobalValue.ShopID = shop.ShopID;
-
+            this.Close();
             new UserSelect().ShowDialog();
-
         }
 
         private void ShopSelect_Load(object sender, EventArgs e)
@@ -79,7 +78,7 @@ private void label1_Click(object sender, EventArgs e)
 
         private void button1_Click(object sender, EventArgs e)
         {
-            this.Close();
+            Application.Exit();
         }
     }
 }