@conecli/cone-render 0.8.39 → 0.8.40

package/dist/utils/connectNativeJsBridge.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
    latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = {
        displayHeight: 1920,
        offSetY: 0
    }
    console.log('>>>>>>>>>>>>>>>>>>> render taroEventSendPageScrollInfo origin time:', Date.now(), 'res:', options)
    if(options){
        latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = options
    }
    const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
    const { shopHomeExtendInfo } = options
    if(shopHomeExtendInfo) {
      Taro.eventCenter.trigger(TaroEventType.UPDATE_SHOP_HOME_EXTEND_DATA,shopHomeExtendInfo)
    }
 }
  window && window.scrollTo(0, 0);
 }
  PAGE_PV_PARAM: 'pagePvParam', 
  NATIVE_SCORLL_VIEW: 'nativeScrollControl', 
  NATIVE_PUSH_NATIVE_PAGE: 'pushNativePage', 
  UPDATE_NATIVE_DATA: 'updateNativeData', 
  H5_TO_SCROLL_TOP: 'h5ToScrollTop', 
    OPEN: 'open',
      newHomePage: true, 
            case Message_Type.UPDATE_NATIVE_DATA:
              console.log('接收到原生通知 UPDATE_NATIVE_DATA',messageData)
              console.log('接收到原生通知 UPDATE_NATIVE_DATA getSendJsonData',getSendJsonData)
              taroEventUpdateNativeData(getSendJsonData)
              break;
            case Message_Type.H5_TO_SCROLL_TOP:
              taroEventH5ToScrollTop()
  nativePageRegisterMessage(Message_Type.NATIVE_PUSH_NATIVE_PAGE, {
    data: params,
  })
  const { displayHeight, offSetY } = res
  if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined') return
  if (isIosDevice) return res
  if (isAndroidDevice) {
    const deviceRatio = window.devicePixelRatio
    const cssDisplayHeight = Math.ceil(displayHeight / deviceRatio)
    const cssOffsetY = Math.ceil(offSetY / deviceRatio)
    return {
      displayHeight: cssDisplayHeight,
      offSetY: cssOffsetY
    }
  }
+import Taro from '@tarojs/taro'
  isH5AndJdShopView,
  isJdApp,
  isIosDevice,
  isAndroidDevice,
  isJdAndIosDevice,
  isJdAndAndroidDevice,
  jdAppVersionCompare,
  isAppStowShop,
  (window.JDJshopViewInfo = {
    androidTouchSlop: 5,
    getAndroidTouchSlopState: false,
  })
  state => {
    console.log(
      'document trigger PAGE_DOCUMENT_VISIBILITY_CHANGE state:',
      state,
    )
    Taro.eventCenter.trigger(
      TaroEventType.PAGE_DOCUMENT_VISIBILITY_CHANGE,
      state ? 0 : 1,
    )
  },
  1500,
  { leading: false, trailing: true },
  state => {
    console.log(
      'IOS Android trigger PAGE_DOCUMENT_VISIBILITY_CHANGE state:',
      state,
    )
    Taro.eventCenter.trigger(
      TaroEventType.PAGE_DOCUMENT_VISIBILITY_CHANGE,
      state,
    )
  },
  1500,
  { leading: true, trailing: false },
  if (!isJdApp) {
    if (isH5) {
      
      const documentHandleVisibilityChange = () => {
        const state = document.hidden
        window.startDocumentVisibilityChange && documentThrottledTrigger(state)
      }
      document.removeEventListener(
        'visibilitychange',
        documentHandleVisibilityChange,
      )
      console.log('每次进入页面先清除浏览器visibilitychange监听事件')
      setTimeout(() => {
        document.addEventListener(
          'visibilitychange',
          documentHandleVisibilityChange,
          false,
        )
        window.startDocumentVisibilityChange = true
      }, 3000)
    }
  } else {
    
    !window.webviewVisible &&
      (window.webviewVisible = state => {
        window.startDocumentVisibilityChange && webviewThrottledTrigger(state)
        state === 1 && taroEventSendPageScrollInfo()
      })
    setTimeout(() => {
      window.startDocumentVisibilityChange = true
    }, 3000)
    !window.floatReceiveData && (window.floatReceiveData = () => {})
  }
  MESSAGE_HOME_INIT: 'messageHomeInitPageData',
  [Message_CallBack_Name.MESSAGE_HOME_INIT]: {},
  latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = {
    displayHeight: 1920,
    offSetY: 0,
  }
  if (options) {
    latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] = options
  }
  const latestRes = latestFromNativeMsgStorage[TaroEventType.PAGE_SCROLL] || {}
  Taro.eventCenter.trigger(TaroEventType.PAGE_SCROLL, options || latestRes)
  console.log('PageScrollEnd fire')
  Taro.eventCenter.trigger(TaroEventType.PAGE_SCROLL_END, options)
  const { businessType } = options
  switch (businessType) {
    case H5_MSG_TO_H5_BUSINESSTYPE.JOIN_MEMBER_SUCCESS:
      Taro.eventCenter.trigger(TaroEventType.JOIN_MEMBER_SUCCESS, options)
      break
    default:
      break
  }
  const { shopHomeExtendInfo } = options
  if (shopHomeExtendInfo) {
    Taro.eventCenter.trigger(
      TaroEventType.UPDATE_SHOP_HOME_EXTEND_DATA,
      shopHomeExtendInfo,
    )
  }
  window && window.scrollTo(0, 0)
  Taro.eventCenter.trigger(TaroEventType.PAGE_INIT_EXPOSURE, options)
  const { action, params } = options
  console.log('taroEventShopStowSend', options)
  if (action) {
    Taro.eventCenter.trigger(action, params)
  }
  NATIVE_PAGE_READ: 'pageReady', 
  NATIVE_PAGE_FINISH: 'pageFinish', 
  NATIVE_INFO_DATA: 'nativeInfoData', 
  NATIVE_PAGE_SCROLL: 'pageScroll', 
  NATIVE_PAGE_SCROLL_END: 'pageScrollEnd', 
  NATIVE_GET_SCROLL_TOP: 'nativeGetScrollTop', 
  NATIVE_TO_SCROLL_TOP: 'nativeToScrollTop', 
  NATIVE_CLOSE_SCROLL_MESSAGE: 'nativeCloseScrollMessage', 
  NATIVE_MOBILE_CONFIG: 'getMobileConfig', 
  NATIVE_SHOW_TOAST: 'showToast', 
  NATIVE_SHOW_DIALOG: 'showDialog', 
  NATIVE_PAGE_LAYOUT_CHANGE: 'pageLayoutChange', 
  NATIVE_HOME_PAGING_ENABLE: 'homePagingEnable', 
  NATIVE_GET_SCALED_TOUCH_SLOP: 'getScaledTouchSlop', 
  NATIVE_ADD_CART: 'addCart',
  NATIVE_OPEN_FLOAT: 'openFloat', 
  NATIVE_INJECT_JS_FILE: 'needIsvPackage', 
  NAVTIVE_FLOAT_READY: 'floatReady', 
  NATIVE_REFRESH_PAGE: 'refreshPage', 
  PAGE_PV_PARAM: 'pagePvParam', 
  NATIVE_SCORLL_VIEW: 'nativeScrollControl', 
  NATIVE_POP_WEBVIEW: 'popWebview', 
  NATIVE_H5_SEND_MSG_TO_H5: 'h5SendMsgToH5', 
  NATIVE_PUSH_NATIVE_PAGE: 'pushNativePage', 
  UPDATE_NATIVE_DATA: 'updateNativeData', 
  H5_TO_SCROLL_TOP: 'h5ToScrollTop', 
  LUXURY_INFORM_CHANGE_HEIGHT: 'sendImmersionStatus', 
  NATIVE_SHOPSTOW_SEND: 'sendMsgToShopStow', 
  NATIVE_UPDATE_PAGE_INFO: 'pageCountInfo', 
  NATIVE_TO_BUYER_SHOW_DETAIL: 'jumpBuyerShowDetail', 
  NATIVE_TO_HIDE_JD_SHOP_HEADER: 'hideNativeHeader', 
  OPEN: 'open',
  CLOSE: 'close',
  JOIN_MEMBER_SUCCESS: 'joinMemberSuccess', 
  type = Message_Type.NATIVE_PAGE_READ,
  sendData: null | object = null,
  callBackName = Message_CallBack_Name.MESSAGE_HOME_INIT,
  console.log(
    '初始化nativePageRegisterMessage-isAppStowShop-type-sendData-isJdApp-isH5AndJdShopView',
    isAppStowShop,
    type,
    sendData,
    isJdApp,
    isH5AndJdShopView,
    callBackName,
  )
  if (isJdApp) {
    const getCallBackName = `window.${callBackName}`
    let getRouterParam = {
      type,
      callBackName: getCallBackName,
    }
    if (!isAppStowShop) {
      getRouterParam['newHomePage'] = true 
    }
    if (sendData) {
      getRouterParam = Object.assign({}, getRouterParam, sendData)
    }
    if (isIosDevice) {
      const routerURL = isAppStowShop
        ? 'router://JDBDecorationPlatformModule/wrtNative'
        : 'router://JDShopModule/wrtNative' 
      if (versionCompare(jdAppVersionStr, MPAAS_CONFIG_APP_VERSION) >= 0) {
        callRouterIOS({
          routerURL,
          routerParam: getRouterParam,
        })
      } else {
        window?.webkit?.messageHandlers?.JDAppUnite?.postMessage({
          method: 'callRouterModuleWithParams',
          params: {
            routerURL, 
            routerParam: JSON.stringify(getRouterParam), 
            callBackName: getCallBackName, 
            callBackId: `${callBackName}Ios`, 
          },
        })
      }
    } else if (isAndroidDevice) {
      window?.JDJshop?.wrtNative(
        JSON.stringify({
          routerParam: JSON.stringify(getRouterParam), 
          callBackName: getCallBackName, 
          callBackId: `${callBackName}Android`, 
        }),
      )
    }
    return true
  }
  return false
  if (isJdApp) {
    if (isIosDevice) {
      window?.webkit?.messageHandlers?.MobileNavi?.postMessage({
        method: 'close',
      })
    } else if (isAndroidDevice) {
      window?.XView && window?.XView.close()
    }
  }
  console.log('showToastByRouter:', title, showType)
  if (isJdApp && isH5AndJdShopView) {
    const routerParam = {
      message: title,
      iconType: showType,
      duration,
    }
    if (isIosDevice) {
      callRouterIOS({
        routerURL: 'router://JDShopModule/showToast',
        routerParam,
      })
    } else if (isAndroidDevice) {
      callRouterAndroid({
        routerURL: 'router://JDJShopModule/showToast',
        routerParam,
      })
    }
  }
  console.log("nativePageLoadReady called")
  Message_Trigger_CallBackFuncObj[Message_CallBack_Name.MESSAGE_HOME_INIT][
    Message_Type.NATIVE_INFO_DATA
  ] = async (data: any) => {
    console.log("nativePageLoadReady callBack:", callBack, ", data:", data)
    callBack && callBack(data)
  }
  nativePageGetMessageInitCallBack()
  nativePageRegisterMessage(
    Message_Type.NATIVE_PAGE_READ,
    sendData,
    Message_CallBack_Name.MESSAGE_HOME_INIT,
  )
  return nativePageRegisterMessage(
    Message_Type.NATIVE_PAGE_FINISH,
    null,
    Message_CallBack_Name.MESSAGE_HOME_INIT,
  )
  callBack &&
    (Message_Trigger_CallBackFuncObj[Message_CallBack_Name.MESSAGE_HOME_INIT][
      Message_Type.NATIVE_GET_SCROLL_TOP
    ] = callBack)
  return nativePageRegisterMessage(
    Message_Type.NATIVE_GET_SCROLL_TOP,
    null,
    Message_CallBack_Name.MESSAGE_HOME_INIT,
  )
  callBack &&
    (Message_Trigger_CallBackFuncObj[Message_CallBack_Name.MESSAGE_HOME_INIT][
      Message_Type.NATIVE_TO_SCROLL_TOP
    ] = callBack)
  nativePageRegisterMessage(
    Message_Type.NATIVE_TO_SCROLL_TOP,
    {
      data: {
        scrollTop,
      },
    },
    Message_CallBack_Name.MESSAGE_HOME_INIT,
  )
  Taro.eventCenter.trigger(TaroEventType.LUXURY_INFORM_CHANGE_HEIGHT, data)
  configName: string,
  isBeforePageReady: boolean,
  return new Promise((resolve, reject) => {
    if (!isJdApp) {
      reject({
        code: -1,
        message: 'getMPaasConfigByNative 只在松果APP店铺内部调用有效。',
      })
      return
    }
    if (
      isIosDevice &&
      isBeforePageReady &&
      versionCompare(jdAppVersionStr, MPAAS_CONFIG_APP_VERSION) < 0
    ) {
      reject({
        code: -2,
        message: `在nativePageLoadReady之前调用，低于v${MPAAS_CONFIG_APP_VERSION}不会有返回，兜底处理`,
      })
      return
    }
    Message_Trigger_CallBackFuncObj[Message_CallBack_Name.MESSAGE_HOME_INIT][
      Message_Type.NATIVE_MOBILE_CONFIG
    ] = (data: any) => {
      const configData = isAndroidDevice ? data : data?.data
      const res = JSONParse(configData)
      resolve(res)
    }
    nativePageGetMessageInitCallBack()
    nativePageRegisterMessage(
      Message_Type.NATIVE_MOBILE_CONFIG,
      {
        data: {
          space: isIosDevice ? 'JDCDSHOP' : 'JDShop', 
          configName,
        },
      },
      Message_CallBack_Name.MESSAGE_HOME_INIT,
    )
  })
  bussinessKey: string,
  isBeforePageReady: boolean,
  if (!bussinessKey) {
    return null
  }
  if (!isJdApp) {
    return null
  }
  const CACHED_MPAAS_KEY = `mpaas_${CONFIG_NAME}`
  let configData = window[CACHED_MPAAS_KEY]
  if (configData == null) {
    configData = await getMPaasConfigByNative(
      CONFIG_NAME,
      isBeforePageReady,
    ).catch(e => {
      console.log('getMPaasConfigByNative error:', e)
      return null
    })
    window[CACHED_MPAAS_KEY] = configData
  }
  if (configData) {
    return configData[bussinessKey]
  }
  return null
  nativePageRegisterMessage(Message_Type.NATIVE_CLOSE_SCROLL_MESSAGE)
  if (isJdAndAndroidDevice) {
    callBack &&
      (Message_Trigger_CallBackFuncObj[Message_CallBack_Name.MESSAGE_HOME_INIT][
        Message_Type.NATIVE_HOME_PAGING_ENABLE
      ] = callBack)
    nativePageRegisterMessage(Message_Type.NATIVE_HOME_PAGING_ENABLE, {
      data: {
        enable: enable,
      },
    })
  }
  if (isJdAndAndroidDevice) {
    callBack &&
      (Message_Trigger_CallBackFuncObj[Message_CallBack_Name.MESSAGE_HOME_INIT][
        Message_Type.NATIVE_GET_SCALED_TOUCH_SLOP
      ] = callBack)
    nativePageRegisterMessage(Message_Type.NATIVE_GET_SCALED_TOUCH_SLOP)
  }
  SUCCESS: 'success',
  FAIL: 'fail',
  NORMAL: 'normal',
  SUCCESS: 2,
  FAIL: 3,
  NORMAL: 1,
  SUCCESS: 2,
  FAIL: 3,
  NORMAL: 1,
  [ToastIosType.NORMAL]: ToastType.NORMAL,
  [ToastIosType.SUCCESS]: ToastType.SUCCESS,
  [ToastIosType.FAIL]: ToastType.FAIL,
  if(isShowNewRouterToast){
    const changeShowType = isJdAndIosDevice ? toastIosTypeToNewToastType[showType] || showType : showType
    showToastByRouter(title, changeShowType, duration * 1000)
  }else {
    nativePageRegisterMessage(Message_Type.NATIVE_SHOW_TOAST, {
      data: {
        message: title,
        iconType: showType,
        duration, 
      },
    })
  }
  routerURL,
  routerParam,
  callBackName = Message_CallBack_Name.MESSAGE_HOME_INIT,
  console.log(
    'callRouterIOS routerURL:',
    routerURL,
    ',routerParam:',
    routerParam,
  )
  const getCallBackName = `window.${callBackName}`
  const params = {
    routerURL, 
    routerParam, 
    callBackName: getCallBackName, 
    callBackId: `${callBackName}Ios`, 
  }
  window?.webkit?.messageHandlers?.JDAppUnite?.postMessage({
    method: 'callRouterModuleWithParams',
    params: JSON.stringify(params),
  })
  routerURL,
  routerParam,
  callBackName = Message_CallBack_Name.MESSAGE_HOME_INIT,
  console.log(
    'callRouterAndroid routerURL:',
    routerURL,
    ',routerParam:',
    routerParam,
  )
  const getCallBackName = `window.${callBackName}`
  var params = {
    jdRouter: '1', 
    routerURL, 
    routerParam, 
    callBackName: getCallBackName, 
    callBackId: `${callBackName}Android`, 
  }
  window?.JDAppUnite?.callRouterModuleWithParams(JSON.stringify(params))
  callBack &&
    (Message_Trigger_CallBackFuncObj[Message_CallBack_Name.MESSAGE_HOME_INIT][
      Message_Type.NATIVE_SHOW_DIALOG
    ] = callBack)
  return nativePageRegisterMessage(Message_Type.NATIVE_SHOW_DIALOG, {
    data: params,
  })
  if (!isJdApp) {
    return
  }
  if (!window[Message_CallBack_Name.MESSAGE_HOME_INIT]) {
    window[Message_CallBack_Name.MESSAGE_HOME_INIT] = messageData => {
      try {
        const getMessageJsonData = JSONParse(messageData)
        const { status } = getMessageJsonData
        if (status == '0') {
          const { type, data } = getMessageJsonData?.data
          const getSendJsonData = JSONParse(data)
          switch (type) {
            case Message_Type.NATIVE_INFO_DATA:
            case Message_Type.NATIVE_PAGE_FINISH:
            case Message_Type.NATIVE_GET_SCROLL_TOP:
            case Message_Type.NATIVE_TO_SCROLL_TOP:
            case Message_Type.NATIVE_CLOSE_SCROLL_MESSAGE:
            case Message_Type.NATIVE_GET_SCALED_TOUCH_SLOP:
            case Message_Type.NATIVE_MOBILE_CONFIG:
              const getTypeCallBack =
                Message_Trigger_CallBackFuncObj[
                  Message_CallBack_Name.MESSAGE_HOME_INIT
                ][type]
              if (getTypeCallBack) {
                const isCallBackFunc = typeof getTypeCallBack === 'function'
                console.log(
                  `获取${type}类型数据数据type isCallBackFunc getMessageJsonData `,
                  type,
                  isCallBackFunc,
                  getMessageJsonData,
                )
                isCallBackFunc && getTypeCallBack(getSendJsonData)
              }
              break
            case Message_Type.NATIVE_SHOW_DIALOG:
              const showDialogCallBack =
                Message_Trigger_CallBackFuncObj[
                  Message_CallBack_Name.MESSAGE_HOME_INIT
                ][type]
              if (showDialogCallBack) {
                const isCallBackFunc = typeof showDialogCallBack === 'function'
                console.log(
                  `获取${type}类型数据数据type isCallBackFunc getMessageJsonData `,
                  type,
                  isCallBackFunc,
                  getMessageJsonData,
                )
                isCallBackFunc && showDialogCallBack(getMessageJsonData?.data)
              }
              break
            case Message_Type.NATIVE_PAGE_SCROLL:
              taroEventSendPageScrollInfo(data)
              break
            case Message_Type.NATIVE_PAGE_SCROLL_END:
              taroEventSendPageScrollEndInfo(data)
              break
            case Message_Type.NATIVE_H5_SEND_MSG_TO_H5:
              console.log('接收到原生通知 NATIVE_H5_SEND_MSG_TO_H5', data)
              taroEventH5SendMsgToH5(getSendJsonData)
              break
            case Message_Type.UPDATE_NATIVE_DATA:
              taroEventUpdateNativeData(getSendJsonData)
              break
            case Message_Type.H5_TO_SCROLL_TOP:
              taroEventH5ToScrollTop()
              break
            case Message_Type.LUXURY_INFORM_CHANGE_HEIGHT:
                taroEventSendImmersionStatus(data)
                break
            case Message_Type.NATIVE_SHOPSTOW_SEND:
              console.log('接收到原生通知 NATIVE_SHOPSTOW_SEND', messageData)
              console.log(
                '接收到原生通知 NATIVE_SHOPSTOW_SEND getSendJsonData',
                getSendJsonData,
              )
              taroEventShopStowSend(getSendJsonData)
              break
            default:
          }
        } else {
          console.log('传递数据获取异常', getMessageJsonData)
        }
      } catch (e) {
        console.log('获取转换异常结果', e)
      }
    }
  }
  nativePageRegisterMessage(Message_Type.NATIVE_OPEN_FLOAT, {
    data: params,
  })
  nativePageRegisterMessage(Message_Type.NATIVE_POP_WEBVIEW, {
    data: {
      type: NATIVE_POP_WEBVIEW_TYPE.OPEN,
      height: DEFAULT_POP_WEBVIEW_HEIGHT, 
      ...params,
    },
  })
  nativePageRegisterMessage(Message_Type.NATIVE_POP_WEBVIEW, {
    data: {
      type: NATIVE_POP_WEBVIEW_TYPE.CLOSE,
      ...params,
    },
  })
  Taro.eventCenter.off(TaroEventType.JOIN_MEMBER_SUCCESS)
  console.log('popWebview关闭')
  nativePageRegisterMessage(Message_Type.NATIVE_H5_SEND_MSG_TO_H5, {
    data: params,
  })
  nativePageRegisterMessage(Message_Type.NATIVE_PUSH_NATIVE_PAGE, {
    data: params,
  })
  window &&
    (window.location.href = `xview://search?request={"action":"${Message_Type.NAVTIVE_FLOAT_READY}"}`)
  res: UtilsInterFace.nativePageScrollRes,
  const { displayHeight, offSetY } = res
  if (typeof displayHeight === 'undefined' || typeof offSetY === 'undefined')
    return
  if (isIosDevice) return res
  if (isAndroidDevice) {
    const deviceRatio = window.devicePixelRatio
    const cssDisplayHeight = Math.ceil(displayHeight / deviceRatio)
    const cssOffsetY = Math.ceil(offSetY / deviceRatio)
    return {
      displayHeight: cssDisplayHeight,
      offSetY: cssOffsetY,
    }
  }
  nativePageRegisterMessage(Message_Type.NATIVE_UPDATE_PAGE_INFO, {
    data: params,
  })
  nativePageRegisterMessage(Message_Type.NATIVE_TO_BUYER_SHOW_DETAIL, {
    data: params,
  })
  nativePageRegisterMessage(Message_Type.NATIVE_TO_HIDE_JD_SHOP_HEADER, {
    data: params,
  })

package/dist/utils/connectNativeJsBridge.weapp.ts

@@ -1 +1 @@
-import Taro from "@tarojs/taro";
+import Taro from '@tarojs/taro'
  console.log('PageScrollEnd fire')
  Taro.eventCenter.trigger(TaroEventType.PAGE_SCROLL_END, options)
  Taro.eventCenter.trigger(TaroEventType.PAGE_INIT_EXPOSURE, options)

package/dist/utils/draExceptionAndProfile.ts

@@ -1 +1 @@
-import JdDraProfileAndException from "./jm-js-agent-jd-profile";
+import JdDraProfileAndException from './jm-js-agent-jd-profile'
  JdDraProfileAndException.jdProfiler.init({
    flag: 149,
    autoReport: true, 
    autoAddApiReport: true, 
  })
  JdDraProfileAndException.JSAgent.init({
    flag: 149, 
    rate: 1, 
    ignoreErrors: [], 
    ignoreUrls: [], 
  })