Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[Android] Add weex-rax-api.js for eagle #2446

Merged
merged 5 commits into from
May 16, 2019

Conversation

YorkShen
Copy link
Contributor

@YorkShen YorkShen commented May 15, 2019

  1. Add weex-rax-api.js for all eagle page
  2. If it is eagle and Vue, set the value of weex-rax-api.js to \0
  3. Change the json structure of weex.config.env.
  • Before

    • Normal Page

      {
          "bundleType": "Vue",
          "bundleUrl": "xxxx",
          "env": {
              "deviceHeight": "1200",
              "deviceWidth": "720",
              "enableBackupThread": "true",
              "enableBackupThreadCache": "true",
              .....
          },
          "render_strategy": "DATA_RENDER"
      }
      
    • Eagle Page
      As bundleType is Others, env.options will not be merged into env.

      {
          "bundleType": "Others",
          "bundleUrl": "xxxx",
          "env": {
              "deviceHeight": "1200",
              "deviceWidth": "720",
              "options": {
                  "enableBackupThread": "true",
                  "enableBackupThreadCache": "true",
                  .....
              }
              ....
          },
          "render_strategy": "DATA_RENDER"
      }
      
  • After

    1. No matter what bundleType, always merge env.options into env

    2. For compatibility reason, remain the env.options at its original place.

         {
             "bundleType": "Other",
             "bundleUrl": "xxxx",
             "env": {
                 "deviceHeight": "1200",
                 "deviceWidth": "720",
                 "enableBackupThread": "true",
                 "enableBackupThreadCache": "true",
                 "options": {
                     "enableBackupThread": "true",
                     "enableBackupThreadCache": "true",
                     .....
                 }
                 .....
             },
             "render_strategy": "DATA_RENDER"
         }
      

@weex-bot
Copy link

weex-bot commented May 15, 2019

Fails
🚫 Failed to run assembleDebug task for android.
Messages
📖 android build verification finished.

Generated by 🚫 dangerJS

YorkShen added 4 commits May 15, 2019 21:10
# Before
## Normal Page

    {
        "bundleType": "Vue",
        "bundleUrl": "xxxx",
        "env": {
            "deviceHeight": "1200",
            "deviceWidth": "720",
            "enableBackupThread": "true",
            "enableBackupThreadCache": "true",
            .....
        },
        "render_strategy": "DATA_RENDER"
    }
## Eagle Page
As bundleType is `Others`, `env.options` will not be merged into `env`.

    {
        "bundleType": "Others",
        "bundleUrl": "xxxx",
        "env": {
            "deviceHeight": "1200",
            "deviceWidth": "720",
            "options": {
                "enableBackupThread": "true",
                "enableBackupThreadCache": "true",
                .....
            }
            ....
        },
        "render_strategy": "DATA_RENDER"
    }

# After
1. No matter what bundleType, always merge `env.options` into `env`
1. For compatibility reason, remain the `env.options` at its original place.

    {
        "bundleType": "Other",
        "bundleUrl": "xxxx",
        "env": {
            "deviceHeight": "1200",
            "deviceWidth": "720",
            "enableBackupThread": "true",
            "enableBackupThreadCache": "true",
            "options": {
                "enableBackupThread": "true",
                "enableBackupThreadCache": "true",
                .....
            }
            .....
        },
        "render_strategy": "DATA_RENDER"
    }
Copy link
Contributor

@jianhan-he jianhan-he left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jianhan-he jianhan-he merged commit d4fdf75 into apache:master May 16, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants