修改SolidAnalyze，加入多级别分析

Former-commit-id: c5add483ce9ebf5d4758a3c93c52cd7a6fed8672

chan/analyze.py

@@ -508,8 +508,13 @@ class SolidAnalyze:
         last_xd = ka.xd[-1]
         if last_xd['fx_mark'] == 'd':
             zs_g = min([x['xd'] for x in ka.xd[-6:-1] if x['fx_mark'] == "g"])
+            zs_d = max([x['xd'] for x in ka.xd[-6:-1] if x['fx_mark'] == "d"])
         else:
             zs_g = min([x['xd'] for x in ka.xd[-5:] if x['fx_mark'] == "g"])
+            zs_d = max([x['xd'] for x in ka.xd[-5:] if x['fx_mark'] == "d"])
+
+        if zs_d > zs_g:
+            return False, None
 
         b = False
         detail = {
@@ -554,10 +559,15 @@ class SolidAnalyze:
 
         last_xd = ka.xd[-1]
         if last_xd['fx_mark'] == 'g':
+            zs_g = min([x['xd'] for x in ka.xd[-6:-1] if x['fx_mark'] == "g"])
             zs_d = max([x['xd'] for x in ka.xd[-6:-1] if x['fx_mark'] == "d"])
         else:
+            zs_g = min([x['xd'] for x in ka.xd[-5:] if x['fx_mark'] == "g"])
             zs_d = max([x['xd'] for x in ka.xd[-5:] if x['fx_mark'] == "d"])
 
+        if zs_d > zs_g:
+            return False, None
+
         b = False
         detail = {
             "操作提示": freq + "三卖",