From 212342e2857c137d29a1cb60987c84c5c0574ec2 Mon Sep 17 00:00:00 2001
From: bggRGjQaUbCoE <githubaccount56556@proton.me>
Date: Tue, 1 Oct 2024 07:29:27 +0800
Subject: [PATCH] mod: update about

---
 android/app/build.gradle                      |   5 +-
 android/app/src/debug/AndroidManifest.xml     |   4 +-
 android/app/src/main/AndroidManifest.xml      |   4 +-
 .../com/orz12/PiliPalaX/MainActivity.kt       |   2 +-
 android/app/src/profile/AndroidManifest.xml   |   2 +-
 ios/Runner.xcodeproj/project.pbxproj          |   6 +-
 lib/pages/about/index.dart                    | 175 +++++-------------
 lib/pages/setting/pages/logs.dart             |   4 +-
 lib/services/audio_handler.dart               |   2 +-
 lib/utils/utils.dart                          |   2 +-
 pubspec.yaml                                  |   2 +-
 11 files changed, 64 insertions(+), 144 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 150df4cfc..8a5d7cf88 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -39,7 +39,7 @@ def _keyPassword = System.getenv("KEY_PASSWORD") ?: keystoreProperties["keyPassw
 android {
     compileSdkVersion 34
 
-    namespace 'com.orz12.PiliPalaX'
+    namespace 'com.example.pilipalax'
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -57,7 +57,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.orz12.PiliPalaX"
+        applicationId "com.example.pilipalax"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         targetSdkVersion flutter.targetSdkVersion
@@ -89,7 +89,6 @@ android {
             signingConfig _storeFile != null ? signingConfigs.release : signingConfigs.debug
         }
         debug {
-            //applicationId "com.orz12.PiliPalaX.debug"
             applicationIdSuffix ".debug"
         }
     }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index ac7fe57c9..edc3eea3f 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.orz12.PiliPalaX">
+    package="com.example.pilipalax">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
@@ -14,7 +14,7 @@
         android:label="PiliPalaX Debug"
         tools:replace="android:label">
         <activity
-            android:name="com.orz12.PiliPalaX.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 55d764ce7..3787de1f8 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orz12.PiliPalaX">
+    package="com.example.pilipalax">
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
@@ -45,7 +45,7 @@
         android:fullBackupContent="false"
         tools:replace="android:allowBackup">
         <activity
-            android:name="com.orz12.PiliPalaX.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/LaunchTheme"
diff --git a/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt b/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt
index 76bb972a6..6ea0ccc66 100644
--- a/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/orz12/PiliPalaX/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.orz12.PiliPalaX
+package com.example.pilipalax
 
 import io.flutter.embedding.android.FlutterActivity
 import io.flutter.embedding.engine.FlutterEngine
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 4143d885b..3287efede 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.orz12.PiliPalaX">
+    package="com.example.pilipalax">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index d0df2eb5f..4f52a1ef2 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -383,7 +383,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.orz12.PiliPalaX;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.pilipalax;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -512,7 +512,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.orz12.PiliPalaX;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.pilipalax;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -535,7 +535,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.orz12.PiliPalaX;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.pilipalax;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/lib/pages/about/index.dart b/lib/pages/about/index.dart
index e749b5e47..1637659cc 100644
--- a/lib/pages/about/index.dart
+++ b/lib/pages/about/index.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
@@ -14,6 +12,10 @@ import 'package:PiliPalaX/utils/utils.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../../utils/cache_manage.dart';
 
+const String _sourceCodeUrl = 'https://github.com/bggRGjQaUbCoE/PiliPalaX';
+const String _originSourceCodeUrl = 'https://github.com/guozhigq/pilipala';
+const String _upstreamUrl = 'https://github.com/orz12/PiliPalaX';
+
 class AboutPage extends StatefulWidget {
   const AboutPage({super.key});
 
@@ -86,26 +88,26 @@ class _AboutPageState extends State<AboutPage> {
                   style: subTitleStyle),
             ),
           ),
-          Obx(
-            () => ListTile(
-              onTap: () => _aboutController.onUpdate(),
-              title: const Text('最新版本'),
-              leading: const Icon(Icons.flag_outlined),
-              trailing: Text(
-                _aboutController.isLoading.value
-                    ? '正在获取'
-                    : _aboutController.isUpdate.value
-                        ? '有新版本  ❤️${_aboutController.remoteVersion.value}'
-                        : '当前已是最新版',
-                style: subTitleStyle,
-              ),
-            ),
-          ),
+          // Obx(
+          //   () => ListTile(
+          //     onTap: () => _aboutController.onUpdate(),
+          //     title: const Text('最新版本'),
+          //     leading: const Icon(Icons.flag_outlined),
+          //     trailing: Text(
+          //       _aboutController.isLoading.value
+          //           ? '正在获取'
+          //           : _aboutController.isUpdate.value
+          //               ? '有新版本  ❤️${_aboutController.remoteVersion.value}'
+          //               : '当前已是最新版',
+          //       style: subTitleStyle,
+          //     ),
+          //   ),
+          // ),
           // ListTile(
           //   onTap: () {},
           //   title: const Text('更新日志'),
           //   trailing: const Icon(
-          //     Icons.arrow_forward_ios,
+          //     Icons.arrow_forward,
           //     size: 16,
           //   ),
           // ),
@@ -115,11 +117,26 @@ class _AboutPageState extends State<AboutPage> {
             color: Theme.of(context).colorScheme.outlineVariant,
           ),
           ListTile(
-            onTap: () => _aboutController.githubUrl(),
-            leading: const Icon(Icons.star_outline_outlined),
-            title: const Text('Github开源仓库'),
-            trailing: Text(
-              'github.com/orz12/PiliPalaX',
+            onTap: () => _aboutController.githubUrl(_sourceCodeUrl),
+            leading: const Icon(Icons.code),
+            title: const Text('Source Code'),
+            subtitle: Text(_sourceCodeUrl, style: subTitleStyle),
+          ),
+          ListTile(
+            onTap: () => _aboutController.githubUrl(_originSourceCodeUrl),
+            leading: const Icon(Icons.code),
+            title: const Text('Origin'),
+            subtitle: Text(
+              _originSourceCodeUrl,
+              style: subTitleStyle,
+            ),
+          ),
+          ListTile(
+            onTap: () => _aboutController.githubUrl(_upstreamUrl),
+            leading: const Icon(Icons.code),
+            title: const Text('Upstream'),
+            subtitle: Text(
+              _upstreamUrl,
               style: subTitleStyle,
             ),
           ),
@@ -128,37 +145,16 @@ class _AboutPageState extends State<AboutPage> {
             leading: const Icon(Icons.feedback_outlined),
             title: const Text('问题反馈'),
             trailing: Icon(
-              Icons.arrow_forward_ios,
+              Icons.arrow_forward,
               size: 16,
               color: outline,
             ),
           ),
-          ListTile(
-            onTap: () => _aboutController.qqGroup(),
-            leading: const Icon(Icons.group_add_outlined),
-            title: const Text('QQ群'),
-            trailing: Text(
-              '392176105',
-              style: subTitleStyle,
-            ),
-          ),
-          ListTile(
-            onTap: () => _aboutController.tgChannel(),
-            leading: const Icon(Icons.group_add_outlined),
-            title: const Text('TG频道'),
-            trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
-          ),
-          ListTile(
-            onTap: () => _aboutController.aPay(),
-            leading: const Icon(Icons.wallet_giftcard_outlined),
-            title: const Text('赞赏'),
-            trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
-          ),
           ListTile(
             onTap: () => _aboutController.logs(),
             leading: const Icon(Icons.bug_report_outlined),
             title: const Text('错误日志'),
-            trailing: Icon(Icons.arrow_forward_ios, size: 16, color: outline),
+            trailing: Icon(Icons.arrow_forward, size: 16, color: outline),
           ),
           ListTile(
             onTap: () async {
@@ -314,7 +310,7 @@ class AboutController extends GetxController {
     // 获取当前版本
     getCurrentApp();
     // 获取最新的版本
-    getRemoteApp();
+    // getRemoteApp();
   }
 
   // 获取设备信息
@@ -333,10 +329,6 @@ class AboutController extends GetxController {
   Future getCurrentApp() async {
     var currentInfo = await PackageInfo.fromPlatform();
     String buildNumber = currentInfo.buildNumber;
-    //if is android
-    if (Platform.isAndroid) {
-      buildNumber = buildNumber.substring(0, buildNumber.length - 1);
-    }
     currentVersion.value = "${currentInfo.version}+$buildNumber";
   }
 
@@ -366,36 +358,20 @@ class AboutController extends GetxController {
   }
 
   // 跳转github
-  githubUrl() {
+  githubUrl(String url) {
     launchUrl(
-      Uri.parse('https://github.com/orz12/pilipala'),
+      Uri.parse(url),
       mode: LaunchMode.externalApplication,
     );
   }
 
   githubRelease() {
     launchUrl(
-      Uri.parse('https://github.com/guozhigq/pilipala/release'),
+      Uri.parse('$_sourceCodeUrl/release'),
       mode: LaunchMode.externalApplication,
     );
   }
 
-  // 从网盘下载
-  panDownload() {
-    Clipboard.setData(
-      const ClipboardData(text: 'pili'),
-    );
-    SmartDialog.showToast(
-      '已复制提取码：pili',
-      displayTime: const Duration(milliseconds: 500),
-    ).then(
-      (value) => launchUrl(
-        Uri.parse('https://www.123pan.com/s/9sVqVv-flu0A.html'),
-        mode: LaunchMode.externalApplication,
-      ),
-    );
-  }
-
   // 问题反馈
   feedback(BuildContext context) async {
     await showDialog(
@@ -403,12 +379,12 @@ class AboutController extends GetxController {
       builder: (context) {
         return SimpleDialog(
           clipBehavior: Clip.hardEdge,
-          title: const Text('问题反馈（建议直接加群反馈）'),
+          title: const Text('问题反馈'),
           children: [
             ListTile(
               title: const Text('GitHub Issue'),
               onTap: () => launchUrl(
-                Uri.parse('https://github.com/orz12/pilipala/issues'),
+                Uri.parse('$_sourceCodeUrl/issues'),
                 // 系统自带浏览器打开
                 mode: LaunchMode.externalApplication,
               ),
@@ -427,61 +403,6 @@ class AboutController extends GetxController {
     );
   }
 
-  // qq群
-  qqGroup() {
-    Clipboard.setData(
-      const ClipboardData(text: '392176105'),
-    );
-    SmartDialog.showToast('已复制QQ群号');
-    try {
-      launchUrl(
-        Uri.parse(
-            'mqqapi://card/show_pslcard?src_type=internal&version=1&uin=392176105&card_type=group&source=qrcode'),
-        mode: LaunchMode.externalApplication,
-      );
-    } catch (e) {
-      print(e);
-    }
-  }
-
-  // tg频道
-  tgChannel() {
-    Clipboard.setData(
-      const ClipboardData(text: 'https://t.me/+162zlPtZlT9hNWVl'),
-    );
-    SmartDialog.showToast(
-      '已复制，即将在浏览器打开',
-      displayTime: const Duration(milliseconds: 500),
-    ).then(
-      (value) => launchUrl(
-        Uri.parse('https://t.me/+162zlPtZlT9hNWVl'),
-        mode: LaunchMode.externalApplication,
-      ),
-    );
-  }
-
-  // 官网
-  // webSiteUrl() {
-  //   launchUrl(
-  //     Uri.parse('https://pilipalanet.mysxl.cn/pilipala-x'),
-  //     mode: LaunchMode.externalApplication,
-  //   );
-  // }
-
-  // aPay() {
-  //   try {
-  //     launchUrl(
-  //       Uri.parse('https://pilipalanet.mysxl.cn/pilipalaxadmire'),
-  //       mode: LaunchMode.externalApplication,
-  //     );
-  //   } catch (e) {
-  //     print(e);
-  //   }
-  // }
-  aPay() {
-    SmartDialog.showToast('新接口来不及写了，直接来群里找作者吧');
-  }
-
   // 日志
   logs() {
     Get.toNamed('/logs');
diff --git a/lib/pages/setting/pages/logs.dart b/lib/pages/setting/pages/logs.dart
index 103fbe80e..04a513697 100644
--- a/lib/pages/setting/pages/logs.dart
+++ b/lib/pages/setting/pages/logs.dart
@@ -52,7 +52,7 @@ class _LogsPageState extends State<LogsPage> {
             if (l.startsWith("Crash occurred on")) {
               try {
                 date = DateTime.parse(
-                  l.split("Crash occurred on")[1].trim(),//.split('.')[0],
+                  l.split("Crash occurred on")[1].trim(), //.split('.')[0],
                 );
               } catch (e) {
                 debugPrint(e.toString());
@@ -82,7 +82,7 @@ class _LogsPageState extends State<LogsPage> {
 
   void feedback() {
     launchUrl(
-      Uri.parse('https://github.com/orz12/pilipala/issues'),
+      Uri.parse('https://github.com/bggRGjQaUbCoE/PiliPalaX/issues'),
       // 系统自带浏览器打开
       mode: LaunchMode.externalApplication,
     );
diff --git a/lib/services/audio_handler.dart b/lib/services/audio_handler.dart
index 5b9ab3448..d37c00429 100644
--- a/lib/services/audio_handler.dart
+++ b/lib/services/audio_handler.dart
@@ -10,7 +10,7 @@ Future<VideoPlayerServiceHandler> initAudioService() async {
   return await AudioService.init(
     builder: () => VideoPlayerServiceHandler(),
     config: const AudioServiceConfig(
-      androidNotificationChannelId: 'com.orz12.PiliPalaX.audio',
+      androidNotificationChannelId: 'com.example.pilipalax.audio',
       androidNotificationChannelName: 'Audio Service PiliPalaX',
       androidNotificationOngoing: true,
       androidStopForegroundOnPause: true,
diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart
index 3ede97ecb..6ad55ccdd 100644
--- a/lib/utils/utils.dart
+++ b/lib/utils/utils.dart
@@ -378,7 +378,7 @@ class Utils {
                         onPressed: () {
                           launchUrl(
                             Uri.parse(
-                                "https://github.com/orz12/pilipala/commits/main/"),
+                                "https://github.com/bggRGjQaUbCoE/PiliPalaX/commits/main/"),
                             mode: LaunchMode.externalApplication,
                           );
                         },
diff --git a/pubspec.yaml b/pubspec.yaml
index 6f7721465..1a020673f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.22+114514
+version: 1.0.22+123
 
 environment:
   sdk: ">=3.0.0 <4.0.0"