PSV: Support Big Picture Mode

xfangfang · Aug 12, 2023 · 2906c60 · 2906c60
1 parent 98c3000
commit 2906c60
Show file tree

Hide file tree

Showing 46 changed files with 285 additions and 95 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -386,13 +386,6 @@ jobs:
  submodules: recursive
  fetch-depth: 0
 
- - name: Git version
- id: git-version
- run: |
- git config --global --add safe.directory $(pwd)
- export VERSION=`git rev-parse --short HEAD`
- echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-
  - uses: actions/cache/restore@v3
  id: restore-pvr-cache
  with:
@@ -496,14 +489,15 @@ jobs:
  -DVERIFY_SSL=OFF \
  -DCMAKE_BUILD_TYPE=Release \
  -DDISABLE_OPENCC=ON \
+ -DPSV_BIG_PICTURE=ON \
  -DCMAKE_CXX_FLAGS="-Wno-error=pedantic -Wno-psabi"
  cmake --build build --verbose
  mv build/wiliwili.self build/eboot.bin
 
  - name: Upload vpk
  uses: actions/upload-artifact@v3
  with:
- name: wiliwili-PSVita-${{ steps.git-version.outputs.VERSION }}.vpk
+ name: wiliwili-PSVita-${{ needs.version.outputs.VERSION }}.vpk
  path: build/wiliwili.vpk
 
  - name: Upload eboot

diff --git a/library/borealis b/library/borealis
diff --git a/resources/i18n/zh-Hans/wiliwili.json b/resources/i18n/zh-Hans/wiliwili.json
@@ -93,7 +93,7 @@
  "tab": "关于更多",
  "brief_header": "软件介绍",
  "repository": "项目首页",
- "brief": "专为手柄控制设计的第三方跨平台B站客户端\n完美复刻官方PC端B站，满足日常使用, 目前可以运行在PC全平台和 Nintendo Switch 上",
+ "brief": "专为手柄控制设计的第三方跨平台B站客户端\n完美复刻官方PC端B站，满足日常使用, 目前可以运行在PC全平台、PSVita 和 Nintendo Switch 上",
  "repo_header": "开源地址",
  "author_header": "作者发言",
  "author": "一直想做个艺术家, 可惜程序员都没什么发挥的空间\n直到这个作品诞生，实现了：「在游戏机上看视频；用手机来玩游戏」\n或许算得上是一种行为艺术，这样的话我也就圆满了"

diff --git a/resources/i18n/zh-Hant/wiliwili.json b/resources/i18n/zh-Hant/wiliwili.json
@@ -93,7 +93,7 @@
  "tab": "關於更多",
  "brief_header": "軟體介紹",
  "repository": "專案首頁",
- "brief": "專為搖桿控制設計的第三方跨平臺B站客戶端\n完美復刻官方PC端B站，滿足日常使用, 目前可以執行在PC全平臺和 Nintendo Switch 上",
+ "brief": "專為搖桿控制設計的第三方跨平臺B站客戶端\n完美復刻官方PC端B站，滿足日常使用, 目前可以執行在PC全平臺、PSVita 和 Nintendo Switch 上",
  "repo_header": "開源位址",
  "author_header": "作者發言",
  "author": "一直想做個藝術家, 可惜程式設計師都沒什麽發揮的空間\n直到這個作品誕生，實現了：「在遊戲機上看影片；用手機來玩遊戲」\n或許算得上是一種行為藝術，這樣的話我也就圓滿了"

diff --git a/resources/pictures/22-coin-ani-small.png b/resources/pictures/22-coin-ani-small.png
diff --git a/resources/pictures/33-coin-ani-small.png b/resources/pictures/33-coin-ani-small.png
diff --git a/resources/xml/activity/pgc_index_activity.xml b/resources/xml/activity/pgc_index_activity.xml
@@ -31,7 +31,7 @@
  itemSpace="30"
  grow="1"
  preFetchLine="2"
- spanCount="5"
+ spanCount="@style/wiliwili/grid/span/5"
  wireframe="false"
  id="pgc/recyclingGrid"/>
 

diff --git a/resources/xml/activity/player_activity.xml b/resources/xml/activity/player_activity.xml
@@ -13,7 +13,7 @@
  <brls:Box
  id="video_detail_left_box"
  margin="10"
- width="800"
+ width="@style/wiliwili/player/width"
  height="auto"
  wireframe="false"
  axis="column">
@@ -23,7 +23,7 @@
  focusable="true"
  focusDown="video_detail_info_box"
  grow="1"
- width="800"
+ width="@style/wiliwili/player/width"
  height="auto"/>
 
  <!-- 视频下方相关信息-->
@@ -207,7 +207,7 @@
  marginTop="1"
  textColor="@theme/font/grey"
  id="video/count"
- fontSize="13"
+ fontSize="@style/wiliwili/player/bottom/font"
  text=""/>
  <SVGImage
  width="16"
@@ -219,7 +219,7 @@
  marginTop="1"
  id="video/danmaku"
  textColor="@theme/font/grey"
- fontSize="13"
+ fontSize="@style/wiliwili/player/bottom/font"
  text=""/>
  <brls:Box
  visibility="gone"
@@ -233,7 +233,7 @@
  marginLeft="4"
  marginRight="4"
  textColor="@theme/font/grey"
- fontSize="13"
+ fontSize="@style/wiliwili/player/bottom/font"
  text=""/>
  </brls:Box>
  <SVGImage
@@ -246,7 +246,7 @@
  marginTop="1"
  id="video/people"
  textColor="@theme/font/grey"
- fontSize="13"
+ fontSize="@style/wiliwili/player/bottom/font"
  text="N人正在看"/>
  <SVGImage
  width="16"
@@ -258,15 +258,15 @@
  marginTop="1"
  id="video/time"
  textColor="@theme/font/grey"
- fontSize="13"
+ fontSize="@style/wiliwili/player/bottom/font"
  text="2022-01-01 20:00:00"/>
 
  <brls:Label
  id="video/bvid"
  marginLeft="4"
  marginRight="4"
  textColor="@theme/font/grey"
- fontSize="13"
+ fontSize="@style/wiliwili/player/bottom/font"
  text="WILIWILI"/>
 
  <brls:Box
@@ -283,7 +283,7 @@
  marginRight="4"
  marginTop="1"
  textColor="@theme/font/grey"
- fontSize="13"
+ fontSize="@style/wiliwili/player/bottom/font"
  text="@i18n/wiliwili/player/rights"/>
  </brls:Box>
  </brls:Box>

diff --git a/resources/xml/fragment/dynamic_tab.xml b/resources/xml/fragment/dynamic_tab.xml
@@ -27,7 +27,7 @@
  itemHeight="250"
  grow="1"
  preFetchLine="2"
- spanCount="3"
+ spanCount="@style/wiliwili/grid/span/3"
  wireframe="false"
  id="dynamic/videoList"/>
  </brls:Box>

diff --git a/resources/xml/fragment/home_hots_all.xml b/resources/xml/fragment/home_hots_all.xml
@@ -9,7 +9,7 @@
  paddingLeft="20"
  paddingRight="20"
  grow="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  wireframe="false"
  id="home/hots/all/recyclingGrid"/>
 </brls:Box>
diff --git a/resources/xml/fragment/home_hots_history.xml b/resources/xml/fragment/home_hots_history.xml
@@ -21,7 +21,7 @@
  paddingLeft="20"
  paddingRight="20"
  grow="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  itemHeight="260.5"
  wireframe="false"
  id="home/hots/history/recyclingGrid"/>

diff --git a/resources/xml/fragment/home_hots_rank.xml b/resources/xml/fragment/home_hots_rank.xml
@@ -12,6 +12,7 @@
  alignItems="center"
  height="50">
  <SVGImage
+ id="home/hots/rank/note/icon"
  culled="false"
  width="12"
  height="13"
@@ -54,7 +55,7 @@
  paddingLeft="20"
  paddingRight="20"
  grow="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  itemHeight="237.5"
  wireframe="false"
  id="home/hots/rank/recyclingGrid"/>

diff --git a/resources/xml/fragment/home_hots_weekly.xml b/resources/xml/fragment/home_hots_weekly.xml
@@ -55,7 +55,7 @@
  paddingLeft="20"
  paddingRight="20"
  grow="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  itemHeight="260.5"
  wireframe="false"
  id="home/hots/weekly/recyclingGrid"/>

diff --git a/resources/xml/fragment/home_live.xml b/resources/xml/fragment/home_live.xml
@@ -42,7 +42,7 @@
  paddingLeft="20"
  paddingRight="20"
  grow="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  itemHeight="200"
  wireframe="false"
  id="home/live/recyclingGrid"/>

diff --git a/resources/xml/fragment/home_recommends.xml b/resources/xml/fragment/home_recommends.xml
@@ -10,7 +10,7 @@
  itemHeight="250"
  grow="1"
  preFetchLine="2"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  wireframe="false"
  id="home/recommends/recyclingGrid"/>
 </brls:Box>
diff --git a/resources/xml/fragment/mine_bangumi.xml b/resources/xml/fragment/mine_bangumi.xml
@@ -8,7 +8,7 @@
  itemHeight="320"
  grow="1"
  preFetchLine="1"
- spanCount="5"
+ spanCount="@style/wiliwili/grid/span/5"
  itemSpace="31.4"
  wireframe="false"
  id="mine/bangumi/recyclingGrid"/>

diff --git a/resources/xml/fragment/mine_collection.xml b/resources/xml/fragment/mine_collection.xml
@@ -9,7 +9,7 @@
  itemHeight="214"
  grow="1"
  preFetchLine="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  wireframe="false"
  id="mine/collection/recyclingGrid"/>
 </brls:Box>
diff --git a/resources/xml/fragment/mine_collection_video_list.xml b/resources/xml/fragment/mine_collection_video_list.xml
@@ -57,7 +57,7 @@
  itemHeight="250"
  grow="1"
  preFetchLine="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  wireframe="false"
  id="collection/recyclingGrid"/>
 

diff --git a/resources/xml/fragment/mine_history.xml b/resources/xml/fragment/mine_history.xml
@@ -9,7 +9,7 @@
  itemHeight="250"
  grow="1"
  preFetchLine="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  wireframe="false"
  id="mine/history/recyclingGrid"/>
 </brls:Box>
diff --git a/resources/xml/fragment/mine_later.xml b/resources/xml/fragment/mine_later.xml
@@ -9,7 +9,7 @@
  itemHeight="250"
  grow="1"
  preFetchLine="1"
- spanCount="4"
+ spanCount="@style/wiliwili/grid/span/4"
  wireframe="false"
  id="mine/later/recyclingGrid"/>
 </brls:Box>
diff --git a/resources/xml/fragment/mine_tab.xml b/resources/xml/fragment/mine_tab.xml
@@ -20,7 +20,7 @@
  margin="10"
  image="@res/pictures/default_avatar.png"/>
  <brls:Box
- marginLeft="40"
+ marginLeft="30"
  axis="column"
  width="35%">
  <brls:Label
@@ -38,7 +38,7 @@
  text=""/>
  </brls:Box>
  <brls:Box
- marginRight="100"
+ marginRight="75"
  alignItems="center"
  grow="1">
  <brls:Box
@@ -49,13 +49,13 @@
  axis="column">
  <brls:Label
  id="mine/label/dynamic"
- fontSize="24"
+ fontSize="@style/wiliwili/mine/num"
  marginTop="20"
  text="0"/>
  <brls:Label
  singleLine="true"
  marginTop="4"
- fontSize="16"
+ fontSize="@style/wiliwili/mine/type"
  textColor="@theme/font/grey"
  text="@i18n/wiliwili/mine/activity"/>
  </brls:Box>
@@ -74,13 +74,13 @@
  axis="column">
  <brls:Label
  id="mine/label/following"
- fontSize="24"
+ fontSize="@style/wiliwili/mine/num"
  marginTop="20"
  text="0"/>
  <brls:Label
  singleLine="true"
  marginTop="4"
- fontSize="16"
+ fontSize="@style/wiliwili/mine/type"
  textColor="@theme/font/grey"
  text="@i18n/wiliwili/mine/following"/>
  </brls:Box>
@@ -99,13 +99,13 @@
  axis="column">
  <brls:Label
  id="mine/label/follower"
- fontSize="24"
+ fontSize="@style/wiliwili/mine/num"
  marginTop="20"
  text="0"/>
  <brls:Label
  singleLine="true"
  marginTop="4"
- fontSize="16"
+ fontSize="@style/wiliwili/mine/type"
  textColor="@theme/font/grey"
  text="@i18n/wiliwili/mine/follower"/>
  </brls:Box>
@@ -124,13 +124,13 @@
  axis="column">
  <brls:Label
  id="mine/label/coins"
- fontSize="24"
+ fontSize="@style/wiliwili/mine/num"
  marginTop="20"
  text="0"/>
  <brls:Label
  singleLine="true"
  marginTop="4"
- fontSize="16"
+ fontSize="@style/wiliwili/mine/type"
  textColor="@theme/font/grey"
  text="@i18n/wiliwili/mine/coin"/>
  </brls:Box>