add macd判断背离，使用分型和隐形形态实现第二类买卖点

ChanEnum.py

@@ -67,26 +67,45 @@ class Chan_KLC_FX(Enum):
     TOP2 = auto()
     TOP3 = auto()
     TOP4 = auto()
+    TOP5 = auto()
     BOTTOM1 = auto()
     BOTTOM2 = auto()
     BOTTOM3 = auto()
     BOTTOM4 = auto()
+    BOTTOM5 = auto()
     UNKNOWN = auto()
+# 统一的MACD状态枚举，包含所有可能的状态
 class Chan_MACD_STATE(Enum):
-    GW = auto()
-    GWK = auto()
-    UP = auto()
-    DOWN = auto()
-    CROSS0 = auto()
-    UNKNOWN = auto()
-    START = auto()
-    NEAR0 = auto()
+    """MACD状态枚举 - 包含所有可能的状态"""
+    # 穿越状态
+    CROSS0_UP = auto()      # 向上穿越零轴
+    CROSS0_DOWN = auto()    # 向下穿越零轴
+    
+    # 趋势状态
+    NEAR0 = auto()          # 接近零轴
+    
+    # 位置状态
+    HIGH = auto()           # 高位：MACD黄白线离开零轴到高点，能量柱最大开始减弱
+    HIGH_EMPTY = auto()     # 高位空：MACD黄白线处于高位，能量柱衰减，与黄白线形成空间夹角
+    RETURN_ZERO = auto()    # 归零轴：能量柱呈现一根比一根短的排列方式
+    UP = auto()             # 归零轴后的上涨
+    DOWN = auto()           # 归零轴后的下跌
+    # 基础状态
+    UNKNOWN = auto()        # 未知
+    START = auto()          # 开始
 class Chan_MACDSEG_DIR(Enum):
     ABOVE = auto()
     UNDER = auto()
+class Chan_MACDUNITTF_TYPE(Enum):
+    START = auto()
+    CROSS0 = auto()
+    NEAR0 = auto()
 class Chan_MACDHISTSET_DIR(Enum):
     ABOVE = auto()
     UNDER = auto()
+class Chan_MACDUNITTF_DIR(Enum):
+    ABOVE = auto()
+    UNDER = auto()
 class Chan_MACDHIST_STATE(Enum):
     UP = auto()
     DOWN = auto()