Merge branch 'master' into dev

.github/workflows/android-weekly.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - 'dev'
+      - 'dev-newarch'
   workflow_dispatch:
 jobs:
   checkLastCommit:

README.md

@@ -22,6 +22,7 @@
 
 <p align="center"> 
   <a href='https://play.google.com/store/apps/details?id=com.noxplay.noxplayer&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height="80"/></a>
+  <a href='https://play.google.com/apps/internaltest/4701326682273400640'><img alt='加入内测计划' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png' height="80"/></a>
 <a href="https://f-droid.org/packages/com.noxplay.noxplayer">
     <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on-zh-cn.png"
     alt="下载应用，请到 F-Droid"
@@ -54,6 +55,7 @@
 - ffmpeg处理音量均衡
 - AB 重复
 - 逐字歌词
+- 交叉混合
 - **切片 man 不易，没有各位切片 man 也不会有这个项目的意义，请大家溜歌同时点右下方的点赞按钮点赞和三连 👍**
 - 自用为主要目的，不感兴趣的 feature 大概不会做，有问题可以[b 站私信](https://message.bilibili.com/#/whisper/mid1989881)
 

android/app/build.gradle

@@ -91,8 +91,8 @@ android {
         applicationId "com.noxplay.noxplayer"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 289
-        versionName "3.0.0"
+        versionCode 348
+        versionName "3.0.1"
         manifestPlaceholders = [
             appAuthRedirectScheme: 'com.noxplayer'
         ]

ios/APM.xcodeproj/project.pbxproj

@@ -617,7 +617,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "azusa-player-mobile.entitlements";
-				CURRENT_PROJECT_VERSION = 289;
+				CURRENT_PROJECT_VERSION = 348;
 				DEVELOPMENT_TEAM = 7U2TUNKNQX;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = example/Info.plist;
@@ -627,7 +627,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -651,7 +651,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "azusa-player-mobile.entitlements";
-				CURRENT_PROJECT_VERSION = 289;
+				CURRENT_PROJECT_VERSION = 348;
 				DEVELOPMENT_TEAM = 7U2TUNKNQX;
 				INFOPLIST_FILE = example/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.music";
@@ -660,7 +660,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.0.0;
+				MARKETING_VERSION = 3.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "azusa-player-mobile",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "private": true,
   "scripts": {
     "android": "react-native run-android",

src/App.tsx

@@ -30,6 +30,8 @@ if (TRACKING) {
       'no audio url',
       'com.google.android.play.core.appupdate.internal.zzy',
       'TEST - Sentry Client Crash',
+      // its ok to not track muse error i think
+      /MuseError/,
     ],
   });
 }

src/components/styles/NoxExportNFT.js

@@ -56,20 +56,42 @@ const parsedGarbData = {
     .flat(),
 };
 
-const emojiId = garblistdata[0].collect_list?.collect_chain?.filter(v =>
-  v.redeem_item_name.includes('表情包'),
-)[0]?.redeem_item_id;
-
-if (emojiId) {
-  const realEmojiId = (
-    await axios.get(`https://bili-nft.vercel.app/get-emote/?mid=${emojiId}`)
-  ).data.id;
-  parsedGarbData.gifs = (
-    await axios.get(
-      `https://api.bilibili.com/x/emote/package?business=reply&ids=${realEmojiId}`,
-    )
-  ).data.data.packages[0].emote.map(v => v.url);
-}
+const redeemPortraits = garblistdata
+  .map(garb =>
+    garb.collect_list?.collect_infos
+      ?.filter(v => v.redeem_item_name.includes('典藏卡'))
+      .map(v => ({
+        type: 'biliNFTVideoRedeem',
+        identifier: `["${args.garbid}","${garb.lottery_id}","${v.redeem_item_name}"]`,
+      })),
+  )
+  .flat();
+
+parsedGarbData.portraits = parsedGarbData.portraits.concat(redeemPortraits);
+
+const emojiIds = garblistdata
+  .map(
+    garb =>
+      (garb.collect_list?.collect_infos ?? [])
+        .concat(garb.collect_list?.collect_chain ?? [])
+        .filter(v => v?.redeem_item_name.includes('表情包'))[0]?.redeem_item_id,
+  )
+  .filter(v => v);
+
+parsedGarbData.gifs = (
+  await Promise.all(
+    emojiIds.map(async emojiId => {
+      const realEmojiId = (
+        await axios.get(`https://bili-nft.vercel.app/get-emote/?mid=${emojiId}`)
+      ).data.id;
+      return (
+        await axios.get(
+          `https://api.bilibili.com/x/emote/package?business=reply&ids=${realEmojiId}`,
+        )
+      ).data.data.packages[0].emote.map(v => v.url);
+    }),
+  )
+).flat();
 
 const convertedGarbData = args.lighttheme ? SteriaTheme : SteriaThemeDark;