@zeppos/zeus-cli 1.0.10 → 1.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/cli.js +3 -0
- package/config/project.js +16 -14
- package/index.js +1 -0
- package/modules/build.js +116 -52
- package/modules/config.js +66 -17
- package/modules/create/index.js +70 -28
- package/modules/create/local-app.js +34 -6
- package/modules/help.js +11 -9
- package/modules/login.js +62 -90
- package/modules/run.js +47 -41
- package/modules/simulator.js +4 -0
- package/modules/status.js +98 -0
- package/modules/storage.js +2 -2
- package/package.json +4 -2
- package/public/template/empty/app.js +3 -25
- package/public/template/empty/app.json +1 -8
- package/public/template/empty/watchface/index.js +13 -0
- package/public/template/hello-world/app.js +3 -25
- package/public/template/hello-world/page/gtr3/home/index.page.js +6 -4
- package/public/template/hello-world/page/gtr3/home/index.style.js +11 -28
- package/public/template/hello-world/page/gtr3-pro/home/index.page.js +6 -4
- package/public/template/hello-world/page/gtr3-pro/home/index.style.js +11 -28
- package/public/template/hello-world/page/gts3/home/index.page.js +7 -4
- package/public/template/hello-world/page/gts3/home/index.style.js +11 -28
- package/public/template/jsconfig.json +14 -0
- package/public/template/package.json +14 -0
- package/public/template/timer/app.js +7 -0
- package/public/template/timer/app.json +50 -0
- package/public/template/timer/assets/gtr-3-pro/images/bg/bg.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/0.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/1.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/2.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/3.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/4.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/5.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/6.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/7.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/8.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/9.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/bigNum/sp.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/btn/back.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/btn/lv.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/btn/red.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/bg.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/bottom.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/center.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/h.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/left.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/m.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/right.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/point/s.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/preview.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/second/second.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/0.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/1.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/2.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/3.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/4.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/5.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/6.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/7.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/8.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/9.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/d.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/smallNum/n.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_ch/1.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_ch/2.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_ch/3.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_ch/4.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_ch/5.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_ch/6.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_ch/7.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_en/1.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_en/2.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_en/3.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_en/4.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_en/5.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_en/6.png +0 -0
- package/public/template/timer/assets/gtr-3-pro/images/week_en/7.png +0 -0
- package/public/template/timer/shared/buffer.js +11 -0
- package/public/template/timer/shared/device-polyfill.js +3 -0
- package/public/template/timer/shared/global.js +17 -0
- package/public/template/timer/shared/js-module.js +27 -0
- package/public/template/timer/shared/logger.js +21 -0
- package/public/template/timer/shared/setTimeout.js +59 -0
- package/public/template/timer/watchface/gtr-3-pro/index.js +1 -0
- package/public/template/timer/watchface/round/index.js +438 -0
- package/utils/login.js +126 -0
package/modules/run.js
CHANGED
|
@@ -58,22 +58,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
58
58
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
59
59
|
};
|
|
60
60
|
exports.__esModule = true;
|
|
61
|
-
exports.run = void 0;
|
|
61
|
+
exports.run = exports.DEFAULT_PORT = exports.DEFAULT_HOST = void 0;
|
|
62
62
|
var fs_1 = __importDefault(require("fs"));
|
|
63
63
|
var lodash_1 = __importDefault(require("lodash"));
|
|
64
64
|
var chalk_1 = __importDefault(require("chalk"));
|
|
65
65
|
var path = __importStar(require("path"));
|
|
66
|
-
|
|
66
|
+
// import fsExtra from 'fs-extra'
|
|
67
67
|
var inquirer_1 = __importDefault(require("inquirer"));
|
|
68
68
|
var chokidar_1 = __importDefault(require("chokidar"));
|
|
69
|
-
|
|
69
|
+
// import * as compressing from 'compressing'
|
|
70
70
|
var logger = __importStar(require("../utils/logger"));
|
|
71
71
|
var build_1 = require("./build");
|
|
72
72
|
var storage_1 = require("./storage");
|
|
73
73
|
var simulator_1 = require("./simulator");
|
|
74
74
|
var device_1 = require("../config/device");
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
exports.DEFAULT_HOST = '127.0.0.1';
|
|
76
|
+
exports.DEFAULT_PORT = '7650';
|
|
77
77
|
var getDeviceInternalCodename = function (curTarget) {
|
|
78
78
|
var _a;
|
|
79
79
|
var appJsonFilePath = path.resolve('./app.json');
|
|
@@ -88,24 +88,24 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
88
88
|
case 0:
|
|
89
89
|
storage = new storage_1.Storage({ cmd: lodash_1["default"].get(args, '$0') });
|
|
90
90
|
simulatorHost = storage.get('simulator_host');
|
|
91
|
-
simulatorPort = storage.get('simulator_port') || DEFAULT_PORT;
|
|
91
|
+
simulatorPort = storage.get('simulator_port') || exports.DEFAULT_PORT;
|
|
92
92
|
if (!!simulatorHost) return [3 /*break*/, 2];
|
|
93
93
|
return [4 /*yield*/, inquirer_1["default"].prompt([
|
|
94
94
|
{
|
|
95
95
|
name: 'host',
|
|
96
96
|
type: 'input',
|
|
97
|
-
message: "simulator host ("
|
|
97
|
+
message: "simulator host (".concat(exports.DEFAULT_HOST, "):")
|
|
98
98
|
},
|
|
99
99
|
{
|
|
100
100
|
name: 'port',
|
|
101
101
|
type: 'input',
|
|
102
|
-
message: "simulator port ("
|
|
102
|
+
message: "simulator port (".concat(exports.DEFAULT_PORT, "):")
|
|
103
103
|
}
|
|
104
104
|
])];
|
|
105
105
|
case 1:
|
|
106
106
|
answer = _a.sent();
|
|
107
|
-
simulatorHost = answer.host || DEFAULT_HOST;
|
|
108
|
-
simulatorPort = answer.port || DEFAULT_PORT;
|
|
107
|
+
simulatorHost = answer.host || exports.DEFAULT_HOST;
|
|
108
|
+
simulatorPort = answer.port || exports.DEFAULT_PORT;
|
|
109
109
|
storage.set('simulator_host', simulatorHost);
|
|
110
110
|
storage.set('simulator_port', simulatorPort);
|
|
111
111
|
_a.label = 2;
|
|
@@ -114,50 +114,56 @@ var run = function (args) { return __awaiter(void 0, void 0, void 0, function ()
|
|
|
114
114
|
return [4 /*yield*/, (0, build_1.chooseBuildPackages)()];
|
|
115
115
|
case 3:
|
|
116
116
|
packages = _a.sent();
|
|
117
|
-
simulator = new simulator_1.Simulator("http://"
|
|
117
|
+
simulator = new simulator_1.Simulator("http://".concat(simulatorHost, ":").concat(simulatorPort));
|
|
118
118
|
refreshSimulator = lodash_1["default"].debounce(function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
119
|
-
var
|
|
119
|
+
var zpkBuffer, targetDeviceInternalName, projectName;
|
|
120
120
|
return __generator(this, function (_a) {
|
|
121
121
|
switch (_a.label) {
|
|
122
122
|
case 0:
|
|
123
123
|
logger.info('rebuilding...');
|
|
124
124
|
return [4 /*yield*/, (0, build_1.buildDev)(packages)];
|
|
125
125
|
case 1:
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
uzipZabPath = path.resolve(zabPath, '../zab');
|
|
131
|
-
logger.info('getting device package...');
|
|
132
|
-
return [4 /*yield*/, compressing.zip.uncompress(zabPath, uzipZabPath)];
|
|
133
|
-
case 2:
|
|
134
|
-
_a.sent();
|
|
135
|
-
zabFileList = fs_1["default"].readdirSync(uzipZabPath);
|
|
136
|
-
zabBuffer = Buffer.alloc(0);
|
|
137
|
-
if (packages.length === 1) {
|
|
138
|
-
zpkFileName = lodash_1["default"].find(zabFileList, function (fileName) {
|
|
139
|
-
return lodash_1["default"].startsWith(fileName, packages[0] + ".");
|
|
140
|
-
});
|
|
141
|
-
if (zpkFileName) {
|
|
142
|
-
zpkPath = path.resolve(uzipZabPath, "./" + zpkFileName);
|
|
143
|
-
zabBuffer = Buffer.from(fs_1["default"].readFileSync(zpkPath));
|
|
144
|
-
}
|
|
145
|
-
}
|
|
146
|
-
projectName = process.cwd().split('/').slice(-1)[0];
|
|
147
|
-
if (zabBuffer.length) {
|
|
148
|
-
logger.info('refrshing simulator...');
|
|
126
|
+
zpkBuffer = _a.sent();
|
|
127
|
+
if (zpkBuffer) {
|
|
128
|
+
logger.info('rebuild done');
|
|
129
|
+
logger.info('refreshing simulator...');
|
|
149
130
|
targetDeviceInternalName = getDeviceInternalCodename(packages[0]);
|
|
150
|
-
|
|
131
|
+
projectName = path.parse(process.cwd()).base;
|
|
132
|
+
simulator.upload(zpkBuffer, projectName, targetDeviceInternalName);
|
|
151
133
|
}
|
|
152
134
|
else {
|
|
153
|
-
logger.error('
|
|
135
|
+
logger.error('build error');
|
|
154
136
|
}
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
137
|
+
// const zabPath = path.resolve(`./dist/${zabName}`)
|
|
138
|
+
// if (fs.existsSync(zabPath)) {
|
|
139
|
+
// logger.info('rebuild done')
|
|
140
|
+
// const uzipZabPath = path.resolve(zabPath, '../zab')
|
|
141
|
+
// logger.info('getting device package...')
|
|
142
|
+
// await compressing.zip.uncompress(zabPath, uzipZabPath)
|
|
143
|
+
// const zabFileList = fs.readdirSync(uzipZabPath)
|
|
144
|
+
// let zabBuffer: Buffer = Buffer.alloc(0)
|
|
145
|
+
// if (packages.length === 1) {
|
|
146
|
+
// const zpkFileName = _.find(zabFileList, (fileName) => {
|
|
147
|
+
// return _.startsWith(fileName, `${packages[0]}.`)
|
|
148
|
+
// })
|
|
149
|
+
// if (zpkFileName) {
|
|
150
|
+
// const zpkPath = path.resolve(uzipZabPath, `./${zpkFileName}`)
|
|
151
|
+
// zabBuffer = Buffer.from(fs.readFileSync(zpkPath))
|
|
152
|
+
// }
|
|
153
|
+
// }
|
|
154
|
+
// const projectName = process.cwd().split('/').slice(-1)[0]
|
|
155
|
+
// if (zabBuffer.length) {
|
|
156
|
+
// logger.info('refrshing simulator...')
|
|
157
|
+
// const targetDeviceInternalName = getDeviceInternalCodename(packages[0])
|
|
158
|
+
// simulator.upload(zabBuffer, projectName, targetDeviceInternalName)
|
|
159
|
+
// } else {
|
|
160
|
+
// logger.error('can\'t find device package, pleace check the build result')
|
|
161
|
+
// }
|
|
162
|
+
// fsExtra.removeSync(uzipZabPath)
|
|
163
|
+
// }
|
|
158
164
|
if (!hasStarted) {
|
|
159
165
|
hasStarted = true;
|
|
160
|
-
logger.log(chalk_1["default"].green("["
|
|
166
|
+
logger.log(chalk_1["default"].green("[".concat(args['$0'], "] watching the changes in this project...")));
|
|
161
167
|
}
|
|
162
168
|
return [2 /*return*/];
|
|
163
169
|
}
|
package/modules/simulator.js
CHANGED
|
@@ -22,6 +22,8 @@ exports.__esModule = true;
|
|
|
22
22
|
exports.Simulator = void 0;
|
|
23
23
|
var socket_io_client_1 = require("socket.io-client");
|
|
24
24
|
var logger = __importStar(require("../utils/logger"));
|
|
25
|
+
var storage_1 = require("./storage");
|
|
26
|
+
var storage = new storage_1.Storage({ cmd: '' });
|
|
25
27
|
var Simulator = /** @class */ (function () {
|
|
26
28
|
function Simulator(url, options) {
|
|
27
29
|
this.previewId = 1;
|
|
@@ -29,9 +31,11 @@ var Simulator = /** @class */ (function () {
|
|
|
29
31
|
logger.info('connecting to simulator');
|
|
30
32
|
this.socket = (0, socket_io_client_1.io)(url, options || {});
|
|
31
33
|
this.socket.on('connect', function () {
|
|
34
|
+
storage.set('____simulator_connect_status', 'connected');
|
|
32
35
|
logger.success('simulator connected');
|
|
33
36
|
});
|
|
34
37
|
this.socket.on('disconnect', function () {
|
|
38
|
+
storage.set('____simulator_connect_status', 'disconnected');
|
|
35
39
|
logger.error('simulator disconnected, please restart the simulator');
|
|
36
40
|
});
|
|
37
41
|
}
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
+
}) : function(o, v) {
|
|
12
|
+
o["default"] = v;
|
|
13
|
+
});
|
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
+
if (mod && mod.__esModule) return mod;
|
|
16
|
+
var result = {};
|
|
17
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
+
__setModuleDefault(result, mod);
|
|
19
|
+
return result;
|
|
20
|
+
};
|
|
21
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
22
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
23
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
24
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
25
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
26
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
27
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
31
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
32
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
33
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
34
|
+
function step(op) {
|
|
35
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
36
|
+
while (_) try {
|
|
37
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
38
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
39
|
+
switch (op[0]) {
|
|
40
|
+
case 0: case 1: t = op; break;
|
|
41
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
42
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
43
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
44
|
+
default:
|
|
45
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
46
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
47
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
48
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
49
|
+
if (t[2]) _.ops.pop();
|
|
50
|
+
_.trys.pop(); continue;
|
|
51
|
+
}
|
|
52
|
+
op = body.call(thisArg, _);
|
|
53
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
54
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
58
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
59
|
+
};
|
|
60
|
+
exports.__esModule = true;
|
|
61
|
+
exports.status = void 0;
|
|
62
|
+
var chalk_1 = __importDefault(require("chalk"));
|
|
63
|
+
var logger = __importStar(require("../utils/logger"));
|
|
64
|
+
var storage_1 = require("./storage");
|
|
65
|
+
var project_1 = require("../config/project");
|
|
66
|
+
var login_1 = require("../utils/login");
|
|
67
|
+
var run_1 = require("./run");
|
|
68
|
+
var status = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
69
|
+
var storage, apptoken, userid, cname, host, loginStatus, userInfo, _a, userName, simulatorHost, simulatorPort, simulatorConnectStatus;
|
|
70
|
+
return __generator(this, function (_b) {
|
|
71
|
+
switch (_b.label) {
|
|
72
|
+
case 0:
|
|
73
|
+
storage = new storage_1.Storage({ cmd: '' });
|
|
74
|
+
apptoken = storage.get(project_1.loginStorageKey.accountToken);
|
|
75
|
+
userid = storage.get(project_1.loginStorageKey.userid);
|
|
76
|
+
cname = storage.get(project_1.loginStorageKey.cname);
|
|
77
|
+
host = cname.split(',').filter(function (h) { return h.indexOf('api-mifit') > -1; })[0];
|
|
78
|
+
loginStatus = (apptoken && userid && cname) ? 'logged' : 'logout';
|
|
79
|
+
return [4 /*yield*/, (0, login_1.getUserInfo)(host, userid, apptoken)];
|
|
80
|
+
case 1:
|
|
81
|
+
userInfo = _b.sent();
|
|
82
|
+
_a = (userInfo || {}).userName, userName = _a === void 0 ? '' : _a;
|
|
83
|
+
simulatorHost = storage.get('simulator_host') || run_1.DEFAULT_HOST;
|
|
84
|
+
simulatorPort = storage.get('simulator_port') || run_1.DEFAULT_PORT;
|
|
85
|
+
simulatorConnectStatus = storage.get('____simulator_connect_status');
|
|
86
|
+
logger.log('login status:', chalk_1["default"].yellow(loginStatus));
|
|
87
|
+
if (loginStatus === 'logged') {
|
|
88
|
+
logger.log('nickName:', chalk_1["default"].yellow(userName));
|
|
89
|
+
logger.log('userID:', chalk_1["default"].yellow(userid));
|
|
90
|
+
}
|
|
91
|
+
logger.log('simulator connect status:', chalk_1["default"].yellow(simulatorConnectStatus ? simulatorConnectStatus : 'disconnected'));
|
|
92
|
+
logger.log('simulator host:', chalk_1["default"].yellow(simulatorHost));
|
|
93
|
+
logger.log('simulator port:', chalk_1["default"].yellow(simulatorPort));
|
|
94
|
+
return [2 /*return*/];
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
}); };
|
|
98
|
+
exports.status = status;
|
package/modules/storage.js
CHANGED
|
@@ -26,7 +26,7 @@ var Storage = /** @class */ (function () {
|
|
|
26
26
|
this._dataTime = 0;
|
|
27
27
|
var homePath = os_1["default"].homedir();
|
|
28
28
|
var cmdName = 'zeus';
|
|
29
|
-
this._filePath = path_1["default"].resolve(homePath, ".zepp/."
|
|
29
|
+
this._filePath = path_1["default"].resolve(homePath, ".zepp/.".concat(cmdName));
|
|
30
30
|
this._dataTimeout = timeout || 1000 * 60;
|
|
31
31
|
this._dataEditTimeout = editTimeout || 1000;
|
|
32
32
|
this._data = {};
|
|
@@ -49,7 +49,7 @@ var Storage = /** @class */ (function () {
|
|
|
49
49
|
var _this = this;
|
|
50
50
|
var dotenvArray = [];
|
|
51
51
|
Object.keys(this._data).forEach(function (key) {
|
|
52
|
-
dotenvArray.push(key
|
|
52
|
+
dotenvArray.push("".concat(key, "=").concat(_this._data[key]));
|
|
53
53
|
});
|
|
54
54
|
fs_1["default"].writeFileSync(this._filePath, dotenvArray.join('\n'));
|
|
55
55
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zeppos/zeus-cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.24",
|
|
4
4
|
"description": "zeus mini-program tools",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"author": "zepp",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"webpack": "^5.52.0"
|
|
38
38
|
},
|
|
39
39
|
"dependencies": {
|
|
40
|
-
"@zeppos/zpm": "^2.1.
|
|
40
|
+
"@zeppos/zpm": "^2.1.49",
|
|
41
41
|
"axios": "^0.23.0",
|
|
42
42
|
"chalk": "^4.1.2",
|
|
43
43
|
"chokidar": "^3.5.2",
|
|
@@ -46,6 +46,7 @@
|
|
|
46
46
|
"findup-sync": "^4.0.0",
|
|
47
47
|
"form-data": "^4.0.0",
|
|
48
48
|
"fs-extra": "^10.0.0",
|
|
49
|
+
"get-port": "5.1.1",
|
|
49
50
|
"inquirer": "^8.1.2",
|
|
50
51
|
"lodash": "^4.17.21",
|
|
51
52
|
"npm-keyword": "^6.1.0",
|
|
@@ -53,6 +54,7 @@
|
|
|
53
54
|
"qrcode-terminal": "^0.12.0",
|
|
54
55
|
"qs": "^6.10.1",
|
|
55
56
|
"rd": "^2.0.1",
|
|
57
|
+
"shelljs": "^0.8.4",
|
|
56
58
|
"socket.io-client": "^4.3.0",
|
|
57
59
|
"update-notifier": "^5.1.0",
|
|
58
60
|
"yargs": "^17.1.1",
|
|
@@ -1,32 +1,10 @@
|
|
|
1
1
|
App({
|
|
2
|
-
globalData: {
|
|
3
|
-
|
|
4
|
-
},
|
|
2
|
+
globalData: {},
|
|
5
3
|
onCreate(options) {
|
|
6
4
|
console.log('app on create invoke')
|
|
7
5
|
},
|
|
8
6
|
|
|
9
|
-
|
|
10
|
-
console.log('app on
|
|
11
|
-
},
|
|
12
|
-
|
|
13
|
-
onHide(options) {
|
|
14
|
-
console.log('app on hide invoke')
|
|
15
|
-
},
|
|
16
|
-
|
|
17
|
-
onDestory(options) {
|
|
18
|
-
console.log('app on destory invoke')
|
|
19
|
-
},
|
|
20
|
-
|
|
21
|
-
onError(error) {
|
|
22
|
-
console.log('app on error invoke')
|
|
23
|
-
},
|
|
24
|
-
|
|
25
|
-
onPageNotFound(obj) {
|
|
26
|
-
console.log('app on page not found invoke')
|
|
27
|
-
},
|
|
28
|
-
|
|
29
|
-
onUnhandledRejection(obj) {
|
|
30
|
-
console.log('app on un handle rejection invoke')
|
|
7
|
+
onDestroy(options) {
|
|
8
|
+
console.log('app on destroy invoke')
|
|
31
9
|
}
|
|
32
10
|
})
|
|
@@ -26,14 +26,7 @@
|
|
|
26
26
|
"page": {
|
|
27
27
|
"pages": [
|
|
28
28
|
"pages/index"
|
|
29
|
-
]
|
|
30
|
-
"window": {
|
|
31
|
-
"navigationBarBackgroundColor": "#ffffff",
|
|
32
|
-
"navigationBarTextStyle": "black",
|
|
33
|
-
"navigationBarTitleText": "empty",
|
|
34
|
-
"backgroundColor": "#eeeeee",
|
|
35
|
-
"backgroundTextStyle": "light"
|
|
36
|
-
}
|
|
29
|
+
]
|
|
37
30
|
},
|
|
38
31
|
"app-side": {
|
|
39
32
|
"path": "app-side/index"
|
|
@@ -1,32 +1,10 @@
|
|
|
1
1
|
App({
|
|
2
|
-
globalData: {
|
|
3
|
-
|
|
4
|
-
},
|
|
2
|
+
globalData: {},
|
|
5
3
|
onCreate(options) {
|
|
6
4
|
console.log('app on create invoke')
|
|
7
5
|
},
|
|
8
6
|
|
|
9
|
-
|
|
10
|
-
console.log('app on
|
|
11
|
-
},
|
|
12
|
-
|
|
13
|
-
onHide(options) {
|
|
14
|
-
console.log('app on hide invoke')
|
|
15
|
-
},
|
|
16
|
-
|
|
17
|
-
onDestory(options) {
|
|
18
|
-
console.log('app on destory invoke')
|
|
19
|
-
},
|
|
20
|
-
|
|
21
|
-
onError(error) {
|
|
22
|
-
console.log('app on error invoke')
|
|
23
|
-
},
|
|
24
|
-
|
|
25
|
-
onPageNotFound(obj) {
|
|
26
|
-
console.log('app on page not found invoke')
|
|
27
|
-
},
|
|
28
|
-
|
|
29
|
-
onUnhandledRejection(obj) {
|
|
30
|
-
console.log('app on un handle rejection invoke')
|
|
7
|
+
onDestroy(options) {
|
|
8
|
+
console.log('app on destroy invoke')
|
|
31
9
|
}
|
|
32
10
|
})
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TEXT_STYLE } from './index.style'
|
|
2
2
|
|
|
3
3
|
const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
|
|
4
4
|
Page({
|
|
5
5
|
build() {
|
|
6
6
|
logger.debug('page build invoked')
|
|
7
|
-
|
|
7
|
+
hmUI.createWidget(hmUI.widget.TEXT, {
|
|
8
|
+
...TEXT_STYLE,
|
|
9
|
+
})
|
|
8
10
|
},
|
|
9
11
|
onInit() {
|
|
10
12
|
logger.debug('page onInit invoked')
|
|
11
13
|
},
|
|
12
14
|
|
|
13
|
-
|
|
14
|
-
logger.debug('page
|
|
15
|
+
onDestroy() {
|
|
16
|
+
logger.debug('page onDestroy invoked')
|
|
15
17
|
},
|
|
16
18
|
})
|
|
@@ -1,32 +1,15 @@
|
|
|
1
1
|
import { gettext } from "i18n"
|
|
2
|
-
import { assets } from './../../../utils/index'
|
|
3
2
|
|
|
4
|
-
const
|
|
3
|
+
export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
|
|
5
4
|
|
|
6
|
-
export const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
text_size: 36,
|
|
17
|
-
align_h: h.ALIGN.CENTER_H,
|
|
18
|
-
text_style: hmUI.text_style.WRAP
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export const imageStyle = {
|
|
23
|
-
attrs: {
|
|
24
|
-
src: image('logo.png')
|
|
25
|
-
},
|
|
26
|
-
styles: {
|
|
27
|
-
x: 115,
|
|
28
|
-
y: 100,
|
|
29
|
-
w: 250,
|
|
30
|
-
h: 56,
|
|
31
|
-
},
|
|
5
|
+
export const TEXT_STYLE = {
|
|
6
|
+
text: gettext('appName'),
|
|
7
|
+
x: px(42),
|
|
8
|
+
y: px(200),
|
|
9
|
+
w: DEVICE_WIDTH - px(42) * 2,
|
|
10
|
+
h: px(100),
|
|
11
|
+
color: 0xffffff,
|
|
12
|
+
text_size: px(36),
|
|
13
|
+
align_h: hmUI.align.CENTER_H,
|
|
14
|
+
text_style: hmUI.text_style.WRAP,
|
|
32
15
|
}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TEXT_STYLE } from './index.style'
|
|
2
2
|
|
|
3
3
|
const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
|
|
4
4
|
Page({
|
|
5
5
|
build() {
|
|
6
6
|
logger.debug('page build invoked')
|
|
7
|
-
|
|
7
|
+
hmUI.createWidget(hmUI.widget.TEXT, {
|
|
8
|
+
...TEXT_STYLE,
|
|
9
|
+
})
|
|
8
10
|
},
|
|
9
11
|
onInit() {
|
|
10
12
|
logger.debug('page onInit invoked')
|
|
11
13
|
},
|
|
12
14
|
|
|
13
|
-
|
|
14
|
-
logger.debug('page
|
|
15
|
+
onDestroy() {
|
|
16
|
+
logger.debug('page onDestroy invoked')
|
|
15
17
|
},
|
|
16
18
|
})
|
|
@@ -1,32 +1,15 @@
|
|
|
1
1
|
import { gettext } from "i18n"
|
|
2
|
-
import { assets } from './../../../utils/index'
|
|
3
2
|
|
|
4
|
-
const
|
|
3
|
+
export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
|
|
5
4
|
|
|
6
|
-
export const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
text_size: 36,
|
|
17
|
-
align_h: h.ALIGN.CENTER_H,
|
|
18
|
-
text_style: hmUI.text_style.WRAP
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export const imageStyle = {
|
|
23
|
-
attrs: {
|
|
24
|
-
src: image('logo.png')
|
|
25
|
-
},
|
|
26
|
-
styles: {
|
|
27
|
-
x: 115,
|
|
28
|
-
y: 100,
|
|
29
|
-
w: 250,
|
|
30
|
-
h: 56,
|
|
31
|
-
},
|
|
5
|
+
export const TEXT_STYLE = {
|
|
6
|
+
text: gettext('appName'),
|
|
7
|
+
x: px(42),
|
|
8
|
+
y: px(200),
|
|
9
|
+
w: DEVICE_WIDTH - px(42) * 2,
|
|
10
|
+
h: px(100),
|
|
11
|
+
color: 0xffffff,
|
|
12
|
+
text_size: px(36),
|
|
13
|
+
align_h: hmUI.align.CENTER_H,
|
|
14
|
+
text_style: hmUI.text_style.WRAP,
|
|
32
15
|
}
|
|
@@ -1,16 +1,19 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { TEXT_STYLE } from './index.style'
|
|
2
2
|
|
|
3
3
|
const logger = DeviceRuntimeCore.HmLogger.getLogger('helloworld')
|
|
4
|
+
|
|
4
5
|
Page({
|
|
5
6
|
build() {
|
|
6
7
|
logger.debug('page build invoked')
|
|
7
|
-
|
|
8
|
+
hmUI.createWidget(hmUI.widget.TEXT, {
|
|
9
|
+
...TEXT_STYLE,
|
|
10
|
+
})
|
|
8
11
|
},
|
|
9
12
|
onInit() {
|
|
10
13
|
logger.debug('page onInit invoked')
|
|
11
14
|
},
|
|
12
15
|
|
|
13
|
-
|
|
14
|
-
logger.debug('page
|
|
16
|
+
onDestroy() {
|
|
17
|
+
logger.debug('page onDestroy invoked')
|
|
15
18
|
},
|
|
16
19
|
})
|
|
@@ -1,32 +1,15 @@
|
|
|
1
1
|
import { gettext } from "i18n"
|
|
2
|
-
import { assets } from './../../../utils/index'
|
|
3
2
|
|
|
4
|
-
const
|
|
3
|
+
export const { width: DEVICE_WIDTH, height: DEVICE_HEIGHT } = hmSetting.getDeviceInfo()
|
|
5
4
|
|
|
6
|
-
export const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
text_size: 36,
|
|
17
|
-
align_h: h.ALIGN.CENTER_H,
|
|
18
|
-
text_style: hmUI.text_style.WRAP
|
|
19
|
-
}
|
|
5
|
+
export const TEXT_STYLE = {
|
|
6
|
+
text: gettext('appName'),
|
|
7
|
+
x: 42,
|
|
8
|
+
y: 200,
|
|
9
|
+
w: DEVICE_WIDTH - 42 * 2,
|
|
10
|
+
h: 100,
|
|
11
|
+
color: 0xffffff,
|
|
12
|
+
text_size: 36,
|
|
13
|
+
align_h: hmUI.align.CENTER_H,
|
|
14
|
+
text_style: hmUI.text_style.WRAP,
|
|
20
15
|
}
|
|
21
|
-
|
|
22
|
-
export const imageStyle = {
|
|
23
|
-
attrs: {
|
|
24
|
-
src: image('logo.png')
|
|
25
|
-
},
|
|
26
|
-
styles: {
|
|
27
|
-
x: 115,
|
|
28
|
-
y: 100,
|
|
29
|
-
w: 250,
|
|
30
|
-
h: 56,
|
|
31
|
-
},
|
|
32
|
-
}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "empty",
|
|
3
|
+
"version": "1.0.0",
|
|
4
|
+
"description": "",
|
|
5
|
+
"main": "app.js",
|
|
6
|
+
"scripts": {
|
|
7
|
+
"test": "echo \"Error: no test specified\" && exit 1"
|
|
8
|
+
},
|
|
9
|
+
"author": "",
|
|
10
|
+
"license": "ISC",
|
|
11
|
+
"devDependencies": {
|
|
12
|
+
"@zeppos/device-types": "^1.0.0"
|
|
13
|
+
}
|
|
14
|
+
}
|