Merge branch 'develop' of http://222.96.13.116/Million into develop

Million Buyer/MainForm.Designer.cs

@@ -28,6 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.cb_UpperMainIndi = new System.Windows.Forms.CheckBox();
             this.cb_IncludeClearIndicator = new System.Windows.Forms.CheckBox();
@@ -87,6 +88,7 @@
             this.bt_BuyStop = new System.Windows.Forms.Button();
             this.bt_BuyStart = new System.Windows.Forms.Button();
             this.lb_BuyFlag = new System.Windows.Forms.Label();
+            this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tl_BuyList)).BeginInit();
@@ -667,6 +669,12 @@
             this.lb_BuyFlag.Size = new System.Drawing.Size(0, 12);
             this.lb_BuyFlag.TabIndex = 21;
             // 
+            // timer1
+            // 
+            this.timer1.Enabled = true;
+            this.timer1.Interval = 60000;
+            this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -766,6 +774,7 @@
         private System.Windows.Forms.Button bt_BuyStop;
         private System.Windows.Forms.Button bt_BuyStart;
         private System.Windows.Forms.Label lb_BuyFlag;
+        private System.Windows.Forms.Timer timer1;
     }
 }
 

Million Buyer/MainForm.cs

@@ -14,6 +14,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -43,6 +44,12 @@ namespace Million_Buyer
         private List<Account> accounts = null;
         private PaymentType payment = PaymentType.KRW;
 
+        private Stopwatch unlimitThreadStopWatch = new Stopwatch();
+        private bool unlimitChecker = false;
+        private long second = 0;
+
+
+
         private int cycleCount = 0;
         private double cycleBuyMoney = 0;
 
@@ -83,6 +90,7 @@ namespace Million_Buyer
             cb_UserList.Items.Add("이찬균");
 
             //cb_UserList.SelectedIndex = 0;
+            unlimitThreadStopWatch.Start();
         }
 
         /// <summary>
@@ -270,6 +278,7 @@ namespace Million_Buyer
             #region Default Setting
             //시간 체크
             var sw = new System.Diagnostics.Stopwatch();
+            unlimitThreadStopWatch.Start();
 
             var dataList = new Dictionary<MCandleTimeType, List<CandleDataList>>();
 
@@ -321,13 +330,13 @@ namespace Million_Buyer
                 InsertLog("Buyer 구동 중..");
 
             var cnt = 0;
-            var boolFlag = false;
             sw.Start();
             #endregion
             while (ThreadFlag)
             {
                 try
                 {
+                    unlimitThreadStopWatch.Restart();
                     if (AliveCheckor)
                     {
                         AliveCheckor = false;
@@ -933,6 +942,24 @@ namespace Million_Buyer
             buyFlag = true;
             lb_BuyFlag.Text = "매수 진행 중";
         }
-    }
-}
 
+        private void timer1_Tick(object sender, EventArgs e)
+        {
+            var milli = unlimitThreadStopWatch.ElapsedMilliseconds;
+            if (milli > 60000)
+            {
+                if (!unlimitChecker)
+                {
+                    InsertLog("무한루프 : 60초 이상 동작 하지 않음");
+                    unlimitChecker = true;
+                }
+            }
+
+            if (second > milli)
+            {
+                unlimitChecker = false;
+            }
+            second = milli;
+        }
+    }
+}

Million Buyer/MainForm.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

Million Buyer/SubForm/IndicatorLoad.Designer.cs

@@ -53,6 +53,8 @@ namespace Million_Buyer.SubForm
             this.tl_Indicator.Cursor = System.Windows.Forms.Cursors.Default;
             this.tl_Indicator.Location = new System.Drawing.Point(12, 12);
             this.tl_Indicator.Name = "tl_Indicator";
+            this.tl_Indicator.OptionsBehavior.Editable = false;
+            this.tl_Indicator.OptionsView.ShowIndicator = false;
             this.tl_Indicator.Size = new System.Drawing.Size(718, 388);
             this.tl_Indicator.TabIndex = 12;
             //