Merge commit 'bd949a21df8d503f94d8f77fd0db7cf5416deae3' into 1.1.1

# Conflicts: # circle_app/android/app/build.gradle # circle_app/lib/app/circle/view.dart # circle_app/lib/app/home/view.dart # circle_app/lib/app/minefragment/view.dart # circle_app/lib/app/msg/TIMUIKitConversation/tim_uikit_conversation.dart # circle_app/lib/app/msg/view.dart # circle_app/lib/network/dio_manager.dart
2023-08-30 15:52:31 +08:00 · 2023-08-30 15:52:31 +08:00 · 4840ed65f9
commit 4840ed65f9
parent 5517eca5f6 bd949a21df
10 changed files with 107 additions and 125 deletions
--- a/circle_app/android/app/build.gradle
+++ b/circle_app/android/app/build.gradle
@ -65,8 +65,8 @@ android {
        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
        minSdkVersion 21
        targetSdkVersion flutter.targetSdkVersion
-        versionCode 110
-        versionName "1.1.0"
+        versionCode 6
+        versionName "1.0.5"
        manifestPlaceholders = [
                vivo_APPID: "105669716",
                vivo_APPKEY:"84f750207787376b310ca5b0d5969122",
--- a/circle_app/android/app/src/main/AndroidManifest.xml
+++ b/circle_app/android/app/src/main/AndroidManifest.xml
@ -79,22 +79,23 @@
                 the Android process has started. This theme is visible to the user
                 while the Flutter UI initializes. After that, this theme continues
                 to determine the Window background behind the Flutter UI. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <meta-data
-                android:name="com.vivo.push.api_key"
-                android:value="84f750207787376b310ca5b0d5969122" />
-            <meta-data
-                android:name="com.vivo.push.app_id"
-                android:value="105669716" />
+

            <intent-filter>
                <action android:name="android.intent.action.MAIN"/>
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>
+        <meta-data
+            android:name="io.flutter.embedding.android.NormalTheme"
+            android:resource="@style/NormalTheme"
+            />
+        <meta-data
+            android:name="com.vivo.push.api_key"
+            android:value="84f750207787376b310ca5b0d5969122" />
+        <meta-data
+            android:name="com.vivo.push.app_id"
+            android:value="105669716" />
        <!-- Don't delete the meta-data below.
             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
        <meta-data
--- a/circle_app/ios/Podfile.lock
+++ b/circle_app/ios/Podfile.lock
@ -90,27 +90,6 @@ PODS:
  - Mantle (2.2.0):
    - Mantle/extobjc (= 2.2.0)
  - Mantle/extobjc (2.2.0)
-  - mob_sharesdk (4.4.15):
-    - mob_sharesdk/ShareSDK (= 4.4.15)
-    - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDK (4.4.15):
-    - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKExtension (4.4.15):
-    - mob_sharesdk/ShareSDK
-    - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.15):
-    - mob_sharesdk/ShareSDK
-    - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.15):
-    - mob_sharesdk/ShareSDK
-    - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKPlatforms/WeChat (4.4.15):
-    - mob_sharesdk/ShareSDK
-    - MOBFoundation (>= 3.2.9)
-  - mob_sharesdk/ShareSDKUI (4.4.15):
-    - mob_sharesdk/ShareSDK
-    - MOBFoundation (>= 3.2.9)
-  - MOBFoundation (3.2.49)
  - package_info_plus (0.4.5):
    - Flutter
  - pasteboard (0.0.1):
@ -136,14 +115,6 @@ PODS:
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - sharesdk_plugin (1.1.7):
-    - Flutter
-    - mob_sharesdk
-    - mob_sharesdk/ShareSDKExtension
-    - mob_sharesdk/ShareSDKPlatforms/QQ
-    - mob_sharesdk/ShareSDKPlatforms/SinaWeibo
-    - mob_sharesdk/ShareSDKPlatforms/WeChat
-    - mob_sharesdk/ShareSDKUI
  - sqflite (0.0.3):
    - Flutter
    - FMDB (>= 2.7.5)
@ -214,7 +185,6 @@ DEPENDENCIES:
  - photo_manager (from `.symlinks/plugins/photo_manager/ios`)
  - plain_notification_token_for_us (from `.symlinks/plugins/plain_notification_token_for_us/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/ios`)
-  - sharesdk_plugin (from `.symlinks/plugins/sharesdk_plugin/ios`)
  - sqflite (from `.symlinks/plugins/sqflite/ios`)
  - tencent_chat_push_for_china (from `.symlinks/plugins/tencent_chat_push_for_china/ios`)
  - tencent_cloud_chat_sdk (from `.symlinks/plugins/tencent_cloud_chat_sdk/ios`)
@ -235,8 +205,6 @@ SPEC REPOS:
    - HydraAsync
    - libwebp
    - Mantle
-    - mob_sharesdk
-    - MOBFoundation
    - Reachability
    - ReactiveObjC
    - SDWebImage
@ -299,8 +267,6 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/plain_notification_token_for_us/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/ios"
-  sharesdk_plugin:
-    :path: ".symlinks/plugins/sharesdk_plugin/ios"
  sqflite:
    :path: ".symlinks/plugins/sqflite/ios"
  tencent_chat_push_for_china:
@ -350,8 +316,6 @@ SPEC CHECKSUMS:
  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
  local_notifications_for_us: d4bb63b93eb429c4697edd0ee66bbe8bade29633
  Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
-  mob_sharesdk: 0698d60b3c1549a5b0bcfdec6f407439dd2960c0
-  MOBFoundation: 6df2684b4db4f0f5bd71b0623f82e11271bf7ac8
  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
  pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
@ -363,7 +327,6 @@ SPEC CHECKSUMS:
  SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
  SDWebImageWebPCoder: f0f287cee4cd96a59937fbf3c77a8cfda9ba67b0
  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
-  sharesdk_plugin: 70d952ac2e1b6290170370c6b493a57e19fe5db4
  sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
  tencent_chat_push_for_china: aa983a4716949ae4062c106204e2dc07d34d9f3b
--- a/circle_app/lib/app/circle/view.dart
+++ b/circle_app/lib/app/circle/view.dart
@ -3,6 +3,8 @@ import 'dart:math';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:circle_app/app/circle/widgets/info_list_view.dart';
 import 'package:circle_app/app/dialog/ScreenBottomSheetDialog.dart';
+import 'package:circle_app/app/msg/view.dart';
+import 'package:circle_app/common/Widgets/open_vip_tip/view.dart';
 import 'package:circle_app/router/app_routers.dart';
 import 'package:circle_app/util/util.dart';
 import 'package:flutter/material.dart';
@ -71,7 +73,8 @@ class _CirclePageState extends State<CirclePage>
  @override
  Widget build(BuildContext context) {
    getContext = context;
-    return GetBuilder<CircleLogic>(builder: (logic) {
+    return GetBuilder<CircleLogic>(builder: (logic)
+    {
      return Scaffold(
        backgroundColor: Colors.transparent,
        body: SafeArea(
@ -100,24 +103,30 @@ class _CirclePageState extends State<CirclePage>
                  ),
                ),
                logic.isShowCircle
-                    ? Positioned(
-                        bottom: 36.sp,
-                        right: 10.sp,
-                        child: GestureDetector(
-                            onTap: () async {
-                              List<MyConfigData> numbers = [];
-                              numbers.add(MyConfigData(
-                                  logic.getCircleIndex().id.toString(),
-                                  logic.getCircleIndex().title!,
-                                  false));
-                              var data = await Get.toNamed(
-                                  AppRoutes.Call_out,
-                                  arguments: {'numbers': numbers});
-                            },
-                            child: Image.asset(
-                              getCircleImage('send_msg'),
-                              width: 60.sp,
-                            )))
+                    ?
+                Positioned(
+                    bottom: 36.sp,
+                    right: 10.sp,
+                    child: GestureDetector(
+                        onTap: () async {
+                          List<MyConfigData> numbers = [];
+                          numbers.add(MyConfigData(
+                              logic
+                                  .getCircleIndex()
+                                  .id
+                                  .toString(),
+                              logic
+                                  .getCircleIndex()
+                                  .title!,
+                              false));
+                          var data = await Get.toNamed(
+                              AppRoutes.Call_out,
+                              arguments: {'numbers': numbers});
+                        },
+                        child: Image.asset(
+                          getCircleImage('send_msg'),
+                          width: 60.sp,
+                        )))
                    : Center()
              ],
            );
@ -551,7 +560,11 @@ class _CirclePageState extends State<CirclePage>
      infoList = statistics.lastVisitUsers;
      if (infoList.isNotEmpty) {
        for (var element in infoList) {
-          urlList.add(element["avatar"]);
+                if(element["avatar"]!=null&&element["avatar"].contains("http")){
+                  urlList.add(element["avatar"]);
+                }
+
+      //    urlList.add(element["avatar"]);
        }
      }
    }
--- a/circle_app/lib/app/dialog/UpdateDialog.dart
+++ b/circle_app/lib/app/dialog/UpdateDialog.dart
@ -2,7 +2,7 @@ import 'dart:io';

 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_install_app/flutter_install_app.dart';
+// import 'package:flutter_install_app/flutter_install_app.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:url_launcher/url_launcher.dart';

@ -260,7 +260,7 @@ class _CustomDialogState extends State<UpdateDialog> {
          //  SmartDialog.dismiss();
          print(error);
        });
-    await AppInstaller.installApk(filePath, actionRequired: false);
+    // await AppInstaller.installApk(filePath, actionRequired: false);
  }
 }

--- a/circle_app/lib/app/home/view.dart
+++ b/circle_app/lib/app/home/view.dart
@ -15,14 +15,15 @@ class HomePage extends StatefulWidget {
  State<HomePage> createState() => _HomePageState();
 }

-class _HomePageState extends State<HomePage>  with AutomaticKeepAliveClientMixin {
+class _HomePageState extends State<HomePage>
+    with AutomaticKeepAliveClientMixin {
  @override
  bool get wantKeepAlive => true;
  final logic = Get.lazyPut(() => HomeLogic());

  final state = Get.find<HomeLogic>().state;

-@override
+  @override
  Widget build(BuildContext context) {
    super.build(context);

@ -58,15 +59,7 @@ class _HomePageState extends State<HomePage>  with AutomaticKeepAliveClientMixin
              width: MediaQuery.of(context).size.width,
              height: Get.height -  49.sp + MediaQuery.of(context).padding.bottom,
              decoration: const BoxDecoration(
-                  image: bgWidget),
-            ),
-            // Image.asset(
-            //   getBaseImage('bg'),
-            //   width: Get.width,
-            //   height: Get.height -  49.sp + MediaQuery.of(context).padding.bottom,
-            //   fit: BoxFit.fill,
-            //   gaplessPlayback: true,
-            // ),
+                  image: bgWidget),),
            PageView(
              physics: const NeverScrollableScrollPhysics(),
              controller: controller.pageController,
@ -74,6 +67,7 @@ class _HomePageState extends State<HomePage>  with AutomaticKeepAliveClientMixin
                //  controller.updateIndex(index);
              },
              children: controller.tabs,
+
            )
          ],
        ),
@ -108,38 +102,37 @@ class _HomePageState extends State<HomePage>  with AutomaticKeepAliveClientMixin
                  height: 34.sp,
                  excludeFromSemantics: true,
                  gaplessPlayback: true,
-                ),
-              ),
-            ),
+                ))),
          //  Obx(() => null)
-            Obx(() => Visibility(
-                visible: index == 0 &&controller.unreadSIze!="0",
-                child: Positioned(
-              // right: 4.sp,
-              top: 4.sp,
-              child:
-                  Container(
-                    margin: EdgeInsets.only(left: int.parse(controller.unreadSIze.value) > 99 ? 30.sp : 20.sp),
-                    height: 18.sp,
-                    padding: EdgeInsets.only(left: 5.sp,right: 5.sp),
-                    alignment: Alignment.center,
-                    decoration: BoxDecoration(
+          Obx(() => Visibility(
+              visible: index == 0 && controller.unreadSIze != "0",
+              child: Positioned(
+                // right: 4.sp,
+                top: 4.sp,
+                child: Container(
+                  margin: EdgeInsets.only(
+                      left: int.parse(controller.unreadSIze.value) > 99
+                          ? 30.sp
+                          : 20.sp),
+                  height: 18.sp,
+                  padding: EdgeInsets.only(left: 5.sp, right: 5.sp),
+                  alignment: Alignment.center,
+                  decoration: BoxDecoration(
                      color: Colors.red,
-                      borderRadius: BorderRadius.circular(11.sp)
-                    ),
-                    child: Text(
-                      int.parse(controller.unreadSIze.value) > 99 ? '99+' : controller.unreadSIze.value, // The number in the red dot
-                      style: TextStyle(
-                        color: Colors.white,
-                        fontSize: 12.0.sp, // Font size of the text
-                      ),
+                      borderRadius: BorderRadius.circular(11.sp)),
+                  child: Text(
+                    int.parse(controller.unreadSIze.value) > 99
+                        ? '99+'
+                        : controller.unreadSIze.value,
+                    // The number in the red dot
+                    style: TextStyle(
+                      color: Colors.white,
+                      fontSize: 12.0.sp, // Font size of the text
                    ),
                  ),
-
-            )))
-
-          ]
-        ),
+                ),
+              )))
+        ]),
      ),
    );
  }
--- a/circle_app/lib/app/minefragment/view.dart
+++ b/circle_app/lib/app/minefragment/view.dart
@ -2,7 +2,10 @@
 import 'dart:io';

 import 'package:cached_network_image/cached_network_image.dart';
+
 import 'package:circle_app/app/circle/view.dart';
+
+import 'package:circle_app/app/msg/view.dart';
 import 'package:circle_app/router/app_routers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
@ -40,13 +43,13 @@ class MinefragmentPage extends StatelessWidget {
    return GetBuilder<MinefragmentLogic>(
        builder: (logic) {
      return  Scaffold(
+
        backgroundColor: Colors.transparent,
        body: Padding(
          padding: EdgeInsets.only(
            top: 20.0 + statusBarHeight.sp,
            left: 11.sp,
-            right: 11.sp,
-          ),
+            right: 11.sp,),
          child: SingleChildScrollView(
            child: Column(
              children: [
--- a/circle_app/lib/app/msg/view.dart
+++ b/circle_app/lib/app/msg/view.dart
@ -18,7 +18,9 @@ import 'package:tencent_cloud_chat_uikit/ui/controller/tim_uikit_conversation_co
 import '../../util/eventBus.dart';
 import 'TIMUIKitConversation/tim_uikit_conversation.dart';
 import 'logic.dart';
-
+const bgWidget = DecorationImage(
+    fit: BoxFit.fill,
+    image: AssetImage('assets/images/base/home_back.png'));
 class MsgPage extends StatelessWidget {
  MsgPage({Key? key}) : super(key: key);

@ -61,7 +63,6 @@ class MsgPage extends StatelessWidget {
      backgroundColor: Colors.transparent,
      body: Stack(
        children: [
-
          SafeArea(
            child: GetBuilder(builder: (MsgLogic controller) {
              return Column(
--- a/circle_app/lib/network/dio_manager.dart
+++ b/circle_app/lib/network/dio_manager.dart
@ -267,7 +267,7 @@ class DioManager {
        return {'code': 500, 'msg': ''};
      }
      // 其他一些意外的报错
-      return {'code': 500, 'msg': '请求异常'};
+      return {'code': 500, 'msg': '加载中...'};
    }
  }
 //
--- a/circle_app/pubspec.lock
+++ b/circle_app/pubspec.lock
@ -873,7 +873,7 @@ packages:
    source: hosted
    version: "3.3.0"
  image_gallery_saver:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: image_gallery_saver
      sha256: be812580c7a320d3bf583af89cac6b376f170d48000aca75215a73285a3223a0
@ -1201,7 +1201,7 @@ packages:
    source: hosted
    version: "1.0.1"
  path_provider:
-    dependency: transitive
+    dependency: "direct main"
    description:
      name: path_provider
      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
@ -1384,6 +1384,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "0.5.0"
+  qr:
+    dependency: transitive
+    description:
+      name: qr
+      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  qr_flutter:
+    dependency: "direct main"
+    description:
+      name: qr_flutter
+      sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.1.0"
  quiver:
    dependency: transitive
    description:
@ -1472,14 +1488,6 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.3.0"
-  sharesdk_plugin:
-    dependency: "direct main"
-    description:
-      name: sharesdk_plugin
-      sha256: a1a18d01f362c119df1931082e3694591a24b3b00eef2576522e00ef8da3b25e
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.10"
  shell:
    dependency: transitive
    description: