add code

Author: itdoudoutech

doudou/2020-04-04-greedy-snake/greedy_snake.py

@@ -154,7 +154,7 @@ def run():
             # 按 origin_direction 方向运动
             snake_body.insert(0, list(snake_head))
             # 吃到食物后重新生成
-            if snake_head[0] == food_position[0] and snake_head[1] == food_position[1]:
+            if snake_head == food_position:
                 food_position = create_food()
                 current_score += score
             else:
@@ -174,7 +174,7 @@ def run():
         # 更新分数
         display_message(f"{current_score}/{max_score}", text_color, 30, (pixel * 2, pixel * 2))
         if is_dead:
-            display_message(f"Game Over", text_color, 50, (pixel * 16, pixel * 15))
+            display_message("Game Over", text_color, 50, (pixel * 16, pixel * 15))
         # 控制游戏速度
         time_clock.tick(speed)
 

doudou/2020-04-20-epidemic-big-screen/.DS_Store

@@ -0,0 +1,134 @@
+from flask import Flask, render_template
+import datetime
+import json
+import redis
+import pandas as pd
+
+app = Flask(__name__)
+
+pool = redis.ConnectionPool(host='localhost', port=6379, decode_responses=True)
+r = redis.Redis(connection_pool=pool)
+
+
+@app.route('/')
+def index():
+    return render_template('a.html')
+
+
+@app.route('/global')
+def global_index():
+    context = {
+        'date': get_date(),
+        'statistics_data': json.loads(r.get('foreign_data')),
+        'country_data': get_rank_data(),
+        'article_data': json.loads(r.get('article_data'))
+    }
+    return render_template('global.html', **context)
+
+
+@app.route('/china')
+def china_index():
+    china_data = get_china_data()
+    context = {
+        'date': get_date(),
+        'statistics_data': china_data[0],
+        'country_data': china_data[1],
+        'article_data': json.loads(r.get('article_data'))
+    }
+    return render_template('china.html', **context)
+
+
+def get_date():
+    today = datetime.date.today()
+    yesterday = today + datetime.timedelta(days=-1)
+    return {'today': today.strftime('%Y.%m.%d'), 'yesterday': yesterday.strftime('%m月%d日')}
+
+
+# 国外详细数据
+def get_rank_data():
+    df = pd.DataFrame(json.loads(r.get('rank_data')), columns=['name', 'confirmAdd', 'confirm', 'heal', 'dead'])
+    return df.sort_values('confirm', ascending=False).values.tolist()
+
+
+# 国内详细数据
+def get_china_data():
+    china_data = json.loads(r.get('china_data'))
+    statistics_data = {'nowConfirmAdd': china_data['chinaAdd']['confirm'],
+                       'healAdd': china_data['chinaAdd']['heal'],
+                       'deadAdd': china_data['chinaAdd']['dead'],
+                       'nowConfirm': china_data['chinaTotal']['nowConfirm'],
+                       'confirm': china_data['chinaTotal']['confirm'],
+                       'heal': china_data['chinaTotal']['heal'],
+                       'dead': china_data['chinaTotal']['dead'],
+                       }
+
+    df = pd.DataFrame(china_data['province'],
+                      columns=['name', 'import_abroad', 'now_confirm', 'confirm', 'heal', 'dead'])
+    province_list = df.sort_values('now_confirm', ascending=False).values.tolist()
+
+    return statistics_data, province_list
+
+
+@app.route('/global_top10')
+def get_global_top10():
+    df = pd.DataFrame(json.loads(r.get('rank_data')), columns=['name', 'confirmAdd', 'confirm', 'heal', 'dead'])
+    top10 = df.sort_values('confirmAdd', ascending=True).tail(10)
+    result = {'country': top10['name'].values.tolist(), 'data': top10['confirmAdd'].values.tolist()}
+    return json.dumps(result)
+
+
+@app.route('/global_map')
+def get_global_map():
+    df = pd.DataFrame(json.loads(r.get('rank_data')), columns=['name', 'confirmAdd', 'confirm', 'heal', 'dead'])
+    records = df.to_dict(orient="records")
+    china_data = json.loads(r.get('china_data'))
+    result = {
+        'confirmAdd': [{'name': '中国', 'value': china_data['chinaAdd']['confirm']}],
+        'confirm': [{'name': '中国', 'value': china_data['chinaTotal']['confirm']}],
+        'heal': [{'name': '中国', 'value': china_data['chinaTotal']['heal']}],
+        'dead': [{'name': '中国', 'value': china_data['chinaTotal']['dead']}]
+    }
+
+    for item in records:
+        result['confirmAdd'].append({'name': item['name'], 'value': item['confirmAdd']})
+        result['confirm'].append({'name': item['name'], 'value': item['confirm']})
+        result['heal'].append({'name': item['name'], 'value': item['heal']})
+        result['dead'].append({'name': item['name'], 'value': item['dead']})
+
+    return json.dumps(result)
+
+
+@app.route('/china_top10')
+def get_china_top10():
+    china_data = json.loads(r.get('china_data'))
+    df = pd.DataFrame(china_data['province'],
+                      columns=['name', 'import_abroad', 'now_confirm', 'confirm', 'heal', 'dead'])
+    top10 = df.sort_values('import_abroad', ascending=True).tail(10)
+    result = {'country': top10['name'].values.tolist(), 'data': top10['import_abroad'].values.tolist()}
+    return json.dumps(result)
+
+
+@app.route('/china_map')
+def get_china_map():
+    china_data = json.loads(r.get('china_data'))
+    df = pd.DataFrame(china_data['province'], columns=['name', 'import_abroad', 'now_confirm', 'confirm', 'heal', 'dead'])
+    records = df.to_dict(orient="records")
+    result = {
+        'now_confirm': [],
+        'confirm': [],
+        'heal': [],
+        'dead': []
+    }
+
+    for item in records:
+        result['now_confirm'].append({'name': item['name'], 'value': item['now_confirm']})
+        result['confirm'].append({'name': item['name'], 'value': item['confirm']})
+        result['heal'].append({'name': item['name'], 'value': item['heal']})
+        result['dead'].append({'name': item['name'], 'value': item['dead']})
+
+    return json.dumps(result)
+
+
+if __name__ == '__main__':
+    app.run(host='127.0.0.1', port=5200, debug=True)
+    # print(get_china_data()[1])

doudou/2020-04-20-epidemic-big-screen/application.py

@@ -0,0 +1,93 @@
+"""
+右侧：最新动态
+https://api.inews.qq.com/newsqa/v1/automation/modules/list?modules=FAutoNewsArticleList
+
+左侧：地区柱状图：新增 确诊 死亡
+https://api.inews.qq.com/newsqa/v1/automation/foreign/country/ranklist
+
+
+中间上方：国内：现有确诊 确诊 治愈 死亡 境外输入 无症状感染者 国外：现有确诊 确诊 治愈 死亡
+# 国内数据 https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5
+# 国外数据 https://api.inews.qq.com/newsqa/v1/automation/modules/list?modules=FAutoGlobalStatis
+
+
+中间下方：地图：确诊、治愈、死亡
+# 国内数据：https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5
+# 国外数据：https://api.inews.qq.com/newsqa/v1/automation/foreign/country/ranklist
+
+"""
+
+import requests
+import json
+import redis
+
+header = {
+    'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 Safari/537.36'
+}
+
+pool = redis.ConnectionPool(host='localhost', port=6379, decode_responses=True)
+r = redis.Redis(connection_pool=pool)
+
+
+def pull_data_from_web(url):
+    response = requests.get(url, headers=header)
+    return json.loads(response.text) if response.status_code == 200 else None
+
+
+# 获取最新动态数据
+def get_article_data():
+    data = pull_data_from_web('https://api.inews.qq.com/newsqa/v1/automation/modules/list?modules=FAutoNewsArticleList')
+    if data is None:
+        return ''
+    return [[item['publish_time'], item['url'], item['title']] for item in data['data']['FAutoNewsArticleList']]
+
+
+# 获取各个国家当前【新增、确诊、治愈、死亡】数据
+def get_rank_data():
+    data = pull_data_from_web('https://api.inews.qq.com/newsqa/v1/automation/foreign/country/ranklist')
+    if data is None:
+        return ''
+    return [[item['name'], item['confirmAdd'], item['confirm'], item['heal'], item['dead']] for item in data['data']]
+
+
+# 获取国内统计数据【现有确诊 确诊 治愈 死亡 境外输入 无症状感染者】 & 各省份详细数据（确诊、治愈、死亡）
+def get_china_data():
+    data = pull_data_from_web('https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5')
+    if data is None:
+        return ''
+    dict = json.loads(data['data'])
+    province_res = []
+    for province in dict['areaTree'][0]['children']:
+        name = province['name']
+        now_confirm = province['total']['nowConfirm']
+        confirm = province['total']['confirm']
+        heal = province['total']['heal']
+        dead = province['total']['dead']
+        import_abroad = 0
+        for item in province['children']:
+            if item['name'] == '境外输入':
+                import_abroad = item['total']['confirm']
+                break
+        province_res.append([name, import_abroad, now_confirm, confirm, heal, dead])
+    return {'chinaTotal': dict['chinaTotal'], 'chinaAdd': dict['chinaAdd'], 'province': province_res}
+
+
+# 获取国外统计数据【现有确诊 确诊 治愈 死亡】
+def get_foreign_data():
+    data = pull_data_from_web('https://api.inews.qq.com/newsqa/v1/automation/modules/list?modules=FAutoGlobalStatis')
+    if data is None:
+        return ''
+    return data['data']['FAutoGlobalStatis']
+
+
+article_data = get_article_data()
+r.set('article_data', json.dumps(article_data))
+
+rank_data = get_rank_data()
+r.set('rank_data', json.dumps(rank_data))
+
+china_data = get_china_data()
+r.set('china_data', json.dumps(china_data))
+
+foreign_data = get_foreign_data()
+r.set('foreign_data', json.dumps(foreign_data))