@conecli/cone-render 0.8.38 → 0.8.40

package/dist/common/index.weapp.ts

@@ -1 +1 @@
-import Taro from '@tarojs/taro'
  public config: {
    [key: string]: any
  } 
    this.config = {}
        console.log('=================>', 'updateBusinessDomainAndApi')
  
        setTimeout(() => {
          console.log("微信app登录返回成功后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie")
          this.getLoginCookie(`${Date.now()}`)
        },500)
        this.getLoginCookie(`${Date.now()}`)
      setTimeout(() => {
        console.log("微信强制登录后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie")
        this.getLoginCookie(`${Date.now()}`)
      },500)
    return new Promise((resolve) => {
      console.log("开始获取更新wxapp中的cookie信息", updateKey)
      if(this.config.wqCookie && this.config.wqCookieStr && this.config.getWqCookieKey === updateKey){
        console.log("已有存储wxapp中的cookie信息，直接返回",this.config)
        resolve({
          wqCookie: this.config.wqCookie,
          wqCookieStr: this.config.wqCookieStr,
        })
      }else {
        if (isPublishToWxapp) {
          const getWxappCookieObj = getTaroStorageKeyValue('cookies') || null
          if (getWxappCookieObj) {
            const getCookieObj = getWxappCookieObj['_data']
            const { wqCookie, wqCookieStr } = getWxAppCookieStr(getCookieObj)
            const { pin = '', visitkey = '-1', wq_unionid = '', wxapp_openid = '' } = wqCookie
            this.info.loginState = true
            this.info.userInfo.wqCookie = wqCookieStr
            this.info.userInfo.wqVisitkey = visitkey
            console.log('获取用户完整cookie信息', getCookieObj)
            const getUserAddress = this.wxAppUserInfoInstance.getAddress()
            console.log('获取微信用户地址信息', getUserAddress)
            if (getUserAddress) {
              this.info.pageInfo.address = getUserAddress?.areaId
              this.info.pageInfo.addressCommaStr = this.info.pageInfo
                .address
                ? this.info.pageInfo.address.replace(/_/g, ',')
                : ''
              this.info.pageInfo.un_area = this.info.pageInfo.address
              Taro.eventCenter.trigger(
                TaroEventType.USER_AREA_UPDATE,
                this.info.pageInfo.address,
              )
            }
            if(this.miniAppLogInstance){
              this.miniAppLogInstance.set({
                account: pin,
                unionid: wq_unionid,
                openid: wxapp_openid,
              })
            }
            this.config.wqCookie = wqCookie
            this.config.wqCookieStr = wqCookieStr
            this.config.getWqCookieKey = updateKey
            console.log("解析wxapp中的cookie信息成功，返回后存储",this.config)
            resolve({
              wqCookie,
              wqCookieStr,
            })
          }else {
            console.log("解析wxapp中的cookie信息异常，返回异常结果",this.config)
            resolve({
              wqCookie: false,
              wqCookieStr: false,
            })
          }
        }else {
          resolve({
            wqCookie: false,
            wqCookieStr: false,
          })
        }
      }
    })
+import Taro from "@tarojs/taro";
  WXAPP_LOGIN,
  WXAPP_BIZ,
  WXAPP_USER_INFO,
  WXAPP_NAVIGATOR,
  WXAPP_REPORT_GDT,
  WXAPP_PARAMS_SIGN,
  WXAPP_FINGER_REPORT,
  WXAPP_REPORT_MANAGE,
  WXAPP_SUBS_GUIDER,
  BUSINESS_TYPE,
  SHOP_MENU_ID_TYPE,
  SHOP_MENU_ID_NAME,
  SECTION_HOME_TAB_NAME_TYPE,
  SECTION_HOME_TAB_TYPE,
  TaroEventType,
  WX_BUSINESS_TYPE,
  WXAPP_BIZ_KEY,
  WXAPP_BIZ_SHOP_LIGHT_KEY,
  getSystemInfos,
  getTaroStorageKeyValue,
  getWxAppCookieStr,
  objectToUrlEncode,
  loginState: jdUserLoginState, 
  cookiesStr: "", 
  userInfo: userPinKey,
  pageInfo: {
    wxBusinessType: WX_BUSINESS_TYPE.SHOP,
    address: "", 
    addressCommaStr: "", 
    un_area: "", 
    vapptype: "1", 
    pageType: "home", 
    dataType: BUSINESS_TYPE.ONLINE, 
    floorExposureInfo: {}, 
    floorVideInfo: {}, 
    productVideInfo: {}, 
    tabsLoadAllDataInfo: {
      [SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN]]:
        false,
      [SHOP_MENU_ID_NAME[SHOP_MENU_ID_TYPE.CLASSIFY]]: true, 
    }, 
    updateShopInfosAllState: false, 
    isVipShop: false, 
    isJdShowNativeImmersivePlayer: false, 
    ...shopConfig,
    pageScrollTop: 0, 
    pageIdxHeightInfo: {
      list: [],
    }, 
    shopNavBarHeight: 0, 
  },
  defaultQueryLogInfo: {
    sourceType: "JDshop",
    sourceValue: "",
    moduleId: "none", 
    entrance: "none",
  },
  originQueryInfo: {},
  sysInfo: {
    windowWidth: 0,
    windowHeight: 0,
    netWorkType: "4g",
    jdBottomBarHeight: 0,
    jdNativeHeaderHeight: 0,
  },
  queryInfo: {},
  shopInfo: {},
  openAppData: {}, 
  public info: CommonInterFace.BaseConfigInfo;
  public config: {
    [key: string]: any;
  }; 
  public lazyContainer: CommonInterFace.lazyContainer;
  public rootEleNode: HTMLElement | null;
  public miniApplogUtil: CommonInterFace.MiniApplogUtil;
  public miniAppLogInstance: CommonInterFace.MiniAppLog | null;
  public checkStatusAndLoginPromise: object | null;
  public wxAppLoginInstance: CommonInterFace.WxAppLogin;
  public wxAppBizInstance: CommonInterFace.WxAppUserInfo;
  public wxAppUserInfoInstance: CommonInterFace.WxAppUserInfo;
  public wxAppReportManageInstance: CommonInterFace.wxAppReportManage;
  public wxAppReportGDTInstance: CommonInterFace.WxAppReportGDT;
  public wxAppNavigatorInstance: CommonInterFace.WxAppNavigator;
  public wxAppParamsSignInstance: CommonInterFace.wxAppParamsSign;
  public wxAppFingerReportInstance: CommonInterFace.wxAppParamsSign;
  public wxAppSubsGuider: CommonInterFace.wxAppParamsSign;
  constructor(opt) {
    this.info = this._getConfig(opt);
    this.config = {};
    this.lazyContainer = {
      [SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_WELL_CHOSEN]]: {
        appLazyContainerList: [], 
        appLazyFinishContainerList: [], 
      },
      [SECTION_HOME_TAB_NAME_TYPE[SECTION_HOME_TAB_TYPE.HOME_PROMOTION]]: {
        appLazyContainerList: [], 
        appLazyFinishContainerList: [], 
      },
    };
    this.rootEleNode = null;
    this.miniApplogUtil = MiniAppLogUtil;
    this.miniAppLogInstance = null;
    this.checkStatusAndLoginPromise = null;
    this.wxAppLoginInstance = WXAPP_LOGIN;
    this.wxAppBizInstance = WXAPP_BIZ;
    this.wxAppUserInfoInstance = WXAPP_USER_INFO;
    this.wxAppReportManageInstance = WXAPP_REPORT_MANAGE;
    this.wxAppReportGDTInstance = WXAPP_REPORT_GDT;
    this.wxAppNavigatorInstance = WXAPP_NAVIGATOR;
    this.wxAppParamsSignInstance = WXAPP_PARAMS_SIGN;
    this.wxAppFingerReportInstance = WXAPP_FINGER_REPORT
      ? new WXAPP_FINGER_REPORT()
      : {};
    this.wxAppSubsGuider = WXAPP_SUBS_GUIDER;
  }
  _getConfig(opt) {
    return Object.assign({}, DefaultConfig, opt);
  }
  
  taskTimeoutPromise(callBack, timeout = 2000) {
    return new Promise((resolve) => {
      setTimeout(() => {
        const getCallBackRes = typeof callBack === "function" && callBack();
        return resolve(getCallBackRes || false);
      }, timeout);
    });
  }
  
  updateBusinessDomainAndApi(domain, api) {
    console.log("=================>", "updateBusinessDomainAndApi");
  }
  
  getFullScreenHeight(systemInfo) {
    const { screenHeight, statusBarHeight, isAndroid } = systemInfo;
    let result = screenHeight;
    if (statusBarHeight > 20 && isAndroid) {
      result = screenHeight + statusBarHeight;
    }
    return result;
  }
  
  getTabBarHeight(systemInfo) {
    const { statusBarHeight, isAndroid, isIOS } = systemInfo;
    let result = 50;
    if (statusBarHeight > 20) {
      if (isIOS) {
        result = 84;
      } else if (isAndroid) {
        result = 53;
      }
    }
    return result;
  }
  
  getSystemInfo() {
    const info: UtilsInterFace.taroGetSystemInfoSyncRes =
      getSystemInfos() || {};
    const actualNavBarHeight =
      (info?.navBarHeight || 0) + (info?.navBarExtendHeight || 0);
    const headerHeight = actualNavBarHeight + (info?.statusBarHeight || 0);
    const fullScreenHeight = this.getFullScreenHeight(info);
    const tabBarHeight = this.getTabBarHeight(info);
    const safeContentHeight = fullScreenHeight - headerHeight;
    this.info.sysInfo = {
      ...this.info.sysInfo,
      ...info,
      actualNavBarHeight,
      headerHeight,
      fullScreenHeight,
      tabBarHeight,
      safeContentHeight,
    };
    if (this.info.sysInfo["hostVersionName"]) {
      this.info.sysInfo["hostAppVersion"] = Number(
        this.info.sysInfo["hostVersionName"].replace(/\./g, "")
      );
    }
    this.info.sysInfo["wifiVideoAutoPlay"] = false;
    this.getNetWorkType();
    console.log("获取系统信息", this.info.sysInfo);
  }
  async updateMPaasConfig() {}
  
  getNetWorkType() {
    Taro.getNetworkType().then((getRes) => {
      getRes &&
      getRes.networkType &&
      (this.info.sysInfo["netWorkType"] = getRes.networkType);
    });
  }
  
  checkStatusAndLogin(options = {}) {
    this.checkStatusAndLoginPromise = new Promise((resolve, reject) => {
      console.log(
        "微信小程序登录状态及获取cookie状态的promise,之前登录状态",
        this.info.loginState
      );
      this.toLogin(options)
        .then((res) => {
          console.log("微信小程序登录状态结果,成功", res);
          this.info.loginState = true;
          resolve(res);
        })
        .catch((err) => {
          console.log("微信小程序登录异常状态结果", err);
          this.doLogin(options)
            .then((res2) => {
              console.log("微信小程序wxDoLogin强制登陆成功：", res2);
              this.info.loginState = true;
              resolve(res2);
            })
            .catch((err2) => {
              console.log("微信小程序wxDoLogin强制登陆失败：", err2);
              this.checkStatusAndLoginPromise = null;
              reject(err2);
            });
        });
    });
    return this.checkStatusAndLoginPromise;
  }
  
  checkJdStatusAndLogin(
    options = {
      loginColor: {
        bzi: WXAPP_BIZ_SHOP_LIGHT_KEY,
        dpin: 0,
      },
    }
  ) {
    return this.checkStatusAndLogin(options);
  }
  
  toLogin(options = {}): Promise<any> {
    return this.wxAppLoginInstance
      .getLoginPromise({
        mode: "silent",
        loginColor: {
          bzi: WXAPP_BIZ_KEY,
          dpin: 1, 
        },
        ...options,
      })
      .then((res) => {
        console.log("微信app登录返回信息,微信侧返回code为0表示成功", res);
        setTimeout(() => {
          console.log(
            "微信app登录返回成功后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie"
          );
          this.getLoginCookie(`${Date.now()}`);
        }, 500);
      })
      .catch((err) => {
        console.log("微信app登录异常返回信息，也获取cookie", err);
        this.getLoginCookie(`${Date.now()}`);
      });
  }
  
  doLogin(options = {}) {
    const getParams = {
      loginColor: {
        bzi: WXAPP_BIZ_KEY,
        dpin: 1, 
      },
      ...options,
    };
    if (isPublishToWxapp) {
      getParams[
        "returnUrl"
        ] = `/pages/shopx/pages/index/index?${objectToUrlEncode({
        ...this.info.originQueryInfo,
        loadShopxType: "redirect",
      })}`;
    }
    return this.wxAppLoginInstance.doLogin(getParams).then((res) => {
      console.log("微信小程序强制登录返回信息,微信侧返回code为0表示成功", res);
      setTimeout(() => {
        console.log(
          "微信强制登录后，后台会写入cookie，有延迟，这里延迟500ms去获取最新cookie"
        );
        this.getLoginCookie(`${Date.now()}`);
      }, 500);
      return res;
    });
  }
  
  doLoginForJdPin(options = {}) {
    return this.doLogin({
      loginColor: {
        biz: WXAPP_BIZ_SHOP_LIGHT_KEY,
        dpin: 0,
      },
      ...options,
    });
  }
  
  getLoginCookie(updateKey = "wxapp") {
    return new Promise((resolve) => {
      console.log("开始获取更新wxapp中的cookie信息", updateKey);
      if (
        this.config.wqCookie &&
        this.config.wqCookieStr &&
        this.config.getWqCookieKey === updateKey
      ) {
        console.log("已有存储wxapp中的cookie信息，直接返回", this.config);
        resolve({
          wqCookie: this.config.wqCookie,
          wqCookieStr: this.config.wqCookieStr,
        });
      } else {
        if (isPublishToWxapp) {
          const getWxappCookieObj = getTaroStorageKeyValue("cookies") || null;
          if (getWxappCookieObj) {
            const getCookieObj = getWxappCookieObj["_data"];
            const { wqCookie, wqCookieStr } = getWxAppCookieStr(getCookieObj);
            const {
              pin = "",
              visitkey = "-1",
              wq_unionid = "",
              wxapp_openid = "",
            } = wqCookie;
            this.info.loginState = true;
            this.info.userInfo.wqCookie = wqCookieStr;
            this.info.userInfo.wqVisitkey = visitkey;
            console.log("获取用户完整cookie信息", getCookieObj);
            const getUserAddress = this.wxAppUserInfoInstance.getAddress();
            console.log("获取微信用户地址信息", getUserAddress);
            if (getUserAddress) {
              this.info.pageInfo.address = getUserAddress?.areaId;
              this.info.pageInfo.addressCommaStr = this.info.pageInfo.address
                ? this.info.pageInfo.address.replace(/_/g, ",")
                : "";
              this.info.pageInfo.un_area = this.info.pageInfo.address;
              Taro.eventCenter.trigger(
                TaroEventType.USER_AREA_UPDATE,
                this.info.pageInfo.address
              );
            }
            if (this.miniAppLogInstance) {
              this.miniAppLogInstance.set({
                account: pin,
                unionid: wq_unionid,
                openid: wxapp_openid,
              });
            }
            this.config.wqCookie = wqCookie;
            this.config.wqCookieStr = wqCookieStr;
            this.config.getWqCookieKey = updateKey;
            console.log("解析wxapp中的cookie信息成功，返回后存储", this.config);
            resolve({
              wqCookie,
              wqCookieStr,
            });
          } else {
            console.log(
              "解析wxapp中的cookie信息异常，返回异常结果",
              this.config
            );
            resolve({
              wqCookie: false,
              wqCookieStr: false,
            });
          }
        } else {
          resolve({
            wqCookie: false,
            wqCookieStr: false,
          });
        }
      }
    });
  }
  
  
  checkLoginStatus() {
    return this.getLoginCookie();
  }
  
  getAddressCachePromise = () => {
    return Promise.reject("该方法只在APP内适用");
  };
  
  updatePageAndLogInfo(updateQuery = {}) {
    const createUpdateQueryInfo: {
      query: {
        shopId?: string | number;
        venderId?: string | number;
      };
      updateShopInfoState: boolean;
    } = Object.assign(
      {},
      {
        query: {},
        updateShopInfoState: false,
      },
      updateQuery
    );
    console.log(
      "获取当前下发的店铺查询参数",
      updateQuery,
      "获取之前保存的shopInfo店铺查询参数",
      this.info?.shopInfo
    );
    const { query, updateShopInfoState } = createUpdateQueryInfo;
    const { shopId, venderId } = query;
    if (updateShopInfoState) {
      this.info.queryInfo = {
        ...this.info.queryInfo,
        ...query,
      };
      if (shopId && venderId) {
        this.info.shopInfo = {
          shopId: `${shopId}`,
          venderId: `${venderId}`,
        };
      }
    } else {
      this.info.queryInfo = {
        ...query,
      };
      this.info.originQueryInfo = {
        ...query,
      };
      if (
        this.info.shopInfo?.shopId &&
        this.info.shopInfo?.venderId &&
        (this.info.shopInfo.shopId == shopId ||
          this.info.shopInfo.venderId == venderId)
      ) {
        this.info.queryInfo.shopId = this.info.shopInfo.shopId;
        this.info.queryInfo.venderId = this.info.shopInfo.venderId;
        console.log(
          "当前存储的店铺shopId和venderId与下发的店铺信息shopId或者venderId为同一个，补充shopId或者venderId查询参数",
          this.info.queryInfo
        );
      }
    }
    this.info.queryInfo["shopId"] &&
    (this.info.queryInfo["shopId"] = `${this.info.queryInfo["shopId"]}`);
    this.info.queryInfo["venderId"] &&
    (this.info.queryInfo["venderId"] = `${this.info.queryInfo["venderId"]}`);
    console.log(
      "weapp===获取店铺下发查询参数\n",
      query,
      "\n获取店铺最后查询参数\n",
      this.info.queryInfo,
      "\n是否为更新店铺状态\n",
      updateShopInfoState
    );
  }

package/dist/common/jdplayerSdk.ts

@@ -0,0 +1 @@
+import { dateFormat, getRandom, JSONParse } from '../utils/utils'
  const dateStr = dateFormat(new Date(), 'yyyyMMddHHmmss')
  const randomStr = getRandom(100000, 999999)
  const callbackName = `${prefix}_CallBack_${dateStr}_${randomStr}`
  return callbackName
  return new Promise((resolve, reject) => {
    if (window.XWebView && window.XWebView.callNative) {
      const callbackName = getCallBackName('hasBgAudio')
      window[callbackName] = function(result: any) {
        const parsedData = JSONParse(result)
        if (parsedData && parsedData.hasOwnProperty('data')) {
          resolve(parsedData.data)
        } else {
          console.log('hasBgAudio error result:', result)
          reject({
            code: -2,
            message: 'hasBgAudio error: result is not available',
          })
        }
        window[callbackName] = null
        delete window[callbackName]
      }
      let jsonStr = {}
      window.XWebView.callNative(
        'JDPlayerJSPlugin',
        'hasBgAudio',
        JSON.stringify(jsonStr),
        callbackName,
        '',
      )
    } else {
      reject({
        code: -1,
        message: 'hasBgAudio error: XWebView.callNative is not defined',
      })
    }
  })
  return new Promise((resolve, reject) => {
    if (window.XWebView && window.XWebView.callNative) {
      const callbackName = getCallBackName('pauseBgAudio')
      window[callbackName] = function(result: any) {
        const parsedData = JSONParse(result)
        if (parsedData && parsedData.hasOwnProperty('data')) {
          resolve(parsedData.data)
        } else {
          console.log('pauseBgAudio error result:', result)
          reject({
            code: -2,
            message: 'pauseBgAudio error: result is not available',
          })
        }
        window[callbackName] = null
        delete window[callbackName]
      }
      let jsonStr = {}
      window.XWebView.callNative(
        'JDPlayerJSPlugin',
        'pauseBgAudio',
        JSON.stringify(jsonStr),
        callbackName,
        '',
      )
    } else {
      reject({
        code: -1,
        message: 'pauseBgAudio error: XWebView.callNative is not defined',
      })
    }
  })
  return new Promise((resolve, reject) => {
    if (window.XWebView && window.XWebView.callNative) {
      const callbackName = getCallBackName('resumeBgAudio')
      window[callbackName] = function(result: any) {
        const parsedData = JSONParse(result)
        if (parsedData && parsedData.hasOwnProperty('data')) {
          resolve(parsedData.data)
        } else {
          console.log('resumeBgAudio error result:', result)
          reject({
            code: -2,
            message: 'resumeBgAudio error: result is not available',
          })
        }
        window[callbackName] = null
        delete window[callbackName]
      }
      let jsonStr = {}
      window.XWebView.callNative(
        'JDPlayerJSPlugin',
        'resumeBgAudio',
        JSON.stringify(jsonStr),
        callbackName,
        '',
      )
    } else {
      reject({
        code: -1,
        message: 'resumeBgAudio error: XWebView.callNative is not defined',
      })
    }
  })
  return new Promise((resolve, reject) => {
    if (window.XWebView && window.XWebView.callNative) {
      const callbackName = getCallBackName('getWifiVideoAutoPlay')
      window[callbackName] = function(result: any) {
        const parsedData = JSONParse(result)
        if (parsedData && parsedData.hasOwnProperty('data')) {
          resolve(parsedData.data)
        } else {
          console.log('getWifiVideoAutoPlay error result:', result)
          reject({
            code: -2,
            message: 'getWifiVideoAutoPlay error: result is not available',
          })
        }
        window[callbackName] = null
        delete window[callbackName]
      }
      let jsonStr = {}
      window.XWebView.callNative(
        'JDPlayerJSPlugin',
        'actionIsWifiVideoAutoPlay',
        JSON.stringify(jsonStr),
        callbackName,
        '',
      )
    } else {
      reject({
        code: -1,
        message:
          'getWifiVideoAutoPlay error: XWebView.callNative is not defined',
      })
    }
  })

package/dist/common/jssdk.ts

@@ -0,0 +1 @@
+import ready from '../utils/ready'
  return new Promise((resolve, reject) => {
    ready('jmfe', timeout)
      .then(() => {
        registerCode(JSSDK_APP_WEBVIEW_CODE)
        resolve(window['jmfe'])
      })
      .catch(() => {
        console.log('window.jmfe不存在')
        reject(null)
      })
  })
  if (window['jmfe']) {
    console.log('registerCode:', code)
    window['jmfe'].registerCode(code)
  } else {
    console.warn('jmfe对象不存在，可能没有提前引入jd-jssdk.js')
  }