Merge branch 'dev' of https://github.com/asjqkkkk/todo-list-app into dev

.gitignore

@@ -17,3 +17,4 @@ android/gradlew
 android/gradlew.bat
 
 .dart_tool/
+

LICENSE

@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -204,7 +204,7 @@ widgets | custom widgets
 
 Android download link：
 
-![image](https://user-images.githubusercontent.com/30992818/62599610-425c9800-b91f-11e9-8a7d-8c7d6483b524.png)
+![app](https://user-images.githubusercontent.com/30992818/63785102-5f82f600-c922-11e9-9bd7-2f79784fca71.png)
 
 Ios download link：
 

README_ZH.md

@@ -189,7 +189,7 @@ widgets | 封装好的各种Widget
 
 Android 下载地址：
 
-![image](https://user-images.githubusercontent.com/30992818/62599044-c150d100-b91d-11e9-8e63-e9c67dd32995.png)
+![app](https://user-images.githubusercontent.com/30992818/63785102-5f82f600-c922-11e9-9bd7-2f79784fca71.png)
 
 Ios 下载地址：
   目前尚未购买一年99$的ios开发者账号，所以暂时没有。

android/build.gradle

@@ -3,7 +3,6 @@ buildscript {
         google()
         jcenter()
     }
-
     dependencies {
         classpath 'com.android.tools.build:gradle:3.2.1'
     }

lib/widgets/synchronize_widget.dart

@@ -350,11 +350,15 @@ class _SynchronizeWidgetState extends State< SynchronizeWidget> {
           SharedUtil.instance.saveString(Keys.token, loginBean.token);
           SharedUtil.instance.saveBoolean(Keys.hasLogged, true);
           if(loginBean.avatarUrl != null){
-            SharedUtil.instance.saveString(Keys.netAvatarPath, ApiStrategy.baseUrl + loginBean.avatarUrl);
+            String cloudAvatarFileName = loginBean.avatarUrl.split("/").last;
-            SharedUtil.instance.saveInt(Keys.currentAvatarType, CurrentAvatarType.net);
+            String localAvatarFileName = widget.mainPageModel.currentAvatarUrl.split("/").last;
-            widget.mainPageModel.currentAvatarUrl = ApiStrategy.baseUrl + loginBean.avatarUrl;
+            if(cloudAvatarFileName != localAvatarFileName){
-            widget.mainPageModel.currentAvatarType = CurrentAvatarType.net;
+              SharedUtil.instance.saveString(Keys.netAvatarPath, ApiStrategy.baseUrl + loginBean.avatarUrl);
-            widget.mainPageModel.logic.getCurrentAvatar();
+              SharedUtil.instance.saveInt(Keys.currentAvatarType, CurrentAvatarType.net);
+              widget.mainPageModel.currentAvatarUrl = ApiStrategy.baseUrl + loginBean.avatarUrl;
+              widget.mainPageModel.currentAvatarType = CurrentAvatarType.net;
+              widget.mainPageModel.logic.getCurrentAvatar();
+            }
           }
           widget.mainPageModel.currentUserName = loginBean.username;
           ///检测是否需要进行本地与云端的数据同步
@@ -389,7 +393,6 @@ enum SynFlag{
   ///同步云端数据到本地中
   cloudSynchronizing,
 
-
   ///同步失败
   failSynced,
 }

local_json/icon_json.json

@@ -6895,4 +6895,3 @@
     "matchTextDirection": "false"
   }
 ]
-

pubspec.yaml

@@ -74,10 +74,6 @@ dev_dependencies:
   encrypt: ^3.2.0
 
 
-
-# For information on the generic Dart part of this file, see the
-# following page: https://www.dartlang.org/tools/pub/pubspec
-
 # The following section is specific to Flutter.
 flutter:
 

res/intl_en_US.arb

@@ -1001,6 +1001,7 @@
     "type": "text",
     "placeholders": {}
   },
+
   "pullUpToLoadMore": "pull up load more",
   "@pullUpToLoadMore": {
     "description": "上拉加载更多",

svgs/icon.svg

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="150px" height="121px" viewBox="0 0 150 121" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 55 (78076) - https://sketchapp.com -->
-    <title>编组</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M53.5145264,78.03061 L30.1188865,56.3844355 C23.024615,49.8206553 11.9525765,50.2507034 5.38879625,57.3449749 C-1.17498398,64.4392464 -0.744935863,75.5112849 6.34933561,82.0750651 L42.6450758,115.656704 C49.7607062,122.240246 60.8724316,121.784973 67.4256304,114.641388 L145.227727,29.8299992 C151.761255,22.707857 151.28409,11.637749 144.161947,5.10422084 C137.039805,-1.42930728 125.969697,-0.952141317 119.436169,6.17000085 L53.5145264,78.03061 Z" id="path-1"></path>
-        <linearGradient x1="5.8822005%" y1="39.9674805%" x2="124.013784%" y2="39.9674805%" id="linearGradient-3">
-            <stop stop-color="#E4B7A0" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="76.9952039%" y1="29.9631357%" x2="-16.1317766%" y2="29.9631357%" id="linearGradient-4">
-            <stop stop-color="#97D7B2" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="0%" y1="19.7760331%" x2="107.301361%" y2="99.4577817%" id="linearGradient-5">
-            <stop stop-color="#C5B1FF" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="5.3874438%" x2="50%" y2="117.750159%" id="linearGradient-6">
-            <stop stop-color="#8FE3EB" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="-33.3237229%" x2="50%" y2="115.132424%" id="linearGradient-7">
-            <stop stop-color="#FFFFFF" stop-opacity="0.5" offset="0%"></stop>
-            <stop stop-color="#F6C8C8" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="页面1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="icon" transform="translate(-25.000000, -45.000000)">
-            <g id="编组-2" transform="translate(1.000000, 1.000000)">
-                <g id="编组" transform="translate(24.000000, 44.000000)">
-                    <mask id="mask-2" fill="white">
-                        <use xlink:href="#path-1"></use>
-                    </mask>
-                    <use id="蒙版" fill="#FFFFFF" fill-rule="nonzero" xlink:href="#path-1"></use>
-                    <g mask="url(#mask-2)">
-                        <g transform="translate(-32.000000, -36.000000)">
-                            <polygon id="路径-3" fill="url(#linearGradient-3)" points="75 80 204.970998 108.811389 205 0"></polygon>
-                            <polygon id="路径-4" fill="url(#linearGradient-4)" points="5 200 105 200 99.4913945 42 5 80"></polygon>
-                            <polygon id="路径-5" fill="url(#linearGradient-5)" points="205 200 75 80 205 75.322914 205 108.811389"></polygon>
-                            <polygon id="路径-6" fill="url(#linearGradient-6)" points="5 200 205 200 99.4913945 42"></polygon>
-                            <polygon id="路径-2" fill="url(#linearGradient-7)" points="204.970998 75.322914 1.42108547e-14 85.1070565 5 0"></polygon>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

test/random_test.dart

@@ -8,8 +8,6 @@ void main(){
       final param = Random().nextInt(3);
       print("${param}");
     }
-
-
     print(DateTime.now().toIso8601String());
   });
 }