component-shipinlv 2.3.0 → 2.3.1

package/dist/ActiveAccountMode/index.d.ts

@@ -2,6 +2,7 @@ import React from "react";
 interface Props {
     disabled?: boolean;
     env?: Global.Env;
+    notVip: boolean;
 }
 declare const ActiveAccountMode: React.FC<Props>;
 export default ActiveAccountMode;

package/dist/ActiveAccountMode/index.js

@@ -3,12 +3,14 @@ import ActiveAccountModeSetting from "./setting";
 import { jsx as _jsx } from "react/jsx-runtime";
 var ActiveAccountMode = function ActiveAccountMode(_ref) {
   var disabled = _ref.disabled,
-    env = _ref.env;
+    env = _ref.env,
+    notVip = _ref.notVip;
   return /*#__PURE__*/_jsx(ActiveAccountModeSetting, {
     env: env
     // env="prod"
     ,
-    disabled: disabled
+    disabled: disabled,
+    notVip: notVip
   });
 };
 export default ActiveAccountMode;

package/dist/ActiveAccountMode/setting.d.ts

@@ -3,6 +3,7 @@ import './setting.less';
 interface Props {
     disabled?: boolean;
     env?: Global.Env;
+    notVip: boolean;
 }
 declare const ActiveAccountModeSetting: React.FC<Props>;
 export default ActiveAccountModeSetting;

package/dist/ActiveAccountMode/setting.js

@@ -3,7 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect, useState } from 'react';
-import { Button, ConfigProvider, Divider, Form, InputNumber, Radio, Switch } from 'antd';
+import { Alert, Button, ConfigProvider, Divider, Form, InputNumber, Radio, Switch } from 'antd';
 import "./setting.less";
 import LayoutContent from "../UI/LayoutContent";
 import { useRequest } from "@umijs/hooks";
@@ -28,7 +28,8 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
   var disabled = _ref.disabled,
-    env = _ref.env;
+    env = _ref.env,
+    notVip = _ref.notVip;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -107,7 +108,7 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
     };
   }();
   useEffect(function () {
-    var task = new ActiveAccountModeTask(env);
+    var task = new ActiveAccountModeTask(env, notVip);
     return function () {
       task.destroy();
     };
@@ -131,7 +132,13 @@ var ActiveAccountModeSetting = function ActiveAccountModeSetting(_ref) {
       autoComplete: "off",
       initialValues: _objectSpread({}, formData),
       onFinish: onFinish,
-      children: [/*#__PURE__*/_jsx(Form.Item, {
+      children: [notVip && /*#__PURE__*/_jsx(Form.Item, {
+        label: "\u505C\u7528",
+        children: /*#__PURE__*/_jsx(Alert, {
+          type: "error",
+          message: "\u4E0D\u662F\u4F1A\u5458\uFF0C\u6B64\u529F\u80FD\u7981\u7528"
+        })
+      }), /*#__PURE__*/_jsx(Form.Item, {
         label: "\u542F\u7528",
         name: "enabled",
         children: /*#__PURE__*/_jsx(Switch, {

package/dist/ActiveAccountMode/task/index.d.ts

@@ -1,12 +1,13 @@
 declare class ActiveAccountModeTask {
     loopSecond: number;
+    notVip: boolean;
     modeSetting: ActiveAccountModeSetting.Detail;
     env: Global.Env | undefined;
     accountList: VideoPublishVideoAccount.List[];
     planDict: {
         [id: number]: PublishTaskPlanStatistic.List[];
     };
-    constructor(env?: Global.Env);
+    constructor(env?: Global.Env, notVip?: boolean);
     destroy(): void;
     onLoop(): Promise<void>;
     loop(): Promise<void>;

package/dist/ActiveAccountMode/task/index.js

@@ -15,10 +15,11 @@ import sleep from "../../lib/sleep";
 import { delFile, fsDirVideoList } from "../../lib/fs";
 import Tool from "../../lib/Tool";
 var ActiveAccountModeTask = /*#__PURE__*/function () {
-  function ActiveAccountModeTask(env) {
+  function ActiveAccountModeTask(env, notVip) {
     var _this = this;
     _classCallCheck(this, ActiveAccountModeTask);
     _defineProperty(this, "loopSecond", 1 * 60);
+    _defineProperty(this, "notVip", false);
     _defineProperty(this, "modeSetting", {
       dayTimeHourList: [],
       dayPublishMaxAmount: 6,
@@ -37,6 +38,8 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
     if (env && env !== 'prod') {
       this.loopSecond = 50;
     }
+    this.notVip = !!notVip;
+
     // this.timer = setInterval(() => {
     //   this.loop();
     // }, this.loopSecond * 1e3 )
@@ -100,31 +103,38 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               this.onLoop();
               return _context2.abrupt("return");
             case 11:
-              _context2.next = 13;
+              if (!this.notVip) {
+                _context2.next = 14;
+                break;
+              }
+              console.log('不是会员,禁用养号模式');
+              return _context2.abrupt("return");
+            case 14:
+              _context2.next = 16;
               return this.getAccountList().catch(function (err) {
                 toastError('获取视频账户错误：' + (err === null || err === void 0 ? void 0 : err.message));
               });
-            case 13:
+            case 16:
               accountList = _context2.sent;
               if (accountList) {
-                _context2.next = 17;
+                _context2.next = 20;
                 break;
               }
               this.onLoop();
               return _context2.abrupt("return");
-            case 17:
+            case 20:
               this.accountList = accountList.list;
               if (!(this.accountList.length === 0)) {
-                _context2.next = 21;
+                _context2.next = 24;
                 break;
               }
               this.onLoop();
               return _context2.abrupt("return");
-            case 21:
+            case 24:
               dayIndex = 0;
-            case 22:
+            case 25:
               if (!(dayIndex < setting.publishMaxDay)) {
-                _context2.next = 78;
+                _context2.next = 81;
                 break;
               }
               console.log('publishMaxDay:', dayIndex);
@@ -134,21 +144,21 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
               console.log("startTime:", dayIndex, new Date(startTime * 1000), new Date(endTime * 1000));
 
               // 获取用户列表；
-              _context2.next = 30;
+              _context2.next = 33;
               return this.getTaskPlanStatisticList(startTime, endTime).catch(function (err) {
                 toastError('获取账户列表失败：' + (err === null || err === void 0 ? void 0 : err.message));
               });
-            case 30:
+            case 33:
               list = _context2.sent;
               if (list) {
-                _context2.next = 35;
+                _context2.next = 38;
                 break;
               }
-              _context2.next = 34;
+              _context2.next = 37;
               return sleep(20e3);
-            case 34:
-              return _context2.abrupt("continue", 75);
-            case 35:
+            case 37:
+              return _context2.abrupt("continue", 78);
+            case 38:
               // 把发布过的，做一个字段
               this.planDict = {};
               _iterator = _createForOfIteratorHelper(list);
@@ -168,87 +178,87 @@ var ActiveAccountModeTask = /*#__PURE__*/function () {
                 _iterator.f();
               }
               _iterator2 = _createForOfIteratorHelper(this.accountList);
-              _context2.prev = 39;
+              _context2.prev = 42;
               _iterator2.s();
-            case 41:
+            case 44:
               if ((_step2 = _iterator2.n()).done) {
-                _context2.next = 67;
+                _context2.next = 70;
                 break;
               }
               accountItem = _step2.value;
               if (accountItem.isLoginValid) {
-                _context2.next = 46;
+                _context2.next = 49;
                 break;
               }
               console.log('账号已掉线：', accountItem);
-              return _context2.abrupt("continue", 65);
-            case 46:
+              return _context2.abrupt("continue", 68);
+            case 49:
               if (!accountItem.isBan) {
-                _context2.next = 49;
+                _context2.next = 52;
                 break;
               }
               console.log('账号已封：', accountItem);
-              return _context2.abrupt("continue", 65);
-            case 49:
+              return _context2.abrupt("continue", 68);
+            case 52:
               if (accountItem.enabledActiveAccountMode) {
-                _context2.next = 52;
+                _context2.next = 55;
                 break;
               }
               console.log('账号禁止养号模式：', accountItem);
-              return _context2.abrupt("continue", 65);
-            case 52:
+              return _context2.abrupt("continue", 68);
+            case 55:
               count = ((_this$planDict$accoun = this.planDict[accountItem.id]) === null || _this$planDict$accoun === void 0 ? void 0 : _this$planDict$accoun.length) || 0; // 需要指定路径
               if (accountItem.videoFromFolder) {
-                _context2.next = 56;
+                _context2.next = 59;
                 break;
               }
               console.log('no videoFromFolder :', accountItem.id, accountItem.nickname);
-              return _context2.abrupt("continue", 65);
-            case 56:
+              return _context2.abrupt("continue", 68);
+            case 59:
               // 删除 此账户下面，所有已经发布的视频
               this.checkDelFile(accountItem.id, accountItem.videoFromFolder);
               if (!(count >= setting.dayPublishMaxAmount)) {
-                _context2.next = 60;
+                _context2.next = 63;
                 break;
               }
               console.log('count 2:', count, setting.dayPublishMaxAmount);
-              return _context2.abrupt("continue", 65);
-            case 60:
+              return _context2.abrupt("continue", 68);
+            case 63:
               console.log('makePublishTask in:', accountItem.id, setting.dayPublishMaxAmount - count, dayIndex);
 
               // 生成任务
-              _context2.next = 63;
+              _context2.next = 66;
               return this.makePublishTask(accountItem.id, setting.dayPublishMaxAmount - count, dayIndex).catch(function (err) {
                 console.log('makePublishTask err:', err);
               });
-            case 63:
-              _context2.next = 65;
+            case 66:
+              _context2.next = 68;
               return sleep(3e3);
-            case 65:
-              _context2.next = 41;
+            case 68:
+              _context2.next = 44;
               break;
-            case 67:
-              _context2.next = 72;
+            case 70:
+              _context2.next = 75;
               break;
-            case 69:
-              _context2.prev = 69;
-              _context2.t0 = _context2["catch"](39);
-              _iterator2.e(_context2.t0);
             case 72:
               _context2.prev = 72;
-              _iterator2.f();
-              return _context2.finish(72);
+              _context2.t0 = _context2["catch"](42);
+              _iterator2.e(_context2.t0);
             case 75:
+              _context2.prev = 75;
+              _iterator2.f();
+              return _context2.finish(75);
+            case 78:
               dayIndex++;
-              _context2.next = 22;
+              _context2.next = 25;
               break;
-            case 78:
+            case 81:
               this.onLoop();
-            case 79:
+            case 82:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[39, 69, 72, 75]]);
+        }, _callee2, this, [[42, 72, 75, 78]]);
       }));
       function loop() {
         return _loop.apply(this, arguments);

package/dist/VideoPublish/account-manage/home.d.ts

@@ -3,6 +3,7 @@ import './home.less';
 interface Props {
     apiUrl: string;
     env?: Global.Env;
+    notVip: boolean;
     onMenu: (key: string) => void;
     canPublish?: boolean;
 }

package/dist/VideoPublish/account-manage/home.js

@@ -15,6 +15,7 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePage(_ref) {
   var apiUrl = _ref.apiUrl,
     env = _ref.env,
+    notVip = _ref.notVip,
     onMenu = _ref.onMenu,
     canPublish = _ref.canPublish;
   var _useState = useState({
@@ -152,6 +153,7 @@ var VideoPublishAccountManageHomePage = function VideoPublishAccountManageHomePa
     children: [/*#__PURE__*/_jsx(HomePageAccountList, {
       apiUrl: apiUrl,
       env: env,
+      notVip: notVip,
       currentAccountDetail: accountDetail,
       onListData: function onListData(list) {
         // accountListDataRef.current = list;

package/dist/VideoPublish/account-manage/list.d.ts

@@ -3,6 +3,7 @@ import './list.less';
 interface Props {
     apiUrl: string;
     env?: Global.Env;
+    notVip: boolean;
     currentAccountDetail: VideoPublishVideoAccount.List;
     onMenu: (key: string) => void;
     disabledDel?: boolean;

package/dist/VideoPublish/account-manage/list.js

@@ -27,9 +27,11 @@ import openChrome from "../../lib/openChrome";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
+var NotVipCanAddAccountCount = 10;
 var HomePageAccountList = function HomePageAccountList(_ref) {
   var apiUrl = _ref.apiUrl,
     env = _ref.env,
+    notVip = _ref.notVip,
     _ref$onMenu = _ref.onMenu,
     onMenu = _ref$onMenu === void 0 ? function () {} : _ref$onMenu,
     _ref$onListData = _ref.onListData,
@@ -182,31 +184,42 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (isInstalledChrome()) {
+            if (!notVip) {
               _context.next = 4;
               break;
             }
+            if (!(listData.length >= NotVipCanAddAccountCount)) {
+              _context.next = 4;
+              break;
+            }
+            Tool.toast("\u4E0D\u662F\u4F1A\u5458\uFF0C\u53EA\u80FD\u6DFB\u52A0 ".concat(NotVipCanAddAccountCount, "\u4E2A\u8D26\u6237"));
+            return _context.abrupt("return");
+          case 4:
+            if (isInstalledChrome()) {
+              _context.next = 8;
+              break;
+            }
             Tool.toast('没有安装谷歌浏览器（Chrome），请安装');
             onMenu('setting');
             return _context.abrupt("return");
-          case 4:
+          case 8:
             console.log('onAdd:', platform);
             settingConfig = AccountManageSettingConfig();
             if (settingConfig.chromeUserDataDir) {
-              _context.next = 10;
+              _context.next = 14;
               break;
             }
             notification.notificationError('请先设置：“谷歌浏览器 - 多开位置”', '选个稍微大点的盘存储，每个用户会有几百M的数据');
             onMenu('setting');
             return _context.abrupt("return");
-          case 10:
+          case 14:
             if (!(listData.length >= 200)) {
-              _context.next = 13;
+              _context.next = 17;
               break;
             }
             notification.notificationError('这电脑绑定到上限了', '每台电脑最多绑定 200 个账号');
             return _context.abrupt("return");
-          case 13:
+          case 17:
             toast('正在启动浏览器，请扫码登录', 12);
 
             // const platformName = platform ; // == 'kuaishou' ? 'kwai' : '';
@@ -218,12 +231,12 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
             chromeProfileName = Date.now() + '-' + Tool.math.randWord(16);
             videoPlatformInfo = VideoPlatformDict[platform];
             if (videoPlatformInfo) {
-              _context.next = 19;
+              _context.next = 23;
               break;
             }
             toast('请配置信息：' + platform);
             return _context.abrupt("return");
-          case 19:
+          case 23:
             openChrome({
               action: 'add-account',
               platform: platform,
@@ -237,7 +250,7 @@ var HomePageAccountList = function HomePageAccountList(_ref) {
               proxyInfo: proxyInfo,
               isOpen: true // settingConfig.isChromeOpen,
             }, true, env);
-          case 20:
+          case 24:
           case "end":
             return _context.stop();
         }

package/dist/VideoPublish/create-task/index.d.ts

@@ -5,6 +5,7 @@ interface Props {
     productType: VideoPublish.ProductType;
     apiUrl: string;
     env?: Global.Env;
+    notVip: boolean;
 }
 declare const VideoPublishCreateTask: React.FC<Props>;
 export default VideoPublishCreateTask;

package/dist/VideoPublish/create-task/index.js

@@ -26,7 +26,8 @@ var VideoPublishCreateTask = function VideoPublishCreateTask(_ref) {
   var disabled = _ref.disabled,
     productType = _ref.productType,
     apiUrl = _ref.apiUrl,
-    env = _ref.env;
+    env = _ref.env,
+    notVip = _ref.notVip;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -252,8 +253,8 @@ var VideoPublishCreateTask = function VideoPublishCreateTask(_ref) {
     // error={errorAccountList}
     // onReload={runAccountList}
     , {
-      children: [disabled && /*#__PURE__*/_jsx(Alert, {
-        message: "\u529F\u80FD\u5347\u7EA7\u4E2D\uFF0C\u5373\u5C06\u5F00\u653E\uFF0C\u656C\u8BF7\u671F\u5F85",
+      children: [notVip && /*#__PURE__*/_jsx(Alert, {
+        message: "\u4E0D\u662F\u4F1A\u5458\uFF0C\u6682\u4E0D\u80FD\u4F7F\u7528\u6B64\u529F\u80FD",
         type: "warning",
         showIcon: true,
         style: {

package/dist/VideoPublish/index.d.ts

@@ -3,6 +3,7 @@ import "./index.less";
 interface Props {
     disabled?: boolean;
     canPublish: boolean;
+    notVip: boolean;
     contentHeight?: number | string;
     productType: VideoPublish.ProductType;
     apiUrl: string;

package/dist/VideoPublish/index.js

@@ -24,6 +24,7 @@ var VideoPublish = function VideoPublish(_ref) {
   var disabled = _ref.disabled,
     _ref$canPublish = _ref.canPublish,
     canPublish = _ref$canPublish === void 0 ? false : _ref$canPublish,
+    notVip = _ref.notVip,
     contentHeight = _ref.contentHeight,
     productType = _ref.productType,
     apiUrl = _ref.apiUrl,
@@ -49,6 +50,7 @@ var VideoPublish = function VideoPublish(_ref) {
     children: /*#__PURE__*/_jsx(VideoPublishAccountManageHomePage, {
       apiUrl: apiUrl,
       env: env,
+      notVip: notVip,
       canPublish: canPublish,
       onMenu: function onMenu(key) {
         return _onMenu(key);
@@ -69,7 +71,8 @@ var VideoPublish = function VideoPublish(_ref) {
     forceRender: true,
     children: /*#__PURE__*/_jsx(ActiveAccountMode, {
       disabled: disabled,
-      env: env
+      env: env,
+      notVip: notVip
     })
   }, {
     key: 'topic',
@@ -99,7 +102,8 @@ var VideoPublish = function VideoPublish(_ref) {
       disabled: disabled,
       productType: productType,
       apiUrl: apiUrl,
-      env: env
+      env: env,
+      notVip: notVip
     })
   }, {
     key: 'task-list',

package/dist/VideoPublish/index.less

@@ -11,12 +11,15 @@
     //margin: 0 12px 0 0;
     padding: 0 10px 0 0;
     min-height: 100%;
+    height: 100%;
+
     border-right: 1px solid #E8E8E8;
 
     .menuWarp{
       position: fixed;
       width: 170px;
       margin: 0 12px 0 0;
+      overflow-y: auto;
     }
     .menu{
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",