Merge pull request #163 from virskor/hotfix/review

Hotfix/review

mobile/.packages

@@ -1,4 +1,4 @@
-# Generated by pub on 2021-01-16 11:55:17.200790.
+# Generated by pub on 2021-01-17 11:34:03.144915.
 archive:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/archive-2.0.13/lib/
 args:file:///Users/virs/.fvm/versions/1.22.5-stable/.pub-cache/hosted/pub.flutter-io.cn/args-1.6.0/lib/
 assets_audio_player:../packages/flutter_assetsAudioPlayer/lib/

mobile/android/app/build.gradle

@@ -40,7 +40,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.zhangxiaogou.zhangxiaogou"
+        applicationId "com.discuzq.example"
         minSdkVersion 20
         targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()

mobile/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhangxiaogou.zhangxiaogou">
+    package="com.discuzq.example">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

mobile/android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.zhangxiaogou.zhangxiaogou">
+    package="com.discuzq.example">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide

mobile/android/app/src/main/java/com/zhangxiaogou/zhangxiaogou/MainActivity.java → mobile/android/app/src/main/java/com/discuzq/example/MainActivity.java

@@ -1,4 +1,4 @@
-package com.zhangxiaogou.zhangxiaogou;
+package com.discuzq.example;
 
 import androidx.annotation.NonNull;
 import io.flutter.embedding.android.FlutterActivity;

mobile/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhangxiaogou.zhangxiaogou">
+    package="com.discuzq.example">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -390,7 +390,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.zhangxiaogou.zhangxiaogou;
+				PRODUCT_BUNDLE_IDENTIFIER = com.discuzq.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -527,7 +527,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.zhangxiaogou.zhangxiaogou;
+				PRODUCT_BUNDLE_IDENTIFIER = com.discuzq.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -558,7 +558,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.zhangxiaogou.zhangxiaogou;
+				PRODUCT_BUNDLE_IDENTIFIER = com.discuzq.example;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;

mobile/lib/core.dart

@@ -18,7 +18,6 @@ import 'package:discuzq/providers/forumProvider.dart';
 import 'package:discuzq/providers/categoriesProvider.dart';
 import 'package:discuzq/providers/editorProvider.dart';
 import 'package:discuzq/widgets/update/upgrader.dart';
-import 'package:discuzq/widgets/settings/privacyConfirm.dart';
 
 ///
 /// 执行
@@ -81,30 +80,11 @@ class DiscuzQ extends StatelessWidget {
 
     /// 加载本地的用户信息
     await AuthHelper.getUserFromLocal(context: context);
-
-    await _userPrivaciesNotice(context);
   }
 
   /// 加载本地的配置
   Future<bool> _initAppSettings() async =>
       await AppConfigurations().initAppSetting();
-
-
-  /// 弹出用户隐私提示
-  void _userPrivaciesNotice(BuildContext context) {
-    final dynamic appConf = context.read<AppConfigProvider>().appConf;
-    if (appConf['confrimedPrivacy'] != null &&
-        appConf['confrimedPrivacy'] == false) {
-      showModalBottomSheet(
-          context: context,
-          isDismissible: false,
-          enableDrag: false,
-          backgroundColor: Colors.transparent,
-          builder: (BuildContext context) {
-            return const PrivacyConfirm();
-          });
-    }
-  }
 }
 
 ///

mobile/lib/discuz.dart

@@ -18,7 +18,7 @@ import 'package:discuzq/api/forum.dart';
 import 'package:discuzq/router/routers.dart';
 import 'package:discuzq/views/exploreDelagate.dart';
 import 'package:discuzq/providers/appConfigProvider.dart';
-
+import 'package:discuzq/widgets/settings/privacyConfirm.dart';
 import 'widgets/ui/ui.dart';
 
 class Discuz extends StatefulWidget {
@@ -204,6 +204,8 @@ class __DiscuzAppDelegateState extends State<_DiscuzAppDelegate> {
   @override
   void initState() {
     this._getForumData();
+    Future.delayed(const Duration(seconds: 1))
+        .then((_) async => await _userPrivaciesNotice(context));
     super.initState();
   }
 
@@ -262,4 +264,20 @@ class __DiscuzAppDelegateState extends State<_DiscuzAppDelegate> {
       _loaded = true;
     });
   }
+
+  /// 弹出用户隐私提示
+  void _userPrivaciesNotice(BuildContext context) {
+    final dynamic appConf = context.read<AppConfigProvider>().appConf;
+    if (appConf['confrimedPrivacy'] != null &&
+        appConf['confrimedPrivacy'] == false) {
+      showModalBottomSheet(
+          context: context,
+          isDismissible: false,
+          enableDrag: false,
+          backgroundColor: Colors.transparent,
+          builder: (BuildContext context) {
+            return const PrivacyConfirm();
+          });
+    }
+  }
 }

mobile/lib/views/editor.dart

@@ -73,11 +73,14 @@ class Editor extends StatefulWidget {
   /// 回复的时候，需要关联帖子数据，是不能少的
   final ThreadModel thread;
 
+  final bool isFirstPost;
+
   Editor(
       {@required this.type,
       this.post,
       this.defaultCategory,
       this.thread,
+      this.isFirstPost = true,
       this.onPostSuccess});
 
   @override

mobile/lib/widgets/editor/discuzEditorHelper.dart

@@ -31,12 +31,13 @@ class DiscuzEditorHelper {
   ///
   /// 回复工具类
   DiscuzEditorHelper({this.context});
+
 
   ///
   /// 打开编辑器回复指定评论
   ///
   Future<DiscuzEditorRequestResult> reply(
-      {@required PostModel post, @required ThreadModel thread}) async {
+      {@required PostModel post, @required ThreadModel thread, bool isFirstPost = true}) async {
     DiscuzEditorRequestResult result;
 
     /// 弹出前，要检测用户是否已经登录
@@ -56,6 +57,7 @@ class DiscuzEditorHelper {
           type: DiscuzEditorInputTypes.reply,
           post: post,
           thread: thread,
+          isFirstPost: isFirstPost,
           onPostSuccess: (DiscuzEditorRequestResult res) {
             ///
             /// 用户成功回复，取得回复时接口反馈的数据

mobile/lib/widgets/editor/discuzEditorInputTypes.dart

@@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
 /// 
 class DiscuzEditorInputTypes {
   ///
-  /// 用户输入后，要进行的操作是发布主题
+  /// 用户输入后，要进行的操作是发布动态
   /// 
   static const DiscuzEditorInputType text = DiscuzEditorInputType(
       formatType: DiscuzEditorInputType.formatTypesString, name: '主题');

mobile/lib/widgets/editor/formaters/discuzEditorDataFormater.dart

@@ -17,7 +17,7 @@ class DiscuzEditorDataFormater {
   /// 当 isBuildForCreatingPost 为true时 会过滤掉 非发帖下必填的字段
   ///
   static Future<dynamic> toDynamic(DiscuzEditorData data,
-      {CaptchaModel captcha, bool isBuildForCreatingPost = false}) async {
+      {CaptchaModel captcha, bool isBuildForCreatingPost = false, bool isFirstPost = true}) async {
     List<dynamic> attachments = const [];
 
     if (data.relationships != null &&
@@ -118,7 +118,7 @@ class DiscuzEditorDataFormater {
     /// 但是注意：
     /// 回复主题的时候，是不需要要的！
     ///
-    if (isBuildForCreatingPost) {
+    if (isBuildForCreatingPost && !isFirstPost) {
       attributes.addAll({"replyId": data.attributes.replyId.toString()});
     }
 

mobile/lib/widgets/editor/toolbar/discuzEditorCategorySelector.dart

@@ -142,7 +142,7 @@ class _DiscuzEditorCategorySelectorState
                     Container(
                       padding: const EdgeInsets.all(10),
                       child: const DiscuzText(
-                        '选择要发布的分类',
+                        '动态的类型',
                         fontWeight: FontWeight.bold,
                         textScaleFactor: 1.3,
                       ),

mobile/lib/widgets/editor/uploaders/discuzEditorImageUploader.dart

@@ -112,8 +112,8 @@ class _DiscuzEditorImageUploaderState extends State<DiscuzEditorImageUploader> {
       return;
     }
 
-    final File imageFile =
-        await ImagePicker.pickImage(source: ImageSource.gallery);
+    final File imageFile = await ImagePicker.pickImage(
+        source: ImageSource.gallery, imageQuality: 50);
 
     if (imageFile != null) {
       final Function close = DiscuzToast.loading(context: context);
@@ -143,6 +143,7 @@ class _DiscuzEditorImageUploaderState extends State<DiscuzEditorImageUploader> {
         }
       } catch (e) {
         close();
+        DiscuzToast.failed(context: context, message: '上传失败');
         throw e;
       }
     }
@@ -233,7 +234,8 @@ class _DiscuzEditorImageUploaderThumb extends StatelessWidget {
                   child: GestureDetector(
                     child: Container(
                       decoration: const BoxDecoration(
-                          borderRadius: const BorderRadius.all(const Radius.circular(50)),
+                          borderRadius:
+                              const BorderRadius.all(const Radius.circular(50)),
                           color: Colors.white),
                       child: const DiscuzIcon(
                         CupertinoIcons.minus_circle_fill,

mobile/lib/widgets/posts/postFloorCard.dart

@@ -292,8 +292,10 @@ class _PostFloorCardState extends State<PostFloorCard>
             ),
             onPressed: () async {
               final DiscuzEditorRequestResult res =
-                  await DiscuzEditorHelper(context: context)
-                      .reply(post: widget.post, thread: widget.thread);
+                  await DiscuzEditorHelper(context: context).reply(
+                      post: widget.post,
+                      thread: widget.thread,
+                      isFirstPost: false);
               if (res != null) {
                 widget.threadsCacher.posts = res.posts;
                 widget.threadsCacher.users = res.users;