diff --git a/.gitignore b/.gitignore index 49cdc25..467870f 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ android/gradlew android/gradlew.bat .dart_tool/ + diff --git a/.travis.yml b/.travis.yml index 8877222..7278db2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,4 @@ script: - ./flutter/bin/flutter test cache: directories: - - $HOME/.pub-cache \ No newline at end of file + - $HOME/.pub-cache diff --git a/LICENSE b/LICENSE index 77aedef..2e45e0f 100644 --- a/LICENSE +++ b/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. - diff --git a/README.md b/README.md index cdb504a..5379eaa 100644 --- a/README.md +++ b/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： diff --git a/README_ZH.md b/README_ZH.md index 58c0cf1..8e2d92b 100644 --- a/README_ZH.md +++ b/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开发者账号，所以暂时没有。 diff --git a/android/build.gradle b/android/build.gradle index 8c879aa..1f744e2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -3,7 +3,6 @@ buildscript { google() jcenter() } - dependencies { classpath 'com.android.tools.build:gradle:3.2.1' } diff --git a/flrs/success.flr b/flrs/success.flr deleted file mode 100644 index 0448b2c..0000000 Binary files a/flrs/success.flr and /dev/null differ diff --git a/images/download.png b/images/download.png new file mode 100644 index 0000000..c5ae20a Binary files /dev/null and b/images/download.png differ diff --git a/intl.sh b/intl.sh index a692ce8..99233d6 100755 --- a/intl.sh +++ b/intl.sh @@ -1,2 +1,2 @@ flutter pub pub run intl_translation:extract_to_arb --output-dir=res/ \lib/i10n/localization_intl.dart -flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/i10n --no-use-deferred-loading lib/i10n/localization_intl.dart res/intl_en_US.arb res/intl_zh_CN.arb +flutter pub pub run intl_translation:generate_from_arb --output-dir=lib/i10n --no-use-deferred-loading lib/i10n/localization_intl.dart res/intl_en_US.arb res/intl_zh_CN.arb \ No newline at end of file diff --git a/ios/ServiceDefinitions.json b/ios/ServiceDefinitions.json index 3c470ca..e79578e 100644 --- a/ios/ServiceDefinitions.json +++ b/ios/ServiceDefinitions.json @@ -1 +1 @@ -{"services":[]} \ No newline at end of file +{"services":[]} diff --git a/lib/widgets/synchronize_widget.dart b/lib/widgets/synchronize_widget.dart index e30c70f..8c2d39c 100644 --- a/lib/widgets/synchronize_widget.dart +++ b/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); - SharedUtil.instance.saveInt(Keys.currentAvatarType, CurrentAvatarType.net); - widget.mainPageModel.currentAvatarUrl = ApiStrategy.baseUrl + loginBean.avatarUrl; - widget.mainPageModel.currentAvatarType = CurrentAvatarType.net; - widget.mainPageModel.logic.getCurrentAvatar(); + String cloudAvatarFileName = loginBean.avatarUrl.split("/").last; + String localAvatarFileName = widget.mainPageModel.currentAvatarUrl.split("/").last; + if(cloudAvatarFileName != localAvatarFileName){ + SharedUtil.instance.saveString(Keys.netAvatarPath, ApiStrategy.baseUrl + loginBean.avatarUrl); + 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, } diff --git a/local_json/icon_json.json b/local_json/icon_json.json index c18ffbf..e4c7760 100644 --- a/local_json/icon_json.json +++ b/local_json/icon_json.json @@ -6895,4 +6895,3 @@ "matchTextDirection": "false" } ] - diff --git a/pubspec.yaml b/pubspec.yaml index b954e47..96f2fa2 100644 --- a/pubspec.yaml +++ b/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: diff --git a/res/intl_en_US.arb b/res/intl_en_US.arb index 36ecc50..7b05940 100644 --- a/res/intl_en_US.arb +++ b/res/intl_en_US.arb @@ -1001,6 +1001,7 @@ "type": "text", "placeholders": {} }, + "pullUpToLoadMore": "pull up load more", "@pullUpToLoadMore": { "description": "上拉加载更多", diff --git a/svgs/icon.svg b/svgs/icon.svg deleted file mode 100644 index 58e3008..0000000 --- a/svgs/icon.svg +++ /dev/null @@ -1,50 +0,0 @@ - - - - 编组 - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/random_test.dart b/test/random_test.dart index c129af3..1bfb38a 100644 --- a/test/random_test.dart +++ b/test/random_test.dart @@ -8,8 +8,6 @@ void main(){ final param = Random().nextInt(3); print("${param}"); } - - print(DateTime.now().toIso8601String()); }); } \ No newline at end of file diff --git a/todo_list.iml b/todo_list.iml index 0a2da09..e5c8371 100644 --- a/todo_list.iml +++ b/todo_list.iml @@ -15,4 +15,4 @@ - + \ No newline at end of file