flutter
/
zhiying_comm
4
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 95 Wiki Activity
Browse Source

更新库

tags/0.0.1
PH2 4 years ago
parent
4b2baddce0
commit
6d2e2d1827
14 changed files with 566 additions and 405 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +21
    -11
      .idea/libraries/Dart_SDK.xml
  2. +11
    -11
      .idea/libraries/Flutter_Plugins.xml
  3. +220
    -339
      .idea/workspace.xml
  4. BIN
     
  5. +160
    -0
      android/gradlew
  6. +90
    -0
      android/gradlew.bat
  7. +1
    -1
      example/ios/Podfile.lock
  8. +8
    -8
      example/pubspec.lock
  9. +13
    -1
      lib/pages/login_page/account/bloc/login_account_bloc.dart
  10. +29
    -23
      lib/pages/login_page/account/bloc/login_account_repository.dart
  11. +2
    -2
      lib/pages/login_page/account/login_account_page.dart
  12. +3
    -3
      lib/util/router_util.dart
  13. +3
    -3
      pubspec.lock
  14. +5
    -3
      zhiying_comm.iml

+ 21
- 11
.idea/libraries/Dart_SDK.xml View File

@@ -1,17 +1,27 @@
<component name="libraryTable"> <component name="libraryTable">
<library name="Dart SDK"> <library name="Dart SDK">
<CLASSES> <CLASSES>
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/async" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/collection" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/convert" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/core" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/developer" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/html" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/io" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/isolate" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/math" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/mirrors" />
<root url="file:///Users/fnuser/Documents/flutter-sdk/bin/cache/dart-sdk/lib/typed_data" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/async" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/cli" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/collection" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/convert" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/core" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/developer" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/ffi" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/html" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/indexed_db" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/io" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/isolate" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/js" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/js_util" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/math" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/mirrors" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/svg" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/typed_data" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/wasm" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/web_audio" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/web_gl" />
<root url="file://$USER_HOME$/development/flutter/flutter/bin/cache/dart-sdk/lib/web_sql" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />


+ 11
- 11
.idea/libraries/Flutter_Plugins.xml View File

@@ -2,17 +2,17 @@
<library name="Flutter Plugins" type="FlutterPluginsLibraryType"> <library name="Flutter Plugins" type="FlutterPluginsLibraryType">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$" /> <root url="file://$PROJECT_DIR$" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+7" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.14" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.10" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+3" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2" />
<root url="file://$USER_HOME$/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+7" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_linux-0.0.2+2" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.1+1" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.3" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_native_image-0.0.5+2" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.14" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_linux-0.0.1+2" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/device_info-0.4.2+7" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+3" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.10" />
<root url="file://$USER_HOME$/development/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-4.0.1" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES /> <SOURCES />


+ 220
- 339
.idea/workspace.xml View File

@@ -1,127 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0ff6f366-28dc-4efd-9bca-709f40bc6813" name="Default Changelist" comment="">
<list default="true" id="0ff6f366-28dc-4efd-9bca-709f40bc6813" name="Default Changelist" comment="1、去除状态控制，由widget内部实现">
<change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/libraries/Dart_SDK.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/libraries/Flutter_Plugins.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Podfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Podfile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/pubspec.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/account/bloc/login_account_bloc.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/account/bloc/login_account_bloc.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/account/bloc/login_account_repository.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/account/bloc/login_account_repository.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/account/login_account_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/pages/login_page/account/login_account_page.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/net_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/net_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/router_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/lib/util/router_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/pubspec.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/zhiying_comm.iml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/zhiying_comm.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/zhiying_comm.iml" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/.symlinks/plugins/zhiying_comm/zhiying_comm.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/ios/Podfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/ios/Podfile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/pages/login_page/account/bloc/login_account_bloc.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/login_page/account/bloc/login_account_bloc.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/pages/login_page/account/bloc/login_account_repository.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/login_page/account/bloc/login_account_repository.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/pages/login_page/account/login_account_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/pages/login_page/account/login_account_page.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/util/net_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util/net_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/lib/util/router_util.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/util/router_util.dart" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/zhiying_comm.iml" beforeDir="false" afterPath="$PROJECT_DIR$/zhiying_comm.iml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/zhiying_comm.iml" beforeDir="false" afterPath="$PROJECT_DIR$/zhiying_comm.iml" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.dart_tool/" />
<ignored path="$PROJECT_DIR$/.idea/" />
<ignored path="$PROJECT_DIR$/.pub/" />
<ignored path="$PROJECT_DIR$/build/" />
<ignored path="$PROJECT_DIR$/example/.pub/" />
<ignored path="$PROJECT_DIR$/example/build/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="DefaultGradleProjectSettings"> <component name="DefaultGradleProjectSettings">
<option name="isMigrated" value="true" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="63eb889" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ios/Classes/ZhiyingCommPlugin.m">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="10" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/pages/empty_page.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="13" selection-start-line="13" selection-end-line="13" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/example/lib/main.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/util/widget_factory.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398">
<caret line="52" column="33" selection-start-line="52" selection-start-column="33" selection-end-line="52" selection-end-column="33" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/lib/util/router_util.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="6" column="79" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/models/user/user_info_model.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/models/user/user_info_model_notifier.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="507">
<caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/lib/util/native_util.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/../../flutter-sdk/packages/flutter/lib/src/widgets/basic.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59661">
<caret line="2903" column="8" selection-start-line="2903" selection-start-column="8" selection-end-line="2903" selection-end-column="8" />
</state>
</provider>
</entry>
</file>
</leaf>
<option name="testRunner" value="GRADLE" />
<option name="delegatedBuild" value="true" />
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES"> <option name="RECENT_TEMPLATES">
@@ -130,108 +43,32 @@
</list> </list>
</option> </option>
</component> </component>
<component name="FindInProjectRecents">
<findStrings>
<find>RouterUtil</find>
<find>UserInfoModel</find>
<find>getUserInfoModel</find>
<find>UserInfoNotifier</find>
<find>naviga</find>
</findStrings>
</component>
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="UPDATE_TYPE" value="MERGE" />
</component> </component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pubspec.yaml" />
<option value="$PROJECT_DIR$/lib/pages/login_page.dart" />
<option value="$PROJECT_DIR$/lib/util/router_util.dart" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="13" />
<option name="y" value="23" />
<option name="width" value="1907" />
<option name="height" value="1015" />
</component>
<component name="ProjectId" id="1h581KsASjn69CjCVJFGwinHkAq" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="zhiying_comm" type="b2602c69:ProjectViewProjectNode" />
<item name="zhiying_comm" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="zhiying_comm" type="b2602c69:ProjectViewProjectNode" />
<item name="zhiying_comm" type="462c0819:PsiDirectoryNode" />
<item name="lib" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="zhiying_comm" type="b2602c69:ProjectViewProjectNode" />
<item name="zhiying_comm" type="462c0819:PsiDirectoryNode" />
<item name="lib" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="zhiying_comm" type="b2602c69:ProjectViewProjectNode" />
<item name="zhiying_comm" type="462c0819:PsiDirectoryNode" />
<item name="lib" type="462c0819:PsiDirectoryNode" />
<item name="models" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="zhiying_comm" type="b2602c69:ProjectViewProjectNode" />
<item name="zhiying_comm" type="462c0819:PsiDirectoryNode" />
<item name="lib" type="462c0819:PsiDirectoryNode" />
<item name="pages" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="zhiying_comm" type="b2602c69:ProjectViewProjectNode" />
<item name="zhiying_comm" type="462c0819:PsiDirectoryNode" />
<item name="lib" type="462c0819:PsiDirectoryNode" />
<item name="util" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="AndroidView" />
<pane id="Scope" />
</panes>
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showExcludedFiles" value="true" />
<option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="dart.analysis.tool.window.force.activate" value="false" /> <property name="dart.analysis.tool.window.force.activate" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="io.flutter.reload.alreadyRun" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/lib/pages" />
<property name="show.migrate.to.gradle.popup" value="false" /> <property name="show.migrate.to.gradle.popup" value="false" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/lib/pages" />
</key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/ios/Classes" /> <recent name="$PROJECT_DIR$/ios/Classes" />
</key> </key>
</component> </component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration"> <component name="SvnConfiguration">
<configuration /> <configuration />
</component> </component>
@@ -243,149 +80,193 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1598948275074</updated> <updated>1598948275074</updated>
</task> </task>
<task id="LOCAL-00001" summary="1、网络工具修复">
<created>1599192327092</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1599192327092</updated>
</task>
<task id="LOCAL-00002" summary="1、网日志长度的输出">
<created>1599199250656</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1599199250656</updated>
</task>
<task id="LOCAL-00003" summary="1、去除状态控制，由widget内部实现">
<created>1599448856506</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1599448856506</updated>
</task>
<task id="LOCAL-00004" summary="1、缓存回调的判断。如果为空就不触发">
<created>1599469150650</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1599469150650</updated>
</task>
<task id="LOCAL-00005" summary="1、添加一个同步请求方法">
<created>1599547892464</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1599547892464</updated>
</task>
<task id="LOCAL-00006" summary="1、网络库的修改">
<created>1599824741220</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1599824741220</updated>
</task>
<task id="LOCAL-00007" summary="1、新增用户信息管理provide&#10;2、网络请求post方法新增是否缓存标志">
<created>1600075065844</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1600075065844</updated>
</task>
<task id="LOCAL-00008" summary="1、用户信息的缓存">
<created>1600142697414</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1600142697414</updated>
</task>
<task id="LOCAL-00009" summary="1、login模块移动到comm中">
<created>1600151570591</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1600151570591</updated>
</task>
<task id="LOCAL-00010" summary="1、登陆页面的焦点问题修复">
<created>1600248020491</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1600248020491</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1920" height="1015" extended-state="6" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2113951" />
<window_info id="Captures" order="1" side_tool="true" />
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Image Layers" order="3" />
<window_info id="Designer" order="4" />
<window_info id="Build Variants" order="5" side_tool="true" />
<window_info id="Resources Explorer" order="6" />
<window_info id="Capture Tool" order="7" />
<window_info id="Favorites" order="8" side_tool="true" />
<window_info anchor="bottom" id="Find" />
<window_info anchor="bottom" id="Messages" weight="0.3296582" />
<window_info anchor="bottom" id="Dart Analysis" order="0" weight="0.37375966" />
<window_info anchor="bottom" id="Run" order="1" />
<window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Android Profiler" order="3" show_stripe_button="false" />
<window_info anchor="bottom" id="Logcat" order="4" />
<window_info anchor="bottom" id="Debug" order="5" weight="0.3296582" />
<window_info anchor="bottom" id="Terminal" order="6" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
<window_info anchor="right" id="Capture Analysis" order="1" />
<window_info anchor="right" id="Theme Preview" order="2" />
<window_info anchor="right" id="Flutter Inspector" order="3" />
<window_info anchor="right" id="Flutter Outline" order="4" />
<window_info anchor="right" id="Palette&#9;" order="5" />
<window_info anchor="right" id="Flutter Performance" order="6" />
</layout>
<component name="Vcs.Log.History.Properties">
<option name="COLUMN_ORDER">
<list>
<option value="0" />
<option value="2" />
<option value="3" />
<option value="1" />
</list>
</option>
</component>
<component name="Vcs.Log.Tabs.Properties">
<option name="TAB_STATES">
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
</value>
</entry>
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="1、网络工具修复" />
<MESSAGE value="1、网日志长度的输出" />
<MESSAGE value="1、去除状态控制，由widget内部实现" />
<MESSAGE value="1、缓存回调的判断。如果为空就不触发" />
<MESSAGE value="1、添加一个同步请求方法" />
<MESSAGE value="1、网络库的修改" />
<MESSAGE value="1、新增用户信息管理provide&#10;2、网络请求post方法新增是否缓存标志" />
<MESSAGE value="1、用户信息的缓存" />
<MESSAGE value="1、login模块移动到comm中" />
<MESSAGE value="1、登陆页面的焦点问题修复" />
<option name="LAST_COMMIT_MESSAGE" value="1、登陆页面的焦点问题修复" />
</component> </component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/ios/Classes/HairuyiFlutterCommPlugin.h" />
<entry file="file://$PROJECT_DIR$/ios/Classes/HairuyiFlutterCommPlugin.m" />
<entry file="file://$PROJECT_DIR$/lib/zhiying_comm.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/android/src/main/AndroidManifest.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="63">
<caret line="3" selection-start-line="3" selection-end-line="3" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ios/Classes/ZhiyingCommPlugin.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="84">
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ios/Classes/ZhiyingCommPlugin.m">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="10" selection-start-line="10" selection-end-line="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/example/lib/main.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="16" column="22" selection-start-line="16" selection-start-column="22" selection-end-line="16" selection-end-column="22" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../../flutter-sdk/packages/flutter/lib/src/widgets/basic.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="59661">
<caret line="2903" column="8" selection-start-line="2903" selection-start-column="8" selection-end-line="2903" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/util/widget_factory.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="398">
<caret line="52" column="33" selection-start-line="52" selection-start-column="33" selection-end-line="52" selection-end-column="33" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/models/user/user_info_model.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pubspec.yaml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="26" column="29" selection-start-line="26" selection-start-column="29" selection-end-line="26" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/models/user/user_info_model_notifier.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="507">
<caret line="37" column="15" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/pages/empty_page.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="13" selection-start-line="13" selection-end-line="13" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/util/native_util.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/lib/pages/login_page.dart" />
<entry file="file://$PROJECT_DIR$/lib/util/router_util.dart">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="6" column="79" selection-start-line="6" selection-start-column="79" selection-end-line="6" selection-end-column="79" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<component name="WindowStateProjectService">
<state x="726" y="305" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1600150836312">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="726" y="305" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1600150836312" />
<state x="752" y="262" key="#xdebugger.evaluate" timestamp="1599191875613">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="752" y="262" key="#xdebugger.evaluate/57.23.1863.1057@57.23.1863.1057" timestamp="1599191875613" />
<state x="851" y="324" key="AndroidProcessChooserDialog" timestamp="1600151319877">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="851" y="324" key="AndroidProcessChooserDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1600151319877" />
<state x="598" y="154" key="CommitChangelistDialog2" timestamp="1600248020319">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="598" y="154" key="CommitChangelistDialog2/57.23.1863.1057@57.23.1863.1057" timestamp="1600248020319" />
<state width="606" height="466" key="DebuggerActiveHint" timestamp="1599191800984">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state width="606" height="466" key="DebuggerActiveHint/57.23.1863.1057@57.23.1863.1057" timestamp="1599191800984" />
<state x="158" y="123" width="1663" height="857" key="DiffContextDialog" timestamp="1600247995696">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="157" y="123" width="1664" height="857" key="DiffContextDialog/56.23.1864.1057@56.23.1864.1057" timestamp="1600067734254" />
<state x="158" y="123" width="1663" height="857" key="DiffContextDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1600247995696" />
<state width="1821" height="507" key="GridCell.Tab.0.bottom" timestamp="1600155475390">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state width="1821" height="556" key="GridCell.Tab.0.bottom/56.23.1864.1057@56.23.1864.1057" timestamp="1599288940921" />
<state width="1821" height="507" key="GridCell.Tab.0.bottom/57.23.1863.1057@57.23.1863.1057" timestamp="1600155475390" />
<state width="1821" height="507" key="GridCell.Tab.0.center" timestamp="1600155475390">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state width="1821" height="556" key="GridCell.Tab.0.center/56.23.1864.1057@56.23.1864.1057" timestamp="1599288940921" />
<state width="1821" height="507" key="GridCell.Tab.0.center/57.23.1863.1057@57.23.1863.1057" timestamp="1600155475390" />
<state width="1821" height="507" key="GridCell.Tab.0.left" timestamp="1600155475389">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state width="1821" height="556" key="GridCell.Tab.0.left/56.23.1864.1057@56.23.1864.1057" timestamp="1599288940921" />
<state width="1821" height="507" key="GridCell.Tab.0.left/57.23.1863.1057@57.23.1863.1057" timestamp="1600155475389" />
<state width="1821" height="507" key="GridCell.Tab.0.right" timestamp="1600155475390">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state width="1821" height="556" key="GridCell.Tab.0.right/56.23.1864.1057@56.23.1864.1057" timestamp="1599288940921" />
<state width="1821" height="507" key="GridCell.Tab.0.right/57.23.1863.1057@57.23.1863.1057" timestamp="1600155475390" />
<state x="244" y="118" key="MergeDialog" timestamp="1600347525661">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="244" y="118" key="MergeDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1600347525661" />
<state x="702" y="274" key="MultipleFileMergeDialog" timestamp="1600347529224">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="702" y="274" key="MultipleFileMergeDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1600347529224" />
<state x="589" y="291" key="Vcs.Push.Dialog.v2" timestamp="1600248021732">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="589" y="291" key="Vcs.Push.Dialog.v2/57.23.1863.1057@57.23.1863.1057" timestamp="1600248021732" />
<state x="158" y="123" width="1663" height="857" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog" timestamp="1599189424953">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="158" y="123" width="1663" height="857" key="com.intellij.history.integration.ui.views.DirectoryHistoryDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1599189424953" />
<state x="158" y="123" width="1663" height="857" key="com.intellij.history.integration.ui.views.FileHistoryDialog" timestamp="1599189753273">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="158" y="123" width="1663" height="857" key="com.intellij.history.integration.ui.views.FileHistoryDialog/57.23.1863.1057@57.23.1863.1057" timestamp="1599189753273" />
<state x="779" y="475" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1600347456147">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="778" y="475" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/56.23.1864.1057@56.23.1864.1057" timestamp="1600067652857" />
<state x="779" y="475" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/57.23.1863.1057@57.23.1863.1057" timestamp="1600347456147" />
<state x="656" y="308" width="950" height="486" key="find.popup" timestamp="1599215746645">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state x="656" y="308" width="950" height="486" key="find.popup/57.23.1863.1057@57.23.1863.1057" timestamp="1599215746645" />
<state width="600" height="424" key="javadoc.popup" timestamp="1600138048350">
<screen x="57" y="23" width="1863" height="1057" />
</state>
<state width="600" height="424" key="javadoc.popup/57.23.1863.1057@57.23.1863.1057" timestamp="1600138048350" />
</component> </component>
</project> </project>

BIN
View File


+ 160
- 0
android/gradlew View File

@@ -0,0 +1,160 @@
#!/usr/bin/env bash

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
echo "$*"
}

die ( ) {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
esac

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

+ 90
- 0
android/gradlew.bat View File

@@ -0,0 +1,90 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windowz variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega

+ 1
- 1
example/ios/Podfile.lock View File

@@ -100,4 +100,4 @@ SPEC CHECKSUMS:


PODFILE CHECKSUM: 3dbe063e9c90a5d7c9e4e76e70a821b9e2c1d271 PODFILE CHECKSUM: 3dbe063e9c90a5d7c9e4e76e70a821b9e2c1d271


COCOAPODS: 1.9.3
COCOAPODS: 1.9.1

+ 8
- 8
example/pubspec.lock View File

@@ -7,14 +7,14 @@ packages:
name: _fe_analyzer_shared name: _fe_analyzer_shared
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "7.0.0"
version: "6.0.0"
analyzer: analyzer:
dependency: transitive dependency: transitive
description: description:
name: analyzer name: analyzer
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.39.17"
version: "0.39.14"
archive: archive:
dependency: transitive dependency: transitive
description: description:
@@ -84,14 +84,14 @@ packages:
name: build_runner name: build_runner
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.10.0"
version: "1.10.1"
build_runner_core: build_runner_core:
dependency: transitive dependency: transitive
description: description:
name: build_runner_core name: build_runner_core
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "5.2.0"
version: "6.0.1"
built_collection: built_collection:
dependency: transitive dependency: transitive
description: description:
@@ -133,7 +133,7 @@ packages:
name: cli_util name: cli_util
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.2.0"
version: "0.1.4"
clock: clock:
dependency: transitive dependency: transitive
description: description:
@@ -203,7 +203,7 @@ packages:
name: device_info_platform_interface name: device_info_platform_interface
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.0"
version: "1.0.1"
dio: dio:
dependency: transitive dependency: transitive
description: description:
@@ -217,7 +217,7 @@ packages:
name: equatable name: equatable
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.4"
version: "1.2.5"
file: file:
dependency: transitive dependency: transitive
description: description:
@@ -250,7 +250,7 @@ packages:
name: flutter_cache_manager name: flutter_cache_manager
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.4.1"
version: "1.4.2"
flutter_native_image: flutter_native_image:
dependency: transitive dependency: transitive
description: description:


+ 13
- 1
lib/pages/login_page/account/bloc/login_account_bloc.dart View File

@@ -29,6 +29,11 @@ class LoginAccountBloc extends Bloc<LoginAccountEvent, LoginAccountState> {
if (event is LoginAccountTypeVcodeEvent) { if (event is LoginAccountTypeVcodeEvent) {
yield* _mapLoginTypeVcodeEventToState(event); yield* _mapLoginTypeVcodeEventToState(event);
} }

/// 密码登陆
if(event is LoginAccountTypePasswordEvent){
yield* _mapLoginTypePassEventToState(event);
}
} }


/// 获取数据 /// 获取数据
@@ -59,5 +64,12 @@ class LoginAccountBloc extends Bloc<LoginAccountEvent, LoginAccountState> {
} }


/// 密码登陆 /// 密码登陆
Stream<LoginAccountState> _mapLoginTypePassEventToState(LoginAccountTypePasswordEvent event) async* {}
Stream<LoginAccountState> _mapLoginTypePassEventToState(LoginAccountTypePasswordEvent event) async* {
var result = await repository.loginTypePass(event);
if(!EmptyUtil.isEmpty(result))
yield LoginAccountTypeVcodeLoginSuccessState(model: result);
else
yield LoginAccountTypeVcodeLoginErrorState();

}
} }

+ 29
- 23
lib/pages/login_page/account/bloc/login_account_repository.dart View File

@@ -1,3 +1,5 @@
import 'dart:math';

import 'package:zhiying_comm/pages/login_page/model/login_model.dart'; import 'package:zhiying_comm/pages/login_page/model/login_model.dart';
import 'package:zhiying_comm/util/empty_util.dart'; import 'package:zhiying_comm/util/empty_util.dart';
import 'package:zhiying_comm/util/global_config.dart'; import 'package:zhiying_comm/util/global_config.dart';
@@ -7,53 +9,57 @@ import 'package:zhiying_comm/models/user/user_info_model.dart';
import '../../login_util.dart'; import '../../login_util.dart';
import 'bloc.dart'; import 'bloc.dart';



/// ///
/// 账户登陆 /// 账户登陆
/// ///
class LoginAccountRepository{

class LoginAccountRepository {
/// 获取数据，如果缓存有，则获取缓存的数据 /// 获取数据，如果缓存有，则获取缓存的数据
Future<LoginModel> fetchData() async{
Future<LoginModel> fetchData() async {
var result = await LoginUtil.getLoginModel(); var result = await LoginUtil.getLoginModel();
if(!EmptyUtil.isEmpty(result)){
if (!EmptyUtil.isEmpty(result)) {
return result; return result;
} }
return null; return null;
} }


/// 获取验证码 /// 获取验证码
Future<bool> fetchGetVcode(LoginAccountGetVcodeEvent event) async{
Future<bool> fetchGetVcode(LoginAccountGetVcodeEvent event) async {
print('mobile = ${event.mobile}'); print('mobile = ${event.mobile}');
var result = await NetUtil.post('/api/v1/sign/sms/fast/in', params: {'mobile': event.mobile}); var result = await NetUtil.post('/api/v1/sign/sms/fast/in', params: {'mobile': event.mobile});
if(NetUtil.isSuccess(result)){
if (NetUtil.isSuccess(result)) {
return true; return true;
} }
return false; return false;
} }


/// 密码登陆 /// 密码登陆
Future<bool> loginTypePass(LoginAccountTypePasswordEvent event) async{
// var result = await NetUtil.post('/api/v1/sign/in', params: {'username'});
Future<UserInfoModel> loginTypePass(LoginAccountTypePasswordEvent event) async {
var result = await NetUtil.post('/api/v1/sign/in', params: {'username': event.username, 'password': event.password});
if (NetUtil.isSuccess(result) && !EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])) {
UserInfoModel loginUser = UserInfoModel.fromJson(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
if (null != loginUser) {
loginUser.mobile = event.username;
return loginUser;
}
return null;
}
return null;
} }


/// 验证码登陆 /// 验证码登陆
Future<UserInfoModel> loginTypeVcode(LoginAccountTypeVcodeEvent event) async{
var result = await NetUtil.post('/api/v1/sign/fast/in', params: {'mobile': event.mobile, 'captcha': event.captcha});
if(NetUtil.isSuccess(result) && !EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])){
UserInfoModel loginUser = UserInfoModel.fromJson(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
if(null != loginUser){
loginUser.mobile = event.mobile;
return loginUser;
}
return null;
Future<UserInfoModel> loginTypeVcode(LoginAccountTypeVcodeEvent event) async {
var result = await NetUtil.post('/api/v1/sign/fast/in', params: {'mobile': event.mobile, 'captcha': event.captcha});
if (NetUtil.isSuccess(result) && !EmptyUtil.isEmpty(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA])) {
UserInfoModel loginUser = UserInfoModel.fromJson(result[GlobalConfig.HTTP_RESPONSE_KEY_DATA]);
if (null != loginUser) {
loginUser.mobile = event.mobile;
return loginUser;
} }
return null; return null;
}
return null;
} }


/// 检查验证码 /// 检查验证码
Future<bool> checkVcode(LoginAccountCheckVcodeEvent event) async{

}

}
Future<bool> checkVcode(LoginAccountCheckVcodeEvent event) async {}
}

+ 2
- 2
lib/pages/login_page/account/login_account_page.dart View File

@@ -261,7 +261,7 @@ class _LoginAccountPageContianerState extends State<LoginAccountPageContianer> i
if (current is LoginAccountTypeVcodeLoginSuccessState) { if (current is LoginAccountTypeVcodeLoginSuccessState) {
/// 缓存登陆数据 /// 缓存登陆数据
Provider.of<UserInfoNotifier>(context, listen: false)?.setUserInfo(current.model); Provider.of<UserInfoNotifier>(context, listen: false)?.setUserInfo(current.model);
if (current?.model?.registerInviteCodeEnable == '0') {
if (current?.model?.registerInviteCodeEnable != '1') {
Fluttertoast.showToast(msg: '登陆成功~'); Fluttertoast.showToast(msg: '登陆成功~');
/// 打开也买 /// 打开也买
_openLoginSuccessPage(); _openLoginSuccessPage();
@@ -368,7 +368,7 @@ class _LoginAccountPageContianerState extends State<LoginAccountPageContianer> i
return _getCustomInputWidget( return _getCustomInputWidget(
hint: model?.mobile?.inputMobileHintText ?? '请输入您的手机号', hint: model?.mobile?.inputMobileHintText ?? '请输入您的手机号',
controller: _phoneEdController, controller: _phoneEdController,
focusNode: _passFN,
focusNode: _phoneFN,
onChanged: _onChange, onChanged: _onChange,
hintColor: model?.mobile?.inputHintColor ?? '#999999', hintColor: model?.mobile?.inputHintColor ?? '#999999',
bgColor: model?.mobile?.inputBgColor ?? '#F7F7F7', bgColor: model?.mobile?.inputBgColor ?? '#F7F7F7',


+ 3
- 3
lib/util/router_util.dart View File

@@ -6,11 +6,11 @@ import 'package:provider/provider.dart';
class RouterUtil { class RouterUtil {
static Future route(Map<String, dynamic> model, BuildContext context) async { static Future route(Map<String, dynamic> model, BuildContext context) async {
// 唯一跳转标识 // 唯一跳转标识
String skipIdentifier = model['skip_identifier'].toString();
String skipIdentifier = model['skip_identifier']?.toString();
// 需要登录 // 需要登录
String requiredLogin = model['required_login'].toString();
String requiredLogin = model['required_login']?.toString();
// 需要淘宝授权 // 需要淘宝授权
String requiredTaobaoAuth = model['required_taobao_auth'].toString();
String requiredTaobaoAuth = model['required_taobao_auth']?.toString();


if (skipIdentifier == null || skipIdentifier == '') { if (skipIdentifier == null || skipIdentifier == '') {
print('skipIdentifier 参数不存在，无法跳转页面'); print('skipIdentifier 参数不存在，无法跳转页面');


+ 3
- 3
pubspec.lock View File

@@ -196,7 +196,7 @@ packages:
name: device_info_platform_interface name: device_info_platform_interface
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.0"
version: "1.0.1"
dio: dio:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -210,7 +210,7 @@ packages:
name: equatable name: equatable
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.4"
version: "1.2.5"
file: file:
dependency: transitive dependency: transitive
description: description:
@@ -243,7 +243,7 @@ packages:
name: flutter_cache_manager name: flutter_cache_manager
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.4.1"
version: "1.4.2"
flutter_native_image: flutter_native_image:
dependency: "direct main" dependency: "direct main"
description: description:


+ 5
- 3
zhiying_comm.iml View File

@@ -11,15 +11,17 @@
<excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" /> <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/example/.pub" /> <excludeFolder url="file://$MODULE_DIR$/example/.pub" />
<excludeFolder url="file://$MODULE_DIR$/example/build" /> <excludeFolder url="file://$MODULE_DIR$/example/build" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/fluttertoast/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/fluttertoast/.pub" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/fluttertoast/build" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.dart_tool" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.pub" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/.pub" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/build" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/build" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/.dart_tool" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/.pub" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/.pub" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/build" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/build" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/build/app/intermediates/flutter/debug/flutter_assets/packages" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/build/app/intermediates/merged_assets/debug/out/flutter_assets/packages" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/build/flutter_assets/packages" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/packages" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/packages" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Flutter/App.framework/flutter_assets/packages" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks/plugins/zhiying_comm/example/ios/Flutter/App.framework/flutter_assets/packages" />
<excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/App.framework/flutter_assets/packages" /> <excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/App.framework/flutter_assets/packages" />
</content> </content>


Write Preview
Loading…
Cancel
Save