@ray-js/ipc-player-integration 0.0.36 → 0.0.38-beta.1

package/lib/iconfont/iconfont.json

@@ -5,6 +5,97 @@
   "css_prefix_text": "icon-panel-",
   "description": "IPC 小程序公版",
   "glyphs": [
+    {
+      "icon_id": "47777351",
+      "name": "智能画质-关闭",
+      "font_class": "zhinenghuazhi-guanbi",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "47439150",
+      "name": "next",
+      "font_class": "next",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "47439134",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "47409621",
+      "name": "pixel-emoji",
+      "font_class": "pixel-emoji",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "47409576",
+      "name": "erase",
+      "font_class": "erase",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "47409575",
+      "name": "pencil",
+      "font_class": "pencil",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "47305778",
+      "name": "time",
+      "font_class": "time",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "47305721",
+      "name": "fence-empty",
+      "font_class": "fence-empty",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "47305602",
+      "name": "walk-pet",
+      "font_class": "walk-pet-empty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "47305546",
+      "name": "vibration",
+      "font_class": "vibration",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+    {
+      "icon_id": "47305545",
+      "name": "设备录像",
+      "font_class": "shebeiluxiang",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "47272338",
+      "name": "add",
+      "font_class": "add",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "47272337",
+      "name": "edit",
+      "font_class": "a-rongqi1972",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
     {
       "icon_id": "47215545",
       "name": "nightvision-mode-black-color",

package/lib/ui/bottomLeftContent.js

@@ -195,21 +195,18 @@ const BottomLeftContent = _ref => {
   // 点击右箭头：直接滚动到最右端。
   // 给一个足够大的目标值，交由 ScrollView 自身夹取到真实最右端，避免测量误差导致滚不到底。
 
-  const coverHeight = screenType === 'vertical' ? shouldHide ? 49 : 48 : shouldHide ? 84 : 83;
+  const coverHeight = screenType === 'vertical' ? shouldHide ? 49 : 48 : shouldHide ? 59 : 58;
   const containerHeight = screenType === 'vertical' ? 48 : 58;
 
   // reservedRight 兼容 number（px）与 string（任意 CSS 长度，例如 "35%"）
   const rightCss = typeof reservedRight === 'number' ? `${reservedRight}px` : reservedRight;
 
-  // 与 bottomRightContent 对齐：bottomRight 的 icon 行是贴在 wrap 顶部（不居中）的，
-  // 这里 wrap 用 flex-start，让 ScrollView 也贴顶；icon 在 ScrollView 内通过 align-items
-  // 居中到可视行中线，从而和右侧 icon 在同一水平线上。
-  // hintBottom 锚定 wrap 底部：
-  //   icon 中心到 wrap 底部 = (wrap底部→SV底部空隙) + SV的paddingBottom + 可视行高/2
-  //   竖屏:  0  + 0  + 24   = 24，箭头 16 → bottom = 16
-  //   横屏:  25 + 25 + 16.5 = 66.5，箭头 16 → bottom = 58
-
-  const hintBottom = screenType === 'vertical' ? 16 : 58;
+  // ScrollView 贴 wrap 顶部，icon 在 ScrollView 内通过 align-items 居中到可视行中线。
+  // hintBottom 锚定可视行中线（pulse 箭头 16，先按 16 高算 bottom，按钮模式再下移补差）：
+  //   icon 中心距 wrap 底 = paddingBottom + visibleRowHeight/2
+  //   竖屏: 0  + 24   = 24 → bottom = 16
+  //   横屏: 25 + 16.5 = 41.5 → bottom = 33.5
+  const visibleRowHeight = containerHeight - paddingBottomPx;
   // button 模式用半透明圆做点击热区，比 pulse 提示大；下移半个差值以保持图标中心不变
   const hintSize = isButtonHint ? 26 : 16;
   // 竖屏 button 模式给 ScrollView 右侧留一条较窄的“箭头槽”：只裁掉内容最右一小段，
@@ -290,7 +287,7 @@ const BottomLeftContent = _ref => {
     style: {
       display: 'inline-flex',
       flexDirection: 'row',
-      height: `${containerHeight - paddingBottomPx}px`,
+      height: `${visibleRowHeight}px`,
       alignItems: 'center'
     }
   }, children, /*#__PURE__*/React.createElement(View, {
@@ -307,7 +304,7 @@ const BottomLeftContent = _ref => {
     style: {
       position: 'absolute',
       right: `${hintRight}px`,
-      bottom: `${hintBottom - (hintSize - 16) / 2}px`,
+      bottom: `${paddingBottomPx + visibleRowHeight / 2 - 8 - (hintSize - 16) / 2}px`,
       width: `${hintSize}px`,
       height: `${hintSize}px`,
       display: 'flex',

package/lib/ui/ui.js

@@ -463,7 +463,7 @@ export const IPCPlayerIntegration = /*#__PURE__*/React.memo(props => {
     const res = await getSmartImageQualityState(devId);
     if (!res) return;
     // 调试时使用
-    // res = {
+    // const res = {
     //   isPurchase: false,
     //   buttonState: 0,
     //   trialRemainingSec: 20,

package/lib/ui/ui.less

@@ -26,6 +26,8 @@
   }
 
   .ipc-player-bottom-content-full {
+    padding-bottom: env(safe-area-inset-bottom);
+    height: calc(60px + env(safe-area-inset-bottom));
     :root[theme='dark'] & {
       background: #000;
     }
@@ -37,6 +39,10 @@
       .ipc-player-plugin-resolution {
         background-color: rgba(0, 0, 0, 0.2);
       }
+
+      .ipc-player-plugin-realtime-magnification {
+        background-color: rgba(0, 0, 0, 0.2);
+      }
     }
   }
 

package/lib/widgets/resolution/resolution.less

@@ -1,7 +1,6 @@
 @animation-time: 0.3s;
 
 .ipc-player-plugin-resolution {
-  background-color: rgba(255, 255, 255, 0.2);
   padding: calc(4px * var(--ipc-player-size-scale, 1)) calc(5px * var(--ipc-player-size-scale, 1));
   display: flex;
   justify-content: center;

package/lib/widgets/tryExperience/tryExperience.js

@@ -1,5 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { View, Image, getSystemInfoSync, showToast } from '@ray-js/ray';
+import { View, Image, getSystemInfoSync, showToast, Text } from '@ray-js/ray';
 import clsx from 'clsx';
 import React, { useState, useEffect, useCallback, useRef } from 'react';
 import { useStore } from '../../ctx/store';
@@ -9,7 +9,6 @@ import { refreshSmartImageQualityEvent } from '../../ui/constant';
 import tryZh from '../../res/try/try_zh.png';
 import tryEn from '../../res/try/try_en.png';
 import tryOpen from '../../res/try/try_open.png';
-import tryClose from '../../res/try/try_close.png';
 import './tryExperience.less';
 /** ty.ipc.test1 返回的体验状态 */
 var TryExperienceStatus = /*#__PURE__*/function (TryExperienceStatus) {
@@ -34,7 +33,7 @@ const pickIconByStatus = buttonState => {
     case TryExperienceStatus.Open:
       return tryOpen;
     case TryExperienceStatus.Close:
-      return tryClose;
+      return 'try_close';
     case TryExperienceStatus.Default:
       return getDefaultLangIcon();
     default:
@@ -67,7 +66,7 @@ export const TryExperience = props => {
   }, [buttonState]);
   const updateImgSrc = useCallback(() => {
     if (isLowPhone) {
-      setImgSrc(tryClose);
+      setImgSrc('try_close');
       return;
     }
     if (buttonState === 0 || buttonState) {
@@ -156,7 +155,9 @@ export const TryExperience = props => {
     onClick: onTryExperience
   }, /*#__PURE__*/React.createElement(View, {
     className: "try-experience-box"
-  }, /*#__PURE__*/React.createElement(Image, {
+  }, imgSrc === 'try_close' ? /*#__PURE__*/React.createElement(Text, {
+    className: "ipc-player-plugin-try-experience icon-panel icon-panel-zhinenghuazhi-guanbi"
+  }) : /*#__PURE__*/React.createElement(Image, {
     className: "try-experience-icon",
     src: imgSrc,
     mode: "heightFix"

package/lib/widgets/tryExperience/tryExperience.less

@@ -2,12 +2,18 @@
   display: inline-flex;
   justify-content: center;
   align-items: center;
-  min-height: calc(var(--iconBoxSize) * var(--ipc-player-size-scale, 1));
+  min-height: var(--iconBoxSize);
 }
 
 .try-experience-icon {
   display: block;
-  height: calc(var(--iconBoxSize) * var(--ipc-player-size-scale, 1));
+  height: var(--iconBoxSize);
   width: auto;
   flex-shrink: 0;
 }
+
+.ipc-player-plugin-try-experience {
+  color: var(--iconColor);
+  font-size: var(--iconBoxSize) !important;
+  line-height: var(--iconBoxSize) !important;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ipc-player-integration",
-  "version": "0.0.36",
+  "version": "0.0.38-beta.1",
   "description": "IPC 融合播放器",
   "main": "lib/index",
   "files": [