From 44b18a33aa60c1de02d3b6f71148b3b1b5c56a24 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 25 Jul 2024 22:59:20 +0800
Subject: [PATCH] 1

---
 monitors/move.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/monitors/move.py b/monitors/move.py
index 5ac840d..9e9ff36 100644
--- a/monitors/move.py
+++ b/monitors/move.py
@@ -34,19 +34,23 @@ def stratergy_run(symbol, interval, df, debug):
 
     df['priceCheck'] = (longDiff <= maxDifference) & (midDiff <= maxDifference) & (shortDiff <= maxDifference)
     df['isLongArrangement'] = (df['ema5'] > df['ema10']) & (df['ema10'] > df['ema30']) & (df['ema30']  > df['ema144'])
+    df['isShortArrangement'] = (df['ema5'] < df['ema10']) & (df['ema10'] < df['ema30']) & (df['ema30']  < df['ema144'])
+
 
     d1 = df.iloc[-1] 
     d2 = df.iloc[-2]
     d3 = df.iloc[-3]
 
     isbullish = d1['isLongArrangement'] == True & d2['isLongArrangement'] == False & d1['priceCheck'] == True
-    print(f"{symbol} bullish: {isbullish} | isLongArrangement: {d1['isLongArrangement']} | priceCheck: {d1['priceCheck']}")
-    if(isbullish == True):
+    isBear = d1['isShortArrangement'] == True & d2['isShortArrangement'] == False & d1['priceCheck'] == True
+
+    print(f"{symbol} - {interval} bullish: {isbullish} | bear : {isBear}")
+    if(isbullish | isBear):
         message = f"🦄 信 号 提 醒 🦄\r\n\r\n"
         message += f"策略:【趋势追踪V1.0】\r\n"
         message += f"品种: {symbol}\r\n"
         message += f"周期: {interval}\r\n"
-        message += f"信号: 【多头排列】\r\n"   
+        message += f"信号: 【{"多头排列" if isbullish else "空头排列"}】\r\n"   
 
         dingding.send_message(message, isAtAll=True)
         telegram_sender.send_message(setting.chat_id, message)