Browse Source

no message

xiaobai 1 week ago
parent
commit
552ac47ab2
29 changed files with 107 additions and 212 deletions
  1. 0 8
      lib/main.dart
  2. 49 49
      lib/module/app_service.dart
  3. 1 4
      lib/module/user_service.dart
  4. 0 1
      lib/net/http_config.dart
  5. 0 3
      lib/pages/footprint/blank_journal/controller/blank_journal_ctrl.dart
  6. 0 3
      lib/pages/footprint/blank_journal/page/blank_journal_page.dart
  7. 2 3
      lib/pages/footprint/blank_journal/page/journal_detail_page.dart
  8. 2 3
      lib/pages/my/lately_record/page/record_detail_page.dart
  9. 7 43
      lib/pages/my/login/page/login_page.dart
  10. 0 3
      lib/pages/my/main/controller/mine_ctrl.dart
  11. 0 1
      lib/pages/my/main/controller/personal_info_ctrl.dart
  12. 3 4
      lib/pages/my/mood_analysis/view/mood_record_list_cell.dart
  13. 0 1
      lib/pages/my/setting/page/about_page.dart
  14. 15 15
      lib/pages/my/setting/page/feedback_page.dart
  15. 0 1
      lib/pages/my/setting/page/privacy_setting_page.dart
  16. 0 1
      lib/pages/my/setting/page/setting_page.dart
  17. 0 20
      lib/pages/my/vip/page/vip_buy_page.dart
  18. 0 1
      lib/pages/today/continue_practice/page/continue_practice_page.dart
  19. 13 2
      lib/pages/today/main/controller/home_ctrl.dart
  20. 0 1
      lib/pages/today/mood_record/controller/mood_choose_ctrl.dart
  21. 0 2
      lib/pages/today/mood_record/controller/mood_reason_ctrl.dart
  22. 0 3
      lib/pages/today/mood_record/controller/mood_text_ctrl.dart
  23. 0 2
      lib/pages/today/mood_record/controller/mood_type_ctrl.dart
  24. 0 1
      lib/pages/today/mood_record/view/mood_bar_view.dart
  25. 0 2
      lib/pages/today/practice/page/practice_detail_page.dart
  26. 0 4
      lib/pages/today/practice_assess/controller/exam_ctrl.dart
  27. 2 2
      ohos/build-profile.json5
  28. 12 28
      pubspec.lock
  29. 1 1
      pubspec.yaml

+ 0 - 8
lib/main.dart

@@ -31,12 +31,6 @@ import 'package:iquokka/utils/app_static.dart';
 import 'package:iquokka/utils/hex_color.dart';
 import 'package:iquokka/utils/toast_utils.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-import 'package:share_plus/share_plus.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-// import 'package:sp_util/sp_util.dart';
-import 'package:umeng_common_sdk/umeng_common_sdk.dart';
-import 'package:universal_platform/universal_platform.dart';
-import 'package:workmanager/workmanager.dart';
 
 import 'common/AC.dart';
 import 'common/LanguagePack.dart';
@@ -374,8 +368,6 @@ class _MyAppState extends State<MyApp> {
   }
 
   void _registerWechatApi() {
-    // registerWxApi(
-    //     appId: WxConstant.appId, universalLink: WxConstant.universalLink);
 
     if (AppService().getLoginDialog()) {
       Fluwx fluwx = Fluwx();

+ 49 - 49
lib/module/app_service.dart

@@ -2,8 +2,8 @@
 import 'package:iquokka/common/AC.dart';
 import 'package:iquokka/common/score_rule_model.dart';
 import 'package:iquokka/module/home_widget_service.dart';
+import 'package:iquokka/module/shared_prefs_util.dart';
 import 'package:iquokka/utils/hex_color.dart';
-import 'package:sp_util/sp_util.dart';
 
 import '../pages/today/main/model/update_tips_model.dart';
 
@@ -44,128 +44,128 @@ class AppService {
   AppService._internal();
 
   isFirstLaunch() {
-    return SpUtil.getBool(spFirstLaunch, defValue: true);
+    return SharedPrefsUtil.getBool(spFirstLaunch, defValue: true);
   }
 
   setLaunch() {
-    SpUtil.putBool(spFirstLaunch, false);
+    SharedPrefsUtil.putBool(spFirstLaunch, false);
   }
 
   isAgreeAgreement() {
-    return SpUtil.getBool(spAgreeAgreement, defValue: false);
+    return SharedPrefsUtil.getBool(spAgreeAgreement, defValue: false);
   }
 
   setAgreeAgreement() {
-    SpUtil.putBool(spAgreeAgreement, true);
+    SharedPrefsUtil.putBool(spAgreeAgreement, true);
   }
 
   isShowGuide() {
-    return SpUtil.getBool(spIsShowGuide, defValue: false);
+    return SharedPrefsUtil.getBool(spIsShowGuide, defValue: false);
   }
 
   setShowGuide() {
-    SpUtil.putBool(spIsShowGuide, true);
+    SharedPrefsUtil.putBool(spIsShowGuide, true);
   }
 
   isPersonalRecommend() {
-    return SpUtil.getBool(spIsPersonalRecommend, defValue: false);
+    return SharedPrefsUtil.getBool(spIsPersonalRecommend, defValue: false);
   }
 
   setPersonalRecommend(bool value) {
-    SpUtil.putBool(spIsPersonalRecommend, value);
+    SharedPrefsUtil.putBool(spIsPersonalRecommend, value);
   }
 
   setPracticeFont(int font) {
-    SpUtil.putInt(spIsPracticeFont, font);
+    SharedPrefsUtil.putInt(spIsPracticeFont, font);
   }
 
   int isPracticeFont() {
-    return SpUtil.getInt(spIsPracticeFont, defValue: 0)??0;
+    return SharedPrefsUtil.getInt(spIsPracticeFont, defValue: 0)??0;
   }
 
   setPwdLock(String password) {
-    SpUtil.putString(spPwdLock, password);
+    SharedPrefsUtil.putString(spPwdLock, password);
   }
 
   String getPwdLock() {
-    return SpUtil.getString(spPwdLock, defValue: "")??"";
+    return SharedPrefsUtil.getString(spPwdLock, defValue: "")??"";
   }
 
   setSentenceBg(int bg) {
-    SpUtil.putInt(spSentenceBg, bg);
+    SharedPrefsUtil.putInt(spSentenceBg, bg);
     HomeWidgetService().updateWidgetSentenceBg();
   }
 
   void setSentenceSlideGuide(bool isShow) {
-    SpUtil.putBool(spSentenceSlideGuide, isShow);
+    SharedPrefsUtil.putBool(spSentenceSlideGuide, isShow);
   }
 
   bool getSentenceSlideGuide() {
-    return SpUtil.getBool(spSentenceSlideGuide, defValue: true)??true;
+    return SharedPrefsUtil.getBool(spSentenceSlideGuide, defValue: true)??true;
   }
 
   int getSentenceBg() {
-    return SpUtil.getInt(spSentenceBg, defValue: 1)??1;
+    return SharedPrefsUtil.getInt(spSentenceBg, defValue: 1)??1;
   }
 
   int getThemeMode() {
-    return SpUtil.getInt(spThemeMode, defValue: 0)??0;
+    return SharedPrefsUtil.getInt(spThemeMode, defValue: 0)??0;
   }
 
   // 设置主题模式, 0跟随系统,1浅色模式,2深色模式
   setThemeMode(int modeType) {
-    SpUtil.putInt(spThemeMode, modeType);
+    SharedPrefsUtil.putInt(spThemeMode, modeType);
     HexColor.reload();
     AC.reload();
     HomeWidgetService().updateWidgetTheme();
   }
 
   void setLoginDialog(bool isShow) {
-    SpUtil.putBool(spLoginDialog, isShow);
+    SharedPrefsUtil.putBool(spLoginDialog, isShow);
   }
 
   bool getLoginDialog() {
-    return SpUtil.getBool(spLoginDialog, defValue: false)??false;
+    return SharedPrefsUtil.getBool(spLoginDialog, defValue: false)??false;
   }
 
   void setIsInitMood(bool isInit) {
-    SpUtil.putBool(spIsInitMood, isInit);
+    SharedPrefsUtil.putBool(spIsInitMood, isInit);
   }
 
   bool getIsInitMood() {
-    return SpUtil.getBool(spIsInitMood, defValue: false)??false;
+    return SharedPrefsUtil.getBool(spIsInitMood, defValue: false)??false;
   }
 
   void setTodayCloseBottomBannerId(List<String> bannerIds) {
-    SpUtil.putStringList(spTodayCloseBannerId, bannerIds);
+    SharedPrefsUtil.putStringList(spTodayCloseBannerId, bannerIds);
   }
 
   List<String> getTodayCloseBottomBannerIds() {
-    return SpUtil.getStringList(spTodayCloseBannerId) ?? [];
+    return SharedPrefsUtil.getStringList(spTodayCloseBannerId) ?? [];
   }
 
   void setTodayCloseTopBannerId(List<String> bannerIds) {
-    SpUtil.putStringList(spTodayCloseTopBannerId, bannerIds);
+    SharedPrefsUtil.putStringList(spTodayCloseTopBannerId, bannerIds);
   }
 
   List<String> getTodayCloseTopBannerIds() {
-    return SpUtil.getStringList(spTodayCloseTopBannerId) ?? [];
+    return SharedPrefsUtil.getStringList(spTodayCloseTopBannerId) ?? [];
   }
 
   void setCurrentDate(String password) {
-    SpUtil.putString(spCurrentDate, password);
+    SharedPrefsUtil.putString(spCurrentDate, password);
   }
 
   String getCurrentDate() {
-    return SpUtil.getString(spCurrentDate, defValue: "")??"";
+    return SharedPrefsUtil.getString(spCurrentDate, defValue: "")??"";
   }
 
   void setVersionUpdateTips(UpdateTipsModel tipsModel) {
-    SpUtil.putObject(spVersionUpdateTips, tipsModel);
+    SharedPrefsUtil.putObject(spVersionUpdateTips, tipsModel);
   }
 
   UpdateTipsModel getVersionUpdateTips() {
-    UpdateTipsModel tipsModel = SpUtil.getObj<UpdateTipsModel?>(spVersionUpdateTips, (v) {
+    UpdateTipsModel tipsModel = SharedPrefsUtil.getObj<UpdateTipsModel?>(spVersionUpdateTips, (v) {
       Map<String, dynamic> converted = {};
       for (var item in v.keys) {
         converted[item.toString()] = v[item];
@@ -177,11 +177,11 @@ class AppService {
   }
 
   void setCurrentVersionUpdateContentTips(UpdateTipsModel tipsModel) {
-    SpUtil.putObject(spCurrentVersionContentTips, tipsModel);
+    SharedPrefsUtil.putObject(spCurrentVersionContentTips, tipsModel);
   }
 
   UpdateTipsModel getCurrentVersionUpdateContentTips() {
-    UpdateTipsModel tipsModel = SpUtil.getObj<UpdateTipsModel?>(spCurrentVersionContentTips, (v) {
+    UpdateTipsModel tipsModel = SharedPrefsUtil.getObj<UpdateTipsModel?>(spCurrentVersionContentTips, (v) {
       Map<String, dynamic> converted = {};
       for (var item in v.keys) {
         converted[item.toString()] = v[item];
@@ -193,11 +193,11 @@ class AppService {
   }
 
   void setAppStoreScoreRule(ScoreRuleModel ruleModel) {
-    SpUtil.putObject(spAppStoreScoreRule, ruleModel);
+    SharedPrefsUtil.putObject(spAppStoreScoreRule, ruleModel);
   }
 
   ScoreRuleModel getAppStoreScoreRule() {
-    ScoreRuleModel ruleModel = SpUtil.getObj<ScoreRuleModel?>(spAppStoreScoreRule, (v) {
+    ScoreRuleModel ruleModel = SharedPrefsUtil.getObj<ScoreRuleModel?>(spAppStoreScoreRule, (v) {
       Map<String, dynamic> converted = {};
       for (var item in v.keys) {
         converted[item.toString()] = v[item];
@@ -209,27 +209,27 @@ class AppService {
   }
 
   void setFootprintHideAiRespond(bool isInit) {
-    SpUtil.putBool(spFootprintHideAiRespond, isInit);
+    SharedPrefsUtil.putBool(spFootprintHideAiRespond, isInit);
   }
 
   bool getFootprintHideAiRespond() {
-    return SpUtil.getBool(spFootprintHideAiRespond, defValue: false)??false;
+    return SharedPrefsUtil.getBool(spFootprintHideAiRespond, defValue: false)??false;
   }
 
   void setHideAiTips(bool isHide) {
-    SpUtil.putBool(spHideAiTips, isHide);
+    SharedPrefsUtil.putBool(spHideAiTips, isHide);
   }
 
   bool getHideAiTips() {
-    return SpUtil.getBool(spHideAiTips, defValue: false)??false;
+    return SharedPrefsUtil.getBool(spHideAiTips, defValue: false)??false;
   }
 
   void setSettingRedPoint(int type) {
-    SpUtil.putInt(spSettingRedPoint, type);
+    SharedPrefsUtil.putInt(spSettingRedPoint, type);
   }
 
   int getSettingRedPoint() {
-    return SpUtil.getInt(spSettingRedPoint, defValue: 0)??0;
+    return SharedPrefsUtil.getInt(spSettingRedPoint, defValue: 0)??0;
   }
 
   // void setSyncAppleHealth(bool isSync) {
@@ -241,35 +241,35 @@ class AppService {
   // }
 
   void setHealthAuthDialog(bool isAuth) {
-    SpUtil.putBool(spHealthAuthDialog, isAuth);
+    SharedPrefsUtil.putBool(spHealthAuthDialog, isAuth);
   }
 
   bool getHealthAuthDialog() {
-    return SpUtil.getBool(spHealthAuthDialog, defValue: false)??false;
+    return SharedPrefsUtil.getBool(spHealthAuthDialog, defValue: false)??false;
   }
 
   void setChatBg(int type) {
-    SpUtil.putInt(spChatBg, type);
+    SharedPrefsUtil.putInt(spChatBg, type);
   }
 
   int getChatBg() {
-    return SpUtil.getInt(spChatBg, defValue: 0)??0;
+    return SharedPrefsUtil.getInt(spChatBg, defValue: 0)??0;
   }
 
   void setHomeChatDialogTips(bool isShow) {
-    SpUtil.putBool(spHomeChatDialogTips, isShow);
+    SharedPrefsUtil.putBool(spHomeChatDialogTips, isShow);
   }
 
   bool getHomeChatDialogTips() {
-    return SpUtil.getBool(spHomeChatDialogTips, defValue: false)??false;
+    return SharedPrefsUtil.getBool(spHomeChatDialogTips, defValue: false)??false;
   }
 
   void setMoreChatDialogTips(bool isShow) {
-    SpUtil.putBool(spMoreChatDialogTips, isShow);
+    SharedPrefsUtil.putBool(spMoreChatDialogTips, isShow);
   }
 
   bool getMoreChatDialogTips() {
-    return SpUtil.getBool(spMoreChatDialogTips, defValue: false)??false;
+    return SharedPrefsUtil.getBool(spMoreChatDialogTips, defValue: false)??false;
   }
 
 

+ 1 - 4
lib/module/user_service.dart

@@ -13,15 +13,12 @@ import 'package:iquokka/pages/main_page.dart';
 import 'package:iquokka/pages/my/login/page/login_page.dart';
 import 'package:iquokka/pages/my/main/model/user_model.dart';
 import 'package:iquokka/utils/toast_utils.dart';
-// import 'package:sp_util/sp_util.dart';
 import 'package:umeng_common_sdk/umeng_common_sdk.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 import '../generated/json/base/json_convert_content.dart';
-import '../utils/app_event.dart';
 import '../utils/tips_dialog.dart';
 import 'app_service.dart';
-import 'home_widget_service.dart';
+
 
 class UserService {
   static final UserService _singleton = UserService._internal();

+ 0 - 1
lib/net/http_config.dart

@@ -1,6 +1,5 @@
 import 'package:dio/dio.dart';
 import 'package:iquokka/module/shared_prefs_util.dart';
-// import 'package:sp_util/sp_util.dart';
 
 import '../utils/app_static.dart';
 

+ 0 - 3
lib/pages/footprint/blank_journal/controller/blank_journal_ctrl.dart

@@ -6,15 +6,12 @@ import 'package:flutter/cupertino.dart';
 import 'package:iquokka/module/shared_prefs_util.dart';
 import 'package:iquokka/utils/app_loading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
-// import 'package:flutter_timezone/flutter_timezone.dart';
 import 'package:get/get.dart';
 import 'package:iquokka/pages/footprint/blank_journal/model/journal_detail_model.dart';
 import 'package:iquokka/pages/today/practice_assess/model/segment_image_model.dart';
 import 'package:iquokka/utils/time_util.dart';
 import 'package:iquokka/utils/time_zone_util.dart';
 import 'package:logger/logger.dart';
-// import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 import '../../../../model/ali_oss_model.dart';
 import '../../../../module/app_service.dart';

+ 0 - 3
lib/pages/footprint/blank_journal/page/blank_journal_page.dart

@@ -17,9 +17,6 @@ import 'package:iquokka/utils/bottom_sheet_dialog.dart';
 import 'package:permission_handler/permission_handler.dart';
 import 'package:photo_view/photo_view.dart';
 import 'package:photo_view/photo_view_gallery.dart';
-// import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
-// import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

+ 2 - 3
lib/pages/footprint/blank_journal/page/journal_detail_page.dart

@@ -11,6 +11,7 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:iquokka/module/app_service.dart';
+import 'package:iquokka/module/shared_prefs_util.dart';
 import 'package:iquokka/pages/footprint/blank_journal/model/journal_detail_model.dart';
 import 'package:iquokka/pages/footprint/blank_journal/page/blank_journal_page.dart';
 import 'package:iquokka/pages/today/practice_assess/model/segment_image_model.dart';
@@ -19,8 +20,6 @@ import 'package:iquokka/utils/base_app_bar.dart';
 import 'package:iquokka/utils/big_photo.dart';
 import 'package:iquokka/utils/hex_color.dart';
 import 'package:iquokka/utils/time_util.dart';
-import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
@@ -1311,7 +1310,7 @@ class _JournalDetailState extends State<JournalDetailPage>
     draftModel.id = widget.journalId;
     draftModel.duration = _detailModel.duration;
     draftModel.recordTime = _detailModel.recordTime;
-    SpUtil.putObject("journal_draft", draftModel);
+    SharedPrefsUtil.putObject("journal_draft", draftModel);
     Get.to(()=> BlankJournalPage(), binding: BlankJournalBinding(), arguments: {"journalType": 2});
   }
 

+ 2 - 3
lib/pages/my/lately_record/page/record_detail_page.dart

@@ -13,6 +13,7 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 // import 'package:flutter_AppLoading/flutter_AppLoading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:iquokka/module/shared_prefs_util.dart';
 import 'package:iquokka/pages/my/lately_record/model/record_detail_model.dart';
 import 'package:iquokka/pages/my/lately_record/view/practice_record_share_view.dart';
 import 'package:iquokka/pages/today/ai_chat/controller/chat_ctrl.dart';
@@ -29,8 +30,6 @@ import 'package:iquokka/utils/base_app_bar.dart';
 import 'package:iquokka/utils/hex_color.dart';
 import 'package:iquokka/utils/image_button.dart';
 import 'package:iquokka/utils/time_util.dart';
-import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
@@ -1301,7 +1300,7 @@ class _RecordDetailState extends State<RecordDetailPage>
     doneModel.useTime = _detailModel.duration??0;
     doneModel.segmentList = segmentList;
     doneModel.recordTime = _detailModel.recordTime;
-    SpUtil.putObject(_userModel.id.toString()+"+"+(_detailModel.type==2?_detailModel.lessonId.toString():_detailModel.practiceId.toString())+"+2", doneModel);
+    SharedPrefsUtil.putObject(_userModel.id.toString()+"+"+(_detailModel.type==2?_detailModel.lessonId.toString():_detailModel.practiceId.toString())+"+2", doneModel);
 
     // 跳转到练习
     if (_detailModel.type == 2) { //系列练习

+ 7 - 43
lib/pages/my/login/page/login_page.dart

@@ -17,7 +17,7 @@ import 'package:iquokka/pages/my/login/page/area_code_page.dart';
 import 'package:iquokka/pages/my/login/page/captcha_page.dart';
 import 'package:iquokka/pages/my/login/page/privacy_policy_page.dart';
 import 'package:iquokka/pages/my/login/page/user_agreement_page.dart';
-import 'package:universal_platform/universal_platform.dart';
+
 import '../../../../common/AC.dart';
 import '../../../../constant/wx_constant.dart';
 import '../../../../net/http_url.dart';
@@ -51,42 +51,10 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
   void initState() {
     super.initState();
 
-    // wxSubscription = fluwx.weChatResponseEventHandler
-    //     .distinct((a, b) => a == b)
-    //     .listen((res) {
-    //   if (res is fluwx.WeChatAuthResponse) {
-    //     UserService().loginByWx(res.code!);
-    //   }
-    // });
-
-    // focusNode.addListener(() {
-    //   if (!focusNode.hasFocus) {
-    //     Future.delayed(Duration(milliseconds: 130), (){
-    //       setState(() {});
-    //     });
-    //   }
-    //   else {
-    //     setState(() {});
-    //   }
-    // });
-
-    if (Platform.isIOS || Platform.isOhos) {
+    _requestAppConfig();
+    _appEnterForegroundEvent = AppEvent.getInstance()?.on<AppEnterForegroundEvent>().listen((event) {
       _requestAppConfig();
-      _appEnterForegroundEvent = AppEvent.getInstance()?.on<AppEnterForegroundEvent>().listen((event) {
-        _requestAppConfig();
-      });
-    }
-    else {
-      isShowWechatLogin = true;
-    }
-
-    //UmengPushSdk.register(UmConstant.iOSAppKey, "AppStore");
-
-    // Future.delayed(Duration(seconds: 1), () {
-    //   if (!AppService().getLoginDialog()) {
-    //     _showAlertDialog();
-    //   }
-    // });
+    });
 
     if (!AppService().getLoginDialog()) {
       Future.delayed(Duration(seconds: 1), () {
@@ -94,6 +62,8 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
       });
     }
     else {
+      // _initWeChat();
+      _registerWechatApi();
       _initWeChat();
     }
   }
@@ -148,7 +118,7 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
     AppLoading.show();
     PackageInfo packageInfo = await PackageInfo.fromPlatform();
     Map<String,dynamic> params = new Map();
-    params["platform"] = Platform.isIOS?"ios":Platform.isOhos?"harmony":"android";
+    params["platform"] = "harmony";
     params["version"] = packageInfo.version;
 
     HttpUtils.get<List<AppConfigModel>>(HttpUrl.app_config_URL, queryParameters: params).then((ret) {
@@ -165,12 +135,6 @@ class _LoginPageState extends State<LoginPage> with SingleTickerProviderStateMix
   }
 
   void _weChatLogin() {
-    // fluwx
-    //     .sendWeChatAuth(
-    //       scope: 'snsapi_userinfo',
-    //       state: 'wechat_sdk_login',
-    //     )
-    //     .then((data) {});
 
     _fluwx.authBy(
         which: NormalAuth(

+ 0 - 3
lib/pages/my/main/controller/mine_ctrl.dart

@@ -11,10 +11,7 @@ import 'package:iquokka/pages/my/main/model/user_stat_model.dart';
 import 'package:iquokka/pages/my/main/page/mine_list_page.dart';
 import 'package:iquokka/utils/app_event.dart';
 import 'package:iquokka/utils/time_util.dart';
-// import 'package:sp_util/sp_util.dart';
 
-import '../../../../common/score_rule_model.dart';
-import '../../../../module/app_service.dart';
 import '../../../../module/shared_prefs_util.dart';
 import '../../../../module/user_service.dart';
 import '../../../../net/http_url.dart';

+ 0 - 1
lib/pages/my/main/controller/personal_info_ctrl.dart

@@ -5,7 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:iquokka/utils/app_loading.dart';
 import 'package:get/get.dart';
 import 'package:image_picker/image_picker.dart';
-// import 'package:sp_util/sp_util.dart';
 
 import '../../../../model/ali_oss_model.dart';
 import '../../../../module/shared_prefs_util.dart';

+ 3 - 4
lib/pages/my/mood_analysis/view/mood_record_list_cell.dart

@@ -10,6 +10,7 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 // import 'package:flutter_AppLoading/flutter_AppLoading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
+import 'package:iquokka/module/shared_prefs_util.dart';
 import 'package:iquokka/module/user_service.dart';
 import 'package:iquokka/pages/my/main/model/user_model.dart';
 import 'package:iquokka/pages/my/mood_analysis/model/mood_model.dart';
@@ -20,8 +21,6 @@ import 'package:iquokka/utils/app_loading.dart';
 import 'package:iquokka/utils/file_utils.dart';
 import 'package:iquokka/utils/hex_color.dart';
 import 'package:iquokka/utils/oss_utils.dart';
-import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';
@@ -1245,7 +1244,7 @@ class _MoodRecordListCellState extends State<MoodRecordListCell>
 
   Future<void> _editMoodRecordClick() async {
 
-    SpUtil.remove("mood_record_draft");
+    SharedPrefsUtil.remove("mood_record_draft");
 
     List<int> reasonIds = [];
     for (MoodRecordsReasonList reason in widget.moodRecords.reasonList??[]) {
@@ -1281,7 +1280,7 @@ class _MoodRecordListCellState extends State<MoodRecordListCell>
       draftModel.recordPhotos = [];
     }
 
-    SpUtil.putObject("mood_record_draft", draftModel);
+    SharedPrefsUtil.putObject("mood_record_draft", draftModel);
     Get.to(()=>MoodChoosePage(), binding: MoodRecordBinding(), arguments: {"recordType": 3});
   }
 

+ 0 - 1
lib/pages/my/setting/page/about_page.dart

@@ -9,7 +9,6 @@ import 'package:get/get.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:iquokka/utils/app_static.dart';
 import 'package:iquokka/utils/hex_color.dart';
-// import 'package:sp_util/sp_util.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 import '../../../../gen_a/A.dart';

+ 15 - 15
lib/pages/my/setting/page/feedback_page.dart

@@ -52,21 +52,21 @@ class _FeedbackPageState extends State<FeedbackPage> {
     String appVersion = packageInfo.version;
 
     DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
-    if (Platform.isIOS) {
-      IosDeviceInfo iosInfo = await deviceInfo.iosInfo;
-      deviceStr = iosInfo.utsname.machine + "; " + iosInfo.systemVersion + "; " + appVersion;
-    }
-    else if (Platform.isAndroid) {
-      AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
-      deviceStr = androidInfo.model + "; " + androidInfo.version.sdkInt.toString() + "; " + appVersion;
-    }
-    else if (Platform.isOhos) {
-      OhosDeviceInfo ohosInfo = await deviceInfo.ohosDeviceInfo;
-      deviceStr = "${ohosInfo.productModel} ${ohosInfo.distributionOSName}; ${ohosInfo.distributionOSVersion}; ${appVersion}";
-      /*
-      BaseDeviceInfo{data: {manufacture: HUAWEI, softwareModel: TLR-AL00, featureVersion: 5, productSeries: TLR, brand: HUAWEI, seniorVersion: 0, buildType: default, buildVersion: 316, distributionOSVersion: 5.1.0, securityPatchTag: 2025/09/01, bootloaderVersion: bootloader, versionId: phone/HUAWEI/HUAWEI/TLR/OpenHarmony-5.0.5.316/TLR-AL00/TLR-AL00/17/5.0.5.165/default, distributionOSName: HarmonyOS, isPhysicalDevice: true, buildUser: default, distributionOSReleaseType: Release, buildTime: 1760317149982, osReleaseType: Release, incrementalVersion: 5.0.5.165, buildRootHash: default, majorVersion: 5, hardwareModel: HL2WNJM, abiList: arm64-v8a, distributionOSApiVersion: 50005, marketName: nova 14, firstApiVersion: 1, deviceType: phone, displayVersion: TLR-AL00 5.1.0.150(SP10C00E140R7P1), buildHost: default, sdkApiVersion: 17, productModel: TLR-AL00, osFullName: OpenHarmony-5.0.5.316}}
-       */
-    }
+    // if (Platform.isIOS) {
+    //   IosDeviceInfo iosInfo = await deviceInfo.iosInfo;
+    //   deviceStr = iosInfo.utsname.machine + "; " + iosInfo.systemVersion + "; " + appVersion;
+    // }
+    // else if (Platform.isAndroid) {
+    //   AndroidDeviceInfo androidInfo = await deviceInfo.androidInfo;
+    //   deviceStr = androidInfo.model + "; " + androidInfo.version.sdkInt.toString() + "; " + appVersion;
+    // }
+    // else if (Platform.isOhos) {
+    //   OhosDeviceInfo ohosInfo = await deviceInfo.ohosDeviceInfo;
+    //   deviceStr = "${ohosInfo.productModel} ${ohosInfo.distributionOSName}; ${ohosInfo.distributionOSVersion}; ${appVersion}";
+    // }
+
+    OhosDeviceInfo ohosInfo = await deviceInfo.ohosDeviceInfo;
+    deviceStr = "${ohosInfo.productModel} ${ohosInfo.distributionOSName}; ${ohosInfo.distributionOSVersion}; ${appVersion}";
 
     Map<String,dynamic> params = new Map();
     params["content"] = _textCtrl.text;

+ 0 - 1
lib/pages/my/setting/page/privacy_setting_page.dart

@@ -11,7 +11,6 @@ import 'package:iquokka/pages/my/main/model/user_model.dart';
 import 'package:iquokka/pages/my/setting/view/privacy_setting_cell.dart';
 import 'package:iquokka/pages/today/pwd_lock/page/pwd_lock_page.dart';
 import 'package:iquokka/utils/hex_color.dart';
-// import 'package:sp_util/sp_util.dart';
 
 import '../../../../gen_a/A.dart';
 import '../../../../utils/base_app_bar.dart';

+ 0 - 1
lib/pages/my/setting/page/setting_page.dart

@@ -14,7 +14,6 @@ import 'package:iquokka/utils/hex_color.dart';
 import 'package:iquokka/utils/time_util.dart';
 import 'package:iquokka/utils/toast_utils.dart';
 import 'package:share_plus/share_plus.dart';
-// import 'package:sp_util/sp_util.dart';
 import 'package:universal_platform/universal_platform.dart';
 import 'package:url_launcher/url_launcher.dart';
 

+ 0 - 20
lib/pages/my/vip/page/vip_buy_page.dart

@@ -1223,25 +1223,6 @@ class _VipBuyState extends State<VipBuyPage>
 
   void _wechatPay(Map bodyMap) async {
 
-    // await payWithWeChat(
-    // appId: bodyMap["appId"],
-    // partnerId: bodyMap["partnerId"],
-    // prepayId: bodyMap["prepayId"],
-    // packageValue: bodyMap["packageValue"],
-    // nonceStr: bodyMap["nonceStr"],
-    // timeStamp: int.parse(bodyMap["timeStamp"]),
-    // sign: bodyMap["sign"]
-    // );
-    // weChatResponseEventHandler.distinct().listen((event) {
-    //   if(event.errCode == 0) { //支付成功
-    //     _updateUserInfo(true);
-    //     _buyVipEventTracking();
-    //   }
-    //   else { //支付失败
-    //     ToastUtil.showMsg(event.errStr??"");
-    //   }
-    // });
-
     await _fluwx.pay(
       which: Payment(
           appId: bodyMap["appId"],
@@ -1264,7 +1245,6 @@ class _VipBuyState extends State<VipBuyPage>
         ToastUtil.showMsg(event.errStr??"");
       }
     });
-
   }
 
   void _updateUserInfo(bool isBack) {

+ 0 - 1
lib/pages/today/continue_practice/page/continue_practice_page.dart

@@ -10,7 +10,6 @@ import 'package:get/get.dart';
 import 'package:iquokka/utils/bottom_sheet_dialog.dart';
 import 'package:iquokka/utils/hex_color.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
-// import 'package:sp_util/sp_util.dart';
 
 import '../../../../module/shared_prefs_util.dart';
 import '../../../../module/user_service.dart';

+ 13 - 2
lib/pages/today/main/controller/home_ctrl.dart

@@ -6,6 +6,7 @@ import 'dart:math';
 // import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:carousel_slider/carousel_controller.dart';
 import 'package:flutter/material.dart';
+import 'package:fluwx/fluwx.dart';
 import 'package:iquokka/utils/app_loading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
@@ -22,11 +23,10 @@ import 'package:iquokka/pages/today/favorite/model/favorite_model.dart';
 import 'package:iquokka/pages/today/main/model/app_config_model.dart';
 import 'package:iquokka/pages/today/main/model/sentence_model.dart';
 import 'package:iquokka/pages/today/pwd_lock/page/pwd_lock_page.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-// import 'package:sp_util/sp_util.dart';
 import 'package:universal_platform/universal_platform.dart';
 import 'package:url_launcher/url_launcher.dart';
 
+import '../../../../constant/wx_constant.dart';
 import '../../../../module/app_service.dart';
 import '../../../../module/shared_prefs_util.dart';
 import '../../../../module/user_service.dart';
@@ -116,6 +116,17 @@ class HomeCtrl extends GetxController {
     _requestBanner(2);
     _requestVersionUpdateTipsData();
     _requestAppConfig();
+
+    // 一下代码是临时用的,后续可以删除
+    if (!AppService().getLoginDialog()) {
+      AppService().setLoginDialog(true);
+      Fluwx fluwx = Fluwx();
+      fluwx.registerApi(
+        appId: WxConstant.appId,
+        universalLink: WxConstant.universalLink,
+      );
+    }
+
   }
 
   @override

+ 0 - 1
lib/pages/today/mood_record/controller/mood_choose_ctrl.dart

@@ -10,7 +10,6 @@ import 'package:iquokka/module/user_service.dart';
 import 'package:iquokka/pages/today/mood_record/model/mood_record_draft_model.dart';
 import 'package:iquokka/utils/file_utils.dart';
 import 'package:iquokka/utils/time_util.dart';
-// import 'package:sp_util/sp_util.dart';
 import 'package:flutter_datetime_picker_plus/flutter_datetime_picker_plus.dart' as picker;
 import 'package:universal_platform/universal_platform.dart';
 

+ 0 - 2
lib/pages/today/mood_record/controller/mood_reason_ctrl.dart

@@ -9,9 +9,7 @@ import 'package:iquokka/gen_a/A.dart';
 import 'package:iquokka/module/user_service.dart';
 import 'package:iquokka/pages/my/main/model/user_model.dart';
 import 'package:iquokka/pages/today/mood_record/view/mood_reason_cell.dart';
-// import 'package:sp_util/sp_util.dart';
 
-import '../../../../common/AC.dart';
 import '../../../../module/shared_prefs_util.dart';
 import '../../../../net/http_url.dart';
 import '../../../../net/http_utils.dart';

+ 0 - 3
lib/pages/today/mood_record/controller/mood_text_ctrl.dart

@@ -24,10 +24,7 @@ import 'package:iquokka/utils/file_utils.dart';
 import 'package:iquokka/utils/health_kit_utils.dart';
 import 'package:iquokka/utils/oss_utils.dart';
 import 'package:logger/logger.dart';
-// import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
 
-//import '../../../../model/ali_oss_entity.dart';
 import '../../../../module/shared_prefs_util.dart';
 import '../../../../module/user_service.dart';
 import '../../../../net/http_url.dart';

+ 0 - 2
lib/pages/today/mood_record/controller/mood_type_ctrl.dart

@@ -5,8 +5,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_draggable_gridview/flutter_draggable_gridview.dart';
 import 'package:iquokka/utils/app_loading.dart';
 import 'package:get/get.dart';
-import 'package:iquokka/utils/string_count.dart';
-// import 'package:sp_util/sp_util.dart';
 
 import '../../../../module/shared_prefs_util.dart';
 import '../../../../module/user_service.dart';

+ 0 - 1
lib/pages/today/mood_record/view/mood_bar_view.dart

@@ -6,7 +6,6 @@ import 'package:get/get.dart';
 import 'package:iquokka/pages/today/mood_record/controller/mood_text_ctrl.dart';
 import 'package:iquokka/pages/today/mood_record/controller/mood_type_ctrl.dart';
 import 'package:iquokka/utils/hex_color.dart';
-// import 'package:sp_util/sp_util.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../module/shared_prefs_util.dart';

+ 0 - 2
lib/pages/today/practice/page/practice_detail_page.dart

@@ -25,8 +25,6 @@ import 'package:iquokka/utils/base_app_bar.dart';
 import 'package:iquokka/module/user_service.dart';
 import 'package:iquokka/utils/app_loading.dart';
 import 'package:logger/logger.dart';
-// import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

+ 0 - 4
lib/pages/today/practice_assess/controller/exam_ctrl.dart

@@ -20,10 +20,6 @@ import 'package:iquokka/pages/today/practice_assess/model/segment_image_model.da
 import 'package:iquokka/utils/modal_action_sheet_dialog.dart';
 import 'package:iquokka/utils/tips_dialog.dart';
 import 'package:logger/logger.dart';
-import 'package:permission_handler/permission_handler.dart';
-// import 'package:sp_util/sp_util.dart';
-import 'package:universal_platform/universal_platform.dart';
-// import 'package:wechat_assets_picker/wechat_assets_picker.dart';
 
 import '../../../../model/ali_oss_model.dart';
 import '../../../../module/shared_prefs_util.dart';

+ 2 - 2
ohos/build-profile.json5

@@ -6,9 +6,9 @@
         "type": "HarmonyOS",
         "material": {
           "storeFile": "/Users/xiaobai/Desktop/FlutterAPP/Harmony/profile/p12/ohos.p12",
-          "storePassword": "0000001C7B2480D8AF14BC26E0B40258576981BE5DA31D5755F5997B79E0B41308C31BF0F584ED060D37B0B1",
+          "storePassword": "0000001C0D8F7D0DCA7772551AC009B48AF2D22BC5DAE289A99F234E4A8197CF66D63F473A6390646FA44BA7",
           "keyAlias": "ohosAlias",
-          "keyPassword": "0000001C80D2475AB95D930432958F0869EFF6588550F591E5464A046F69994B109EA45864EEFFB718217191",
+          "keyPassword": "0000001C19EC07244E589C0ED2F5DD149F9C5ADC9E6CBB767AE99CDFAB89EEA18B3A3EBFE4E91CE5A1E5259D",
           "signAlg": "SHA256withECDSA",
           "profile": "/Users/xiaobai/Desktop/FlutterAPP/Harmony/profile/iquokka_release_profileRelease.p7b",
           "certpath": "/Users/xiaobai/Desktop/FlutterAPP/Harmony/profile/iquokka_release.cer"

+ 12 - 28
pubspec.lock

@@ -205,10 +205,10 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
+      sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   csslib:
     dependency: transitive
     description:
@@ -684,10 +684,10 @@ packages:
     dependency: "direct main"
     description:
       name: get
-      sha256: c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425
+      sha256: "5ed34a7925b85336e15d472cc4cfe7d9ebf4ab8e8b9f688585bf6b50f4c3d79a"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.7.2"
+    version: "4.7.3"
   gtk:
     dependency: transitive
     description:
@@ -716,10 +716,10 @@ packages:
     dependency: transitive
     description:
       name: http
-      sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007
+      sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.5.0"
+    version: "1.6.0"
   http_client_helper:
     dependency: transitive
     description:
@@ -1204,10 +1204,10 @@ packages:
     dependency: transitive
     description:
       name: photo_manager
-      sha256: a0d9a7a9bc35eda02d33766412bde6d883a8b0acb86bbe37dac5f691a0894e8a
+      sha256: "99355f3b3591a00416cc787bbf7f04510f672d602814e0063bf4dc40603041f0"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.7.1"
+    version: "3.8.0"
   photo_manager_image_provider:
     dependency: transitive
     description:
@@ -1415,22 +1415,6 @@ packages:
       url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.10.0"
-  sp_util:
-    dependency: "direct main"
-    description:
-      name: sp_util
-      sha256: "9da43dce5de79c17a787d0626bf01538d63090ca32521200d22a232171c495dc"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.0.3"
-  sprintf:
-    dependency: transitive
-    description:
-      name: sprintf
-      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "7.0.0"
   sqflite:
     dependency: transitive
     description:
@@ -1523,10 +1507,10 @@ packages:
     dependency: "direct main"
     description:
       name: umeng_common_sdk
-      sha256: "9eeb24fa1ca5ca1cc331055628aae0438c1eeadd1d6953a9d4e28afe2f2d57cf"
+      sha256: "8374ced1ab1d89f596ff71c0eff044d5395337145c9a69a6be02f5d8a678e42c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.9"
+    version: "1.3.0"
   umeng_push_sdk:
     dependency: "direct main"
     description:
@@ -1621,10 +1605,10 @@ packages:
     dependency: transitive
     description:
       name: uuid
-      sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff
+      sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.5.1"
+    version: "4.5.2"
   vector_graphics:
     dependency: transitive
     description:

+ 1 - 1
pubspec.yaml

@@ -81,7 +81,7 @@ dependencies:
 
   dio: ^4.0.6
   connectivity_plus: ^2.3.4
-  sp_util: ^2.0.3
+#  sp_util: ^2.0.3
   easy_refresh: ^3.4.0
 
   #广播,通知