Feat harmony mode by Blackgan3 · Pull Request #1697 · didi/mpx

Blackgan3 · 2024-11-11T13:32:45Z

增加 harmony mode

# Conflicts: # packages/api-proxy/src/platform/api/system/rnSystem.js # packages/core/@types/global.d.ts # packages/core/src/convertor/convertor.js # packages/core/src/core/proxy.js # packages/core/src/platform/patch/index.js # packages/core/src/platform/patch/react/getDefaultOptions.ios.js # packages/webpack-plugin/lib/platform/style/wx/index.js # packages/webpack-plugin/lib/platform/template/wx/component-config/picker-view.js

# Conflicts: # packages/core/src/platform/patch/getDefaultOptions.ios.js # packages/webpack-plugin/lib/platform/template/wx/component-config/view.js # packages/webpack-plugin/lib/runtime/components/react/mpx-web-view.tsx

# Conflicts: # packages/webpack-plugin/lib/runtime/components/react/mpx-video.tsx

hiyuki · 2025-04-07T07:48:04Z

packages/api-proxy/src/platform/api/system/index.ios.js

 const getDeviceInfo = function () {
  const deviceInfo = {}
-  if (__mpx_mode__ === 'android') {
+  if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {


hiyuki · 2025-04-07T07:48:22Z

packages/core/src/platform/builtInMixins/index.js

 export default function getBuiltInMixins ({ type, rawOptions = {} }) {
  let bulitInMixins
-  if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
+  if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {


用utils中的isReact

下面改成isWeb

hiyuki · 2025-04-07T07:48:53Z

packages/core/src/platform/patch/getDefaultOptions.ios.js


        // TODO 此部分内容在native-stack可删除，用setOptions设置
-        if (__mpx_mode__ === 'android') {
+        if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {


hiyuki · 2025-04-07T07:50:10Z

packages/webpack-plugin/lib/index.js

    }
    if (isReact(options.mode) && options.srcMode !== 'wx') {
-      errors.push('MpxWebpackPlugin supports mode to be "ios" or "android" only when srcMode is set to "wx"!')
+      errors.push('MpxWebpackPlugin supports mode to be "ios" or "android" of "harmony" only when srcMode is set to "wx"!')


"ios | android | harmony"

hiyuki · 2025-04-07T07:51:08Z

packages/webpack-plugin/lib/platform/style/wx/index.js

    }
    const cssMap = formatAbbreviation({ prop, value, selector }, { mode })
-    if (mode === 'android') return cssMap
+    if (mode === 'android' || mode === 'harmony') return cssMap


hiyuki · 2025-04-07T07:54:19Z

packages/webpack-plugin/lib/platform/template/wx/index.js

            value
          }
+        },
+        harmony ({ name, value }, { eventRules, el }) {


抽个复用的构造器函数复用一下

hiyuki · 2025-04-07T07:54:39Z

packages/webpack-plugin/lib/platform/template/wx/index.js

              error(`React native environment does not support [${eventName}] event!`)
            }
+          },
+          harmony (eventName) {


复用而不要copy

hiyuki · 2025-04-07T07:54:59Z

packages/webpack-plugin/lib/runtime/components/react/mpx-canvas/index.tsx

  })

-  if (__mpx_mode__ === 'android') {
+  if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {


hiyuki · 2025-04-07T07:55:23Z

packages/webpack-plugin/lib/runtime/components/react/mpx-picker-view-column.tsx

        animated: false
      })
-    }, isAndroid ? 200 : 0)
+    }, isAndroid || isHarmony ? 200 : 0)


用isIOS判断

hiyuki · 2025-04-07T07:55:35Z

packages/webpack-plugin/lib/runtime/components/react/mpx-video.tsx

        {
          detail: {
-            position: __mpx_mode__ === 'android' ? seekTime * 1000 : seekTime
+            position: __mpx_mode__ === 'android' || __mpx_mode__ === 'harmony' ? seekTime * 1000 : seekTime


hiyuki · 2025-04-07T07:55:42Z

packages/webpack-plugin/lib/runtime/components/react/mpx-video.tsx

    source.drm = {
      type: DRMType.FAIRPLAY,
-      certificateUrl: __mpx_mode__ === 'android' ? provisionUrl : certificateUrl,
+      certificateUrl: __mpx_mode__ === 'android' || __mpx_mode__ === 'harmony' ? provisionUrl : certificateUrl,


hiyuki · 2025-04-07T07:55:50Z

packages/webpack-plugin/lib/runtime/components/react/mpx-web-view.tsx


  const _reload = function () {
-    if (__mpx_mode__ === 'android') {
+    if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {


hiyuki · 2025-04-07T07:55:58Z

packages/webpack-plugin/lib/runtime/components/react/mpx-web-view.tsx


  const _onLoadProgress = function (event: WebViewProgressEvent) {
-    if (__mpx_mode__ === 'android') {
+    if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {


hiyuki · 2025-04-07T07:56:04Z

packages/webpack-plugin/lib/runtime/components/react/mpx-web-view.tsx

  }
  const onLoadEnd = function (res: WebViewEvent) {
-    if (__mpx_mode__ === 'android') {
+    if (__mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {


hiyuki · 2025-04-07T07:57:59Z

packages/webpack-plugin/lib/runtime/components/react/utils.tsx


 export const isIOS = __mpx_mode__ === 'ios'
 export const isAndroid = __mpx_mode__ === 'android'
+export const isHarmony = __mpx_mode__ === 'harmony'


把组件内的局部定义指向这个

hiyuki · 2025-04-08T08:32:31Z

packages/webpack-plugin/lib/platform/template/wx/index.js

 const { dash2hump } = require('../../../utils/hump-dash')

 module.exports = function getSpec ({ warn, error }) {
+  function rnDirectiveEventHandle ({ name, value, eventRules, el, mode, match }) {


这个定义为一个高阶函数，传一个mode过去就行

Blackgan3 added 13 commits November 1, 2024 19:51

feat: 指令处理添加harmony

24673a6

feat: 修改部分文件中的平台配置

a924ead

feat: template config 添加harmony相关配置

9156920

feat: 暂存style rule规则

b9227fb

feat: core && api-proxy 添加harmony mode

2ff3d69

feat: 完善harmony mode

05d4c86

fix:修复部分漏掉的harmony mode 判断

c42954e

Merge branch 'refs/heads/master' into feat-harmony-mode

636fab9

# Conflicts: # packages/core/src/platform/patch/getDefaultOptions.ios.js # packages/webpack-plugin/lib/platform/template/wx/component-config/view.js # packages/webpack-plugin/lib/runtime/components/react/mpx-web-view.tsx

feat: change video platform判断

3fdd7fc

Merge branch 'refs/heads/master' into feat-harmony-mode

c0d9f98

# Conflicts: # packages/webpack-plugin/lib/runtime/components/react/mpx-video.tsx

feat: 更新harmony mode判断

d27a862

feat: 修改mode判断

720835e

hiyuki reviewed Apr 7, 2025

View reviewed changes

Blackgan3 added 2 commits April 7, 2025 16:34

Merge branch 'refs/heads/master' into feat-harmony-mode

3c2fcc4

fix: 修改相关mode comment

4775aa8

Blackgan3 added 2 commits April 8, 2025 15:53

feat: 修改相关mpx_mode判断逻辑

db33108

feat: text simple harmony mode 添加

5ec2975

hiyuki reviewed Apr 8, 2025

View reviewed changes

feat: 修改rnDirectiveEventHandle方法

a5d5a87

hiyuki approved these changes Apr 8, 2025

View reviewed changes

hiyuki merged commit 6b63ecb into master Apr 8, 2025
6 checks passed

hiyuki deleted the feat-harmony-mode branch April 8, 2025 08:54

Conversation

Blackgan3 commented Nov 11, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hiyuki Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hiyuki Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hiyuki Apr 7, 2025 •

edited

Loading

hiyuki Apr 7, 2025 •

edited

Loading