@conecli/cone-render 0.10.1-shop-beta.4 → 0.10.1-shop-beta.5

package/dist/utils/connectNativeJsBridge.weapp.ts

@@ -1 +1 @@
-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)
+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/h5Utils.ts

@@ -1 +1 @@
-import {
  isApp,
  isIOS,
  getAppVersion,
  version,
  getUUID,
  getUrlQuery,
  assign,
  isString,
  isObject,
  serialize,
  isAndroid,
  versionCompare,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_TYPE,
    SECTION_HOME_TAB_TYPE,
  parseQueryUrlObj,
  if (window?.__sgm__) {
    resolve(true)
  } else {
    if (isSgmReadyError) {
      console.log("当前sgm初始化失败")
      reject(false)
    } else {
      ready('__sgm__', 2000).then(() => {
        isSgmReadyError = false
        console.log("当前sgm初始化成功")
        resolve(true)
      }).catch(() => {
        isSgmReadyError = true
        console.log("当前sgm初始化失败")
        reject(false)
      })
    }
  }
    try {
        return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
    } catch (e) {
        return {}
    }
    isWxMiniH5View && urlCookie['wxapp_type'] == '1' 
  if (isH5AdnJxMini) {
   return 'jxxcx'
  } else if (isTJApp) {
    return 'tjapp'
  } else if (isTjM) {
  return 'tjm'
  } else if (isTjJxM) {
    return 'jxh5'
  }
  return ''
    if (isJdApp) {
        isIosDevice
            ? e && e.stopPropagation()
            : androidDeviceStopNativeScrollEvent(state)
    }
    isJdApp &&
        isAndroidDevice &&
        window?.JdAndroid &&
        window?.JdAndroid.requestEvent(state)
    if (isH5AndJdShopView) {
        return (
            CHANNEL_TYPE[currentChannel] ||
            CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
        )
    }
    return null
  isH5 && isJdApp && ['/app/home', '/app/classify', '/member/shopcard','/favorite/list', '/favorite/home'].includes(urlPathname)
  isH5 && isJdApp && !['/app/home'].includes(urlPathname)
  return isJdApp ? versionCompare(nowVersion, compareVersion) : -2
  getSgmReadyPromise().then(() => {
    if (
      customObj.hasOwnProperty('code') &&
      customObj.code.indexOf(NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG) !== -1
    ) {
      const originCode = customObj.code.substring(
          NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG.length,
          customObj.code.length,
        )
      customObj['code'] = getSgmCustomCode(originCode)
    }
    const getCustomObj = {
      type: 1, 
      code: 'all', 
      cost1: 1, 
      ...customObj
    }
    try {
      window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
    } catch (e) {
      console.log("当前sgm上报异常, 原始数据为",JSON.stringify(customObj))
    }
  }).catch(() => {
    console.error("当前页面sgm加载异常，无法进行异常上报, 原始数据为",JSON.stringify(customObj))
  })
  if(isJdAndAndroidDevice && typeof displayObj === 'object'){
    const deviceRatio = window?.devicePixelRatio
    Object.keys(displayObj).forEach(key => {
      if(key === 'nativeHeaderHeight'){
        displayObj[key] = Math.ceil(displayObj[key] / (deviceRatio * deviceRatio) - 2) 
      }else {
        displayObj[key] = Math.ceil(displayObj[key] / deviceRatio)
      }
    })
  }
  return displayObj
+import {
  isApp,
  isIOS,
  getAppVersion,
  version,
  getUUID,
  getUrlQuery,
  assign,
  isString,
  isObject,
  serialize,
  isAndroid,
  versionCompare,
  isIPad,
    CHANNEL_TYPE,
    JDShopViewBusinessPathType,
    JDShopViewBusinessPathList,
    SECTION_HOME_TAB_NAME_TYPE,
    SECTION_HOME_TAB_TYPE,
  parseQueryUrlObj,
  if (window?.__sgm__) {
    resolve(true)
  } else {
    if (isSgmReadyError) {
      console.log("当前sgm初始化失败")
      reject(false)
    } else {
      ready('__sgm__', 2000).then(() => {
        isSgmReadyError = false
        console.log("当前sgm初始化成功")
        resolve(true)
      }).catch(() => {
        isSgmReadyError = true
        console.log("当前sgm初始化失败")
        reject(false)
      })
    }
  }
    try {
        return JSON.parse(decodeURIComponent(getUrlQuery('cookie')))
    } catch (e) {
        return {}
    }
    isWxMiniH5View && urlCookie['wxapp_type'] == '1' 
  if (isH5AdnJxMini) {
   return 'jxxcx'
  } else if (isTJApp) {
    return 'tjapp'
  } else if (isTjM) {
  return 'tjm'
  } else if (isTjJxM) {
    return 'jxh5'
  }
  return ''
  START: 'start',
  MOVE: 'move',
  END: 'end',
  x: 0,
  y: 0
  const startX = startPos.x
  const startY = startPos.y
  const endX = touchEvent.clientX
  const endY = touchEvent.clientY
  const dy = startY - endY
  const dx = endX - startX
  let result = 0
  if (Math.abs(dx) < 2 && Math.abs(dy) < 2) {
    return result
  }
  const angle = Math.atan2(dy,dx) * 180 / Math.PI
  if (angle >= -45 && angle < 45) {
    result = 4
  } else if (angle >= 45 && angle < 135) {
    result = 1
  } else if (angle >= -135 && angle < -45) {
    result = 2
  } else if ((angle >= 135 && angle <= 180) || (angle >= -180 && angle < -135)) {
    result = 3
  }
  return result
  if (isJdApp && e) {
    const touchEvent =
      e?.originalEvent?.targetTouches[0] || e?.targetTouches[0]
    let _touchState = touchType
    let _getDirectionState = false
    if(touchType === TouchType.START){
      StopNativeScrollEventPos.x = touchEvent.clientX
      StopNativeScrollEventPos.y = touchEvent.clientY
    }else if(touchType === TouchType.MOVE){
      _getDirectionState = [1,2].includes(touchMoveGetSlideDirection(StopNativeScrollEventPos,touchEvent))
      if(_getDirectionState){
        _touchState = TouchType.END
      }
      console.log("对外提供阻止横滑方法，当前touchType为move,设定1、2向上或向下方向，当前计算后的滑动是否为纵向", _getDirectionState)
    }else if(touchType === TouchType.END){
      StopNativeScrollEventPos.x = 0
      StopNativeScrollEventPos.y = 0
    }
    isIosDevice
      ? iosDeviceStopNativeScrollEvent(e, _touchState, stopTouchDocumentScrollState)
      : androidDeviceStopNativeScrollEvent(_touchState, stopTouchDocumentScrollState)
    if(!isAppHomeForMarketPage && stopTouchDocumentScrollState && _touchState === TouchType.START){
      rootEleNode && rootEleNode.classList.add('over-hidden')
    }
    if(_touchState === TouchType.MOVE && _getDirectionState){
      rootEleNode && rootEleNode.classList.contains('over-hidden') && rootEleNode.classList.remove('over-hidden')
    }else if (_touchState === TouchType.END) {
      setTimeout(() => {
        rootEleNode && rootEleNode.classList.contains('over-hidden') && rootEleNode.classList.remove('over-hidden')
      },isAppHomeForMarketPage || _getDirectionState ? 0 : 200)
    }
  }
  isJdApp &&
  touchType !== TouchType.MOVE &&
  isAndroidDevice &&
  window?.JdAndroid &&
  window?.JdAndroid.requestEvent(touchType === TouchType.START)
  console.log("对外提供阻止安卓横滑方法,true-禁止外部事件H5可滑动，false-外部拦截h5事件，当前touchType为",touchType,"当前非move触发requestEvent状态为",touchType === TouchType.START,"当前stopTouchDocumentScrollState为",stopTouchDocumentScrollState)
  e && e.stopPropagation();
  console.log("对外提供阻止ios横滑方法，当前touchType为", touchType, "当前stopTouchDocumentScrollState为",stopTouchDocumentScrollState)
  window?.webkit?.messageHandlers?.MobileNavi?.postMessage?.({
    method: 'callRouterModuleWithParams',
    params: {
      routerURL: 'router://JDShopModule/processShoph5SlideState',
      routerParam: {
        slideDirection: 'horizontal',
        state: touchType,
      },
      callBackId: new Date().getTime(),
    },
  })
    if (isH5AndJdShopView) {
        return (
            CHANNEL_TYPE[currentChannel] ||
            CHANNEL_TYPE[JDShopViewBusinessPathType.HOME]
        )
    }
    return null
  isH5 && isJdApp && ['/app/home', '/app/classify', '/member/shopcard','/favorite/list', '/favorite/home'].includes(urlPathname)
  isH5 && isJdApp && !['/app/home'].includes(urlPathname)
  return isJdApp ? versionCompare(nowVersion, compareVersion) : -2
  getSgmReadyPromise().then(() => {
    if (
      customObj.hasOwnProperty('code') &&
      customObj.code.indexOf(NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG) !== -1
    ) {
      const originCode = customObj.code.substring(
          NO_ENVIRONMENT_AND_PAGE_TYPE_FLAG.length,
          customObj.code.length,
        )
      customObj['code'] = getSgmCustomCode(handleSgmCodeTaroVersion(originCode))
    }
    const getCustomObj = {
      type: 1, 
      code: 'all', 
      cost1: 1, 
      ...customObj
    }
    try {
      window.__sgm__.custom(getCustomObj, '9HwAEg@fTtWBB3EnwA5VgLT')
    } catch (e) {
      console.log("当前sgm上报异常, 原始数据为",JSON.stringify(customObj))
    }
  }).catch(() => {
    console.error("当前页面sgm加载异常，无法进行异常上报, 原始数据为",JSON.stringify(customObj))
  })
  if(isJdAndAndroidDevice && typeof displayObj === 'object'){
    const deviceRatio = window?.devicePixelRatio
    Object.keys(displayObj).forEach(key => {
      if(key === 'nativeHeaderHeight'){
        displayObj[key] = Math.ceil(displayObj[key] / (deviceRatio * deviceRatio) - 2) 
      }else {
        displayObj[key] = Math.ceil(displayObj[key] / deviceRatio)
      }
    })
  }
  return displayObj