新增QQ频道

fengyuecanzhu · Jan 17, 2022 · 23f8336 · 23f8336
1 parent cdcc11b
commit 23f8336
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 13 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@
 </table>
 
 * 官网：[https://reader.fycz.tk](https://reader.fycz.tk)
-* 反馈交流群:
+* 反馈交流:
   * QQ群：[1085028304](https://jq.qq.com/?_wv=1027&k=6pcq8YBk)
-  * Telegram：[https://t.me/FYReader](https://t.me/FYReader)
+  * QQ频道：[点击加入](https://qun.qq.com/qqweb/qunpro/share?_wv=3&_wwv=128&inviteCode=2aP6ZQ&from=246610&biz=ka)
 * [更新日志](./app/src/main/assets/updatelog.fy)
 * [免责声明](./app/src/main/assets/disclaimer.fy)
 

diff --git a/app/release.md b/app/release.md
@@ -1,4 +1,5 @@
 * 1、修复部分机型阅读界面切换日夜间闪退的问题
 * 2、优化搜索界面
 * 3、搜索界面新增书架书籍搜索
-* 4、修复朗读到章节最后一页停止的问题
+* 4、修复朗读到章节最后一页停止的问题 
+* 5、新增QQ频道，建议反馈请到QQ频道进行
diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
@@ -5,6 +5,7 @@
 2、优化搜索界面
 3、搜索界面新增书架书籍搜索
 4、修复朗读到章节最后一页停止的问题
+5、新增QQ频道，建议反馈请到QQ频道进行
 
 2021.12.11
 风月读书v2.2.8

diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/AboutActivity.java
@@ -96,6 +96,12 @@ protected void initClick() {
             mClipboardManager.setPrimaryClip(mClipData);
             ToastUtils.showSuccess("邮箱\"[email protected]\"已复制到剪切板");
         });
+        binding.il.rlJoinQqChannel.setOnClickListener(v -> {
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse("https://qun.qq.com/qqweb/qunpro/share?_wv=3&_wwv=128&inviteCode=2aP6ZQ&from=246610&biz=ka"));
+            startActivity(intent);
+        });
+
         binding.il.rlShareLog.setOnClickListener(v -> DialogCreator.createCommonDialog(this, "分享崩溃日志",
                 "你是希望将日志上传到服务器，还是直接分享给他人？", true,
                 "上传服务器", "直接分享", (dialog, which) -> uploadCrashLog(), (dialog, which) -> shareCrashLog()));

diff --git a/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java b/app/src/main/java/xyz/fycz/myreader/ui/fragment/MineFragment.java
@@ -4,6 +4,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -389,8 +390,9 @@ public void restoreError(@NotNull String msg) {
         });
 
         binding.mineRlFeedback.setOnClickListener(v -> {
-            Intent intent = new Intent(getContext(), FeedbackActivity.class);
-            getActivity().startActivity(intent);
+            Intent intent = new Intent(Intent.ACTION_VIEW);
+            intent.setData(Uri.parse("https://qun.qq.com/qqweb/qunpro/share?_wv=3&_wwv=128&inviteCode=2aP6ZQ&from=246610&biz=ka"));
+            startActivity(intent);
         });
 
         binding.mineRlDonate.setOnClickListener(v -> startActivity(new Intent(getActivity(), DonateActivity.class)));

diff --git a/app/src/main/res/layout/layout_about_content.xml b/app/src/main/res/layout/layout_about_content.xml
@@ -15,8 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/colorForeground"
-            android:orientation="vertical"
-            >
+            android:orientation="vertical">
 
             <ImageView
                 android:layout_width="match_parent"
@@ -200,6 +199,31 @@
                 app:tint="@color/textSecondary" />
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/rl_join_qq_channel"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/selector_common_bg"
+            android:gravity="center"
+            android:paddingStart="20dp"
+            android:paddingEnd="10dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:text="@string/join_qq_channel"
+                android:textColor="@color/textPrimary"
+                android:textSize="@dimen/text_normal_size" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                app:srcCompat="@drawable/ic_right_arrow"
+                app:tint="@color/textSecondary" />
+        </RelativeLayout>
 
         <RelativeLayout
             android:id="@+id/rl_contact_author"
@@ -227,6 +251,11 @@
                 app:tint="@color/textSecondary" />
         </RelativeLayout>
 
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="10dp" />
+
         <RelativeLayout
             android:id="@+id/rl_share_log"
             android:layout_width="match_parent"
@@ -253,10 +282,6 @@
                 app:tint="@color/textSecondary" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="10dp" />
-
         <RelativeLayout
             android:id="@+id/rl_privacy_policy"
             android:layout_width="match_parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -108,6 +108,7 @@
     <string name="this_github_url">https://github.com/fengyuecanzhu/FYReader</string>
     <string name="update">检查更新</string>
     <string name="thanks">致谢名单</string>
+    <string name="join_qq_channel">加入QQ频道</string>
 
 
     <!--file system-->
@@ -150,7 +151,7 @@
     <string name="common_search">搜索</string>
     <string name="theme_mode">主题模式</string>
     <string name="join_qq_group">加入QQ群</string>
-    <string name="mine_feedback">建议反馈</string>
+    <string name="mine_feedback">建议反馈(QQ频道)</string>
     <string name="menu_change_group">分组切换</string>
     <string name="menu_group_man">分组管理</string>
     <string name="menu_group_setting">设置分组</string>