From 11ce6e0ecd5ec3f64f28967d1391f4458cd3a27c Mon Sep 17 00:00:00 2001
From: shuaikangzhou <863909694@qq.com>
Date: Wed, 1 Nov 2023 23:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml               | 35 ++++++++++++++++++-------------
 app/Ui/contact/analysis/charts.py |  8 +++++--
 app/Ui/contact/contact.py         |  6 ++++++
 app/Ui/mainview.py                |  1 -
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 806862d..559f772 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,12 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="84e65474-7da9-466d-baf3-cc88dde3ffdd" name="变更" comment="重构一些class，删除一些不必要的文件">
+    <list default="true" id="84e65474-7da9-466d-baf3-cc88dde3ffdd" name="变更" comment="用stackedWidget实现导航栏">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Ui/contact/analysis/charts.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/Ui/contact/analysis/charts.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/Ui/contact/contact.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/Ui/contact/contact.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Ui/mainview.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/Ui/mainview.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Ui/mainwindow.py" beforeDir="false" afterPath="$PROJECT_DIR$/app/Ui/mainwindow.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Ui/mainwindow.ui" beforeDir="false" afterPath="$PROJECT_DIR$/app/Ui/mainwindow.ui" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.spec" beforeDir="false" afterPath="$PROJECT_DIR$/main.spec" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -58,15 +57,15 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;DefaultHtmlFileTemplate&quot;: &quot;HTML File&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Program Files/Python310/Scripts/pyuic5.exe&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settings.ide.settings.new.ui&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "DefaultHtmlFileTemplate": "HTML File",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "last_opened_file_path": "D:/Program Files/Python310/Scripts/pyuic5.exe",
+    "settings.editor.selected.configurable": "preferences.pluginManager"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="D:\Project\PythonProject\WeChatMsg\app\Ui" />
@@ -452,7 +451,14 @@
       <option name="project" value="LOCAL" />
       <updated>1698765961025</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="用stackedWidget实现导航栏">
+      <created>1698850498765</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1698850498765</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="UnknownFeatures">
@@ -508,7 +514,8 @@
     <MESSAGE value="修改部分UI" />
     <MESSAGE value="update readme" />
     <MESSAGE value="重构一些class，删除一些不必要的文件" />
-    <option name="LAST_COMMIT_MESSAGE" value="重构一些class，删除一些不必要的文件" />
+    <MESSAGE value="用stackedWidget实现导航栏" />
+    <option name="LAST_COMMIT_MESSAGE" value="用stackedWidget实现导航栏" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
   </component>
diff --git a/app/Ui/contact/analysis/charts.py b/app/Ui/contact/analysis/charts.py
index 7851afb..0f1d89f 100644
--- a/app/Ui/contact/analysis/charts.py
+++ b/app/Ui/contact/analysis/charts.py
@@ -244,8 +244,12 @@ def sport(username):
                     date.append(t)
         except:
             continue
-    df = pd.DataFrame({'ranks': ranks, 'score': steps, 'date': date}, index=date)
-    months = pd.date_range(date[0], date[-1], freq='M')
+    try:
+        # todo 可能没有运动信息
+        df = pd.DataFrame({'ranks': ranks, 'score': steps, 'date': date}, index=date)
+        months = pd.date_range(date[0], date[-1], freq='M')
+    except:
+        months = []
     tl = Timeline(init_opts=opts.InitOpts(width=f"{charts_width}px", height=f"{charts_height}px"))
     tl.add_schema(is_auto_play=True)
     for i in range(len(months) - 1):
diff --git a/app/Ui/contact/contact.py b/app/Ui/contact/contact.py
index d70f9bd..0e2cd09 100644
--- a/app/Ui/contact/contact.py
+++ b/app/Ui/contact/contact.py
@@ -258,6 +258,12 @@ class ContactController(QWidget, Ui_Dialog):
         pass
 
     def annual_report(self):
+        QMessageBox.warning(
+            self,
+            "提示",
+            "敬请期待"
+        )
+        return
         self.report = report.ReportController(123)
         self.report.show()
 
diff --git a/app/Ui/mainview.py b/app/Ui/mainview.py
index a40e3f0..c38d31d 100644
--- a/app/Ui/mainview.py
+++ b/app/Ui/mainview.py
@@ -27,7 +27,6 @@ class MainWinController(QMainWindow, mainwindow.Ui_MainWindow):
     def __init__(self, username, parent=None):
         super(MainWinController, self).__init__(parent)
         self.setupUi(self)
-        self.setWindowTitle('WeChat')
         self.setWindowIcon(Icon.MainWindow)
         self.Me = data.get_myinfo()
         self.setAttribute(Qt.WA_AttributeCount)