Skip to content

Commit c46694f

Browse files
committed
修改事件相关
1 parent f519eb9 commit c46694f

29 files changed

+363
-321
lines changed

src/BABA.ts

Lines changed: 54 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,55 +20,55 @@ export enum BabaStr {
2020
showProblemFinishOpen = "showProblemFinishOpen",
2121
showProblemFinishError = "showProblemFinishError",
2222
VSCODE_DISPOST = "VSCODE_DISPOST",
23-
statusBarTime_start = "statusBarTime_start",
24-
statusBarTime_stop = "statusBarTime_stop",
25-
statusBarTime_reset = "statusBarTime_reset",
23+
BABACMD_statusBarTime_start = "BABACMD_statusBarTime_start",
24+
BABACMD_statusBarTime_stop = "BABACMD_statusBarTime_stop",
25+
BABACMD_statusBarTime_reset = "BABACMD_statusBarTime_reset",
2626
StatusBarProxy = "StatusBarProxy",
2727
StatusBarMediator = "StatusBarMediator",
2828
statusBar_update_status = "statusBar_update_status",
2929
statusBar_update_statusFinish = "statusBar_update_statusFinish",
3030
statusBar_update = "statusBar_update",
3131
statusBar_update_UserContestInfo = "statusBar_update_UserContestInfo",
32-
InitAll = "InitAll",
32+
InitFile = "InitFile",
3333
LogOutputProxy = "LogOutputProxy",
3434
LogOutputMediator = "LogOutputMediator",
35-
Remark_remarkCreateNote = "Remark_remarkCreateNote",
36-
Remark_remarkClose = "Remark_remarkClose",
37-
Remark_remarkReplyNote = "Remark_remarkReplyNote",
38-
Remark_remarkDeleteNoteComment = "Remark_remarkDeleteNoteComment",
39-
Remark_remarkCancelsaveNote = "Remark_remarkCancelsaveNote",
40-
Remark_remarkSaveNote = "Remark_remarkSaveNote",
41-
Remark_remarkEditNote = "Remark_remarkEditNote",
42-
Remark_startRemark = "Remark_startRemark",
43-
Remark_includeTemplates = "Remark_includeTemplates",
35+
BABACMD_remarkCreateNote = "BABACMD_remarkCreateNote",
36+
BABACMD_remarkClose = "BABACMD_remarkClose",
37+
BABACMD_remarkReplyNote = "BABACMD_remarkReplyNote",
38+
BABACMD_remarkDeleteNoteComment = "BABACMD_remarkDeleteNoteComment",
39+
BABACMD_remarkCancelsaveNote = "BABACMD_remarkCancelsaveNote",
40+
BABACMD_remarkSaveNote = "BABACMD_remarkSaveNote",
41+
BABACMD_remarkEditNote = "BABACMD_remarkEditNote",
42+
BABACMD_startRemark = "BABACMD_startRemark",
43+
BABACMD_includeTemplates = "BABACMD_includeTemplates",
4444
FileButtonProxy = "FileButtonProxy",
4545
FileButtonMediator = "FileButtonMediator",
46-
FileButton_refresh = "FileButton_refresh",
46+
FileButton_ConfigChange = "FileButton_ConfigChange",
4747
QuestionDataProxy = "QuestionDataProxy",
4848
QuestionDataMediator = "QuestionDataMediator",
4949
TreeDataProxy = "TreeDataProxy",
5050
TreeDataMediator = "TreeDataMediator",
51-
TreeData_refresh = "TreeData_refresh",
51+
BABACMD_refresh = "BABACMD_refresh",
5252
TreeData_cleanUserScore = "TreeData_cleanUserScore",
5353
TreeData_checkSubmit = "TreeData_checkSubmit",
5454
QuestionData_clearCache = "QuestionData_clearCache",
55-
QuestionData_refreshCache = "QuestionData_refreshCache",
55+
QuestionData_ReBuildQuestionData = "QuestionData_ReBuildQuestionData",
5656
TreeData_switchEndpoint = "TreeData_switchEndpoint",
57-
TreeData_previewProblem = "TreeData_previewProblem",
58-
TreeData_showProblem = "TreeData_showProblem",
59-
TreeData_pickOne = "TreeData_pickOne",
60-
TreeData_searchScoreRange = "TreeData_searchScoreRange",
61-
TreeData_searchProblem = "TreeData_searchProblem",
62-
TreeData_getHelp = "TreeData_getHelp",
63-
TreeData_testSolution = "TreeData_testSolution",
64-
TreeData_reTestSolution = "TreeData_reTestSolution",
65-
TreeData_testCaseDef = "TreeData_testCaseDef",
66-
TreeData_tesCaseArea = "TreeData_tesCaseArea",
67-
TreeData_submitSolution = "TreeData_submitSolution",
68-
TreeData_setDefaultLanguage = "TreeData_setDefaultLanguage",
69-
TreeData_addFavorite = "TreeData_addFavorite",
70-
TreeData_removeFavorite = "TreeData_removeFavorite",
71-
TreeData_problems_sort = "TreeData_problems_sort",
57+
BABACMD_previewProblem = "BABACMD_previewProblem",
58+
BABACMD_showProblem = "BABACMD_showProblem",
59+
BABACMD_pickOne = "BABACMD_pickOne",
60+
BABACMD_searchScoreRange = "BABACMD_searchScoreRange",
61+
BABACMD_searchProblem = "BABACMD_searchProblem",
62+
BABACMD_getHelp = "BABACMD_getHelp",
63+
BABACMD_testSolution = "BABACMD_testSolution",
64+
BABACMD_reTestSolution = "BABACMD_reTestSolution",
65+
BABACMD_testCaseDef = "BABACMD_testCaseDef",
66+
BABACMD_tesCaseArea = "BABACMD_tesCaseArea",
67+
BABACMD_submitSolution = "BABACMD_submitSolution",
68+
BABACMD_setDefaultLanguage = "BABACMD_setDefaultLanguage",
69+
BABACMD_addFavorite = "BABACMD_addFavorite",
70+
BABACMD_removeFavorite = "BABACMD_removeFavorite",
71+
BABACMD_problems_sort = "BABACMD_problems_sort",
7272
CommitResultProxy = "CommitResultProxy",
7373
CommitResultMediator = "CommitResultMediator",
7474
CommitResult_testSolutionResult = "CommitResult_testSolutionResult",
@@ -82,7 +82,7 @@ export enum BabaStr {
8282
PreviewMediator = "PreviewMediator",
8383
Preview_show = "Preview_show",
8484
TreeData_rebuildTreeData = "TreeData_rebuildTreeData",
85-
QuestionData_refreshCacheFinish = "QuestionData_refreshCacheFinish",
85+
QuestionData_ReBuildQuestionDataFinish = "QuestionData_ReBuildQuestionDataFinish",
8686
TreeData_searchTodayFinish = "TreeData_searchTodayFinish",
8787
TreeData_searchUserContest = "TreeData_searchUserContest",
8888
TreeData_searchUserContestFinish = "TreeData_searchUserContestFinish",
@@ -95,27 +95,35 @@ export enum BabaStr {
9595
TreeData_favoriteChange = "TreeData_favoriteChange",
9696
USER_LOGIN_SUC = "USER_LOGIN_SUC",
9797
USER_LOGIN_OUT = "USER_LOGIN_OUT",
98-
BricksData_setBricksType = "BricksData_setBricksType",
99-
BricksData_newBrickGroup = "BricksData_newBrickGroup",
100-
BricksData_addQidToGroup = "BricksData_addQidToGroup",
101-
BricksData_removeBrickGroup = "BricksData_removeBrickGroup",
102-
BricksData_removeQidFromGroup = "BricksData_removeQidFromGroup",
98+
BABACMD_setBricksType = "BABACMD_setBricksType",
99+
BABACMD_newBrickGroup = "BABACMD_newBrickGroup",
100+
BABACMD_addQidToGroup = "BABACMD_addQidToGroup",
101+
BABACMD_removeBrickGroup = "BABACMD_removeBrickGroup",
102+
BABACMD_removeQidFromGroup = "BABACMD_removeQidFromGroup",
103103
DebugProxy = "DebugProxy",
104104
DebugMediator = "DebugMediator",
105-
Debug_simpleDebug = "Debug_simpleDebug",
106-
Debug_addDebugType = "Debug_addDebugType",
107-
Debug_resetDebugType = "Debug_resetDebugType",
108-
Extension_InitFinish = "Extension_InitFinish",
105+
BABACMD_simpleDebug = "BABACMD_simpleDebug",
106+
BABACMD_addDebugType = "BABACMD_addDebugType",
107+
BABACMD_resetDebugType = "BABACMD_resetDebugType",
108+
StartReadData = "StartReadData",
109109
Debug_checkCanDebugSuc = "Debug_checkCanDebugSuc",
110110
ChildCallProxy = "ChildCallProxy",
111111
ChildCallMediator = "ChildCallMediator",
112-
AfterInitAll = "AfterInitAll",
112+
InitEnv = "InitEnv",
113113
DeleteCache = "DeleteCache",
114-
BeforeExtension_InitFinish = "BeforeExtension_InitFinish",
115-
TreeData_Login = "TreeData_Login",
116-
TreeData_LoginOut = "TreeData_LoginOut",
117-
TreeData_deleteAllCache = "TreeData_deleteAllCache",
114+
InitLoginStatus = "InitLoginStatus",
115+
BABACMD_Login = "BABACMD_Login",
116+
BABACMD_LoginOut = "BABACMD_LoginOut",
117+
BABACMD_deleteAllCache = "BABACMD_deleteAllCache",
118118
QuestionData_submitNewAccept = "QuestionData_submitNewAccept",
119+
RankScoreDataProxy = "RankScoreDataProxy",
120+
RankScoreDataMediator = "RankScoreDataMediator",
121+
BricksData_submitAndAccepted = "BricksData_submitAndAccepted",
122+
BricksData_setBricksTypeFinish = "BricksData_setBricksTypeFinish",
123+
BricksData_newBrickGroupFinish = "BricksData_newBrickGroupFinish",
124+
BricksData_removeBrickGroupFinish = "BricksData_removeBrickGroupFinish",
125+
BricksData_addQidToGroupFinish = "BricksData_addQidToGroupFinish",
126+
BricksData_removeQidFromGroupFinish = "BricksData_removeQidFromGroupFinish",
119127
}
120128

121129
export class BABA {

src/bricksData/BricksDataService.ts

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
import { TreeDataProvider, EventEmitter, Event, TreeItem, TreeItemCollapsibleState } from "vscode";
11-
import { BricksNormalId, defaultProblem, ISubmitEvent } from "../model/Model";
11+
import { BricksNormalId, defaultProblem, ISubmitEvent } from "../model/ConstDefind";
1212
import { bricksViewController } from "../controller/BricksViewController";
1313
import { BricksNode } from "../model/NodeModel";
1414
import { bricksDao } from "../dao/bricksDao";
@@ -22,10 +22,6 @@ export class BricksDataService implements TreeDataProvider<BricksNode> {
2222
// tslint:disable-next-line:member-ordering
2323
public readonly onDidChangeTreeData: Event<any> = this.onDidChangeTreeDataEvent.event;
2424

25-
public async refresh(): Promise<void> {
26-
this.onDidChangeTreeDataEvent.fire(null);
27-
}
28-
2925
public fire() {
3026
this.onDidChangeTreeDataEvent.fire(null);
3127
}
@@ -108,14 +104,14 @@ export class BricksDataService implements TreeDataProvider<BricksNode> {
108104
if (e.sub_type == "submit" && e.accepted) {
109105
let qid: string = e.qid.toString();
110106
bricksDao.addSubmitTimeByQid(qid);
111-
BABA.sendNotification(BabaStr.BricksData_refresh);
107+
BABA.sendNotification(BabaStr.BricksData_submitAndAccepted);
112108
}
113109
}
114110

115111
public async setBricksType(node: BricksNode, type) {
116112
let qid: string = node.qid.toString();
117113
bricksDao.setTypeByQid(qid, type);
118-
BABA.sendNotification(BabaStr.BricksData_refresh);
114+
BABA.sendNotification(BabaStr.BricksData_setBricksTypeFinish);
119115
}
120116

121117
private parseIconPathFromProblemState(element: BricksNode): string {
@@ -186,8 +182,8 @@ export class BricksDataMediator extends BABAMediator {
186182
return [
187183
BabaStr.VSCODE_DISPOST,
188184
BabaStr.BricksData_refresh,
189-
BabaStr.InitAll,
190-
BabaStr.QuestionData_refreshCacheFinish,
185+
BabaStr.InitFile,
186+
BabaStr.QuestionData_ReBuildQuestionDataFinish,
191187
BabaStr.TreeData_searchTodayFinish,
192188
BabaStr.TreeData_searchUserContestFinish,
193189
BabaStr.TreeData_searchScoreRangeFinish,
@@ -197,30 +193,37 @@ export class BricksDataMediator extends BABAMediator {
197193
BabaStr.TreeData_favoriteChange,
198194
BabaStr.USER_statusChanged,
199195
BabaStr.statusBar_update_statusFinish,
200-
BabaStr.BricksData_setBricksType,
201-
BabaStr.BricksData_newBrickGroup,
202-
BabaStr.BricksData_addQidToGroup,
203-
BabaStr.BricksData_removeBrickGroup,
204-
BabaStr.BricksData_removeQidFromGroup,
205-
BabaStr.Extension_InitFinish,
196+
BabaStr.BABACMD_setBricksType,
197+
BabaStr.BABACMD_newBrickGroup,
198+
BabaStr.BABACMD_addQidToGroup,
199+
BabaStr.BABACMD_removeBrickGroup,
200+
BabaStr.BABACMD_removeQidFromGroup,
201+
BabaStr.BricksData_submitAndAccepted,
202+
BabaStr.BricksData_setBricksTypeFinish,
203+
BabaStr.BricksData_newBrickGroupFinish,
204+
BabaStr.BricksData_removeBrickGroupFinish,
205+
BabaStr.BricksData_addQidToGroupFinish,
206+
BabaStr.BricksData_removeQidFromGroupFinish,
206207
];
207208
}
208209
async handleNotification(_notification: BaseCC.BaseCC.INotification) {
209210
let body = _notification.getBody();
210211
switch (_notification.getName()) {
211212
case BabaStr.VSCODE_DISPOST:
212213
break;
213-
214-
case BabaStr.InitAll:
214+
case BabaStr.InitFile:
215215
await bricksDataService.initialize();
216216
break;
217+
case BabaStr.BricksData_newBrickGroupFinish:
218+
case BabaStr.BricksData_removeBrickGroupFinish:
219+
case BabaStr.BricksData_addQidToGroupFinish:
220+
case BabaStr.BricksData_removeQidFromGroupFinish:
221+
case BabaStr.BricksData_setBricksTypeFinish:
217222
case BabaStr.BricksData_refresh:
223+
case BabaStr.BricksData_submitAndAccepted:
218224
case BabaStr.USER_statusChanged:
219225
case BabaStr.statusBar_update_statusFinish:
220-
case BabaStr.Extension_InitFinish:
221-
bricksDataService.refresh();
222-
break;
223-
case BabaStr.QuestionData_refreshCacheFinish:
226+
case BabaStr.QuestionData_ReBuildQuestionDataFinish:
224227
case BabaStr.TreeData_searchTodayFinish:
225228
case BabaStr.TreeData_searchUserContestFinish:
226229
case BabaStr.TreeData_searchScoreRangeFinish:
@@ -233,19 +236,19 @@ export class BricksDataMediator extends BABAMediator {
233236
case BabaStr.CommitResult_showFinish:
234237
bricksDataService.checkSubmit(_notification.getBody());
235238

236-
case BabaStr.BricksData_setBricksType:
239+
case BabaStr.BABACMD_setBricksType:
237240
bricksViewController.setBricksType(body.node, body.type);
238241
break;
239-
case BabaStr.BricksData_newBrickGroup:
242+
case BabaStr.BABACMD_newBrickGroup:
240243
bricksViewController.newBrickGroup();
241244
break;
242-
case BabaStr.BricksData_addQidToGroup:
245+
case BabaStr.BABACMD_addQidToGroup:
243246
bricksViewController.addQidToGroup(body);
244247
break;
245-
case BabaStr.BricksData_removeBrickGroup:
248+
case BabaStr.BABACMD_removeBrickGroup:
246249
bricksViewController.removeBrickGroup(body);
247250
break;
248-
case BabaStr.BricksData_removeQidFromGroup:
251+
case BabaStr.BABACMD_removeQidFromGroup:
249252
bricksViewController.removeQidFromGroup(body);
250253
break;
251254
default:

src/childCall/childCallModule.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import * as os from "os";
1313
import * as path from "path";
1414
import { ExtensionContext, ProgressLocation, Progress } from "vscode";
1515
import { ConfigurationChangeEvent, Disposable, MessageItem, window, workspace } from "vscode";
16-
import { DialogOptions, OutPutType, Endpoint, IProblem, leetcodeHasInited } from "../model/Model";
16+
import { DialogOptions, OutPutType, Endpoint, IProblem, leetcodeHasInited } from "../model/ConstDefind";
1717
import { getLeetCodeEndpoint, getNodePath } from "../utils/ConfigUtils";
1818
import { openUrl, ShowMessage } from "../utils/OutputUtils";
1919
import * as systemUtils from "../utils/SystemUtils";
@@ -486,14 +486,14 @@ export class ChildCallMediator extends BABAMediator {
486486
}
487487

488488
listNotificationInterests(): string[] {
489-
return [BabaStr.VSCODE_DISPOST, BabaStr.AfterInitAll, BabaStr.DeleteCache];
489+
return [BabaStr.VSCODE_DISPOST, BabaStr.InitEnv, BabaStr.DeleteCache];
490490
}
491491
async handleNotification(_notification: BaseCC.BaseCC.INotification) {
492492
switch (_notification.getName()) {
493493
case BabaStr.VSCODE_DISPOST:
494494
executeService.dispose();
495495
break;
496-
case BabaStr.AfterInitAll:
496+
case BabaStr.InitEnv:
497497
if (!systemUtils.useVscodeNode()) {
498498
await executeService.checkNodeEnv(_notification.getBody());
499499
}

src/commitResult/CommitResultModule.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import { ViewColumn, commands } from "vscode";
1111
import { BaseWebViewService } from "../service/BaseWebviewService";
1212
import { markdownService } from "../service/MarkdownService";
13-
import { ISubmitEvent, ITestSolutionData } from "../model/Model";
14-
import { IWebViewOption } from "../model/Model";
13+
import { ISubmitEvent, ITestSolutionData } from "../model/ConstDefind";
14+
import { IWebViewOption } from "../model/ConstDefind";
1515
import { promptHintMessage } from "../utils/OutputUtils";
1616
import { isAnswerDiffColor } from "../utils/ConfigUtils";
1717
import { BABA, BABAMediator, BABAProxy, BabaStr, BaseCC } from "../BABA";

src/controller/BricksViewController.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { BABA, BabaStr } from "../BABA";
1212

1313
import { bricksDao } from "../dao/bricksDao";
1414
import { groupDao } from "../dao/groupDao";
15-
import { BricksNormalId, defaultProblem, IQuickItemEx } from "../model/Model";
15+
import { BricksNormalId, defaultProblem, IQuickItemEx } from "../model/ConstDefind";
1616
import { BricksNode } from "../model/NodeModel";
1717

1818
// 视图控制器
@@ -153,14 +153,14 @@ class BricksViewController implements Disposable {
153153
});
154154
if (name && name.trim()) {
155155
BABA.getProxy(BabaStr.BricksDataProxy).newBrickGroup(name);
156-
BABA.sendNotification(BabaStr.BricksData_refresh);
156+
BABA.sendNotification(BabaStr.BricksData_newBrickGroupFinish);
157157
}
158158
}
159159

160160
public async removeBrickGroup(node) {
161161
let time = node.groupTime;
162162
BABA.getProxy(BabaStr.BricksDataProxy).removeBrickGroup(time);
163-
BABA.sendNotification(BabaStr.BricksData_refresh);
163+
BABA.sendNotification(BabaStr.BricksData_removeBrickGroupFinish);
164164
}
165165

166166
public async addQidToGroup(node: BricksNode) {
@@ -190,12 +190,12 @@ class BricksViewController implements Disposable {
190190
time_list.push(element.value);
191191
});
192192
groupDao.addQidToTimeList(node.qid, time_list);
193-
BABA.sendNotification(BabaStr.BricksData_refresh);
193+
BABA.sendNotification(BabaStr.BricksData_addQidToGroupFinish);
194194
}
195195

196196
public async removeQidFromGroup(node) {
197197
groupDao.removeQidFromTime(node.qid, node.groupTime);
198-
BABA.sendNotification(BabaStr.BricksData_refresh);
198+
BABA.sendNotification(BabaStr.BricksData_removeQidFromGroupFinish);
199199
}
200200
}
201201

src/controller/TreeViewController.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
TestSolutionType,
3434
ITestSolutionData,
3535
defaultTestSolutionData,
36-
} from "../model/Model";
36+
} from "../model/ConstDefind";
3737
import {
3838
isHideSolvedProblem,
3939
isHideScoreProblem,
@@ -50,7 +50,7 @@ import {
5050
selectWorkspaceFolder,
5151
} from "../utils/ConfigUtils";
5252
import { NodeModel } from "../model/NodeModel";
53-
import { ISearchSet } from "../model/Model";
53+
import { ISearchSet } from "../model/ConstDefind";
5454

5555
import { ShowMessage, promptForSignIn, promptHintMessage } from "../utils/OutputUtils";
5656

@@ -746,7 +746,7 @@ class TreeViewController implements Disposable {
746746
}
747747

748748
public async showDescriptionView(node: IProblem): Promise<void> {
749-
BABA.sendNotification(BabaStr.TreeData_previewProblem, { input: node, isSideMode: enableSideMode() });
749+
BABA.sendNotification(BabaStr.BABACMD_previewProblem, { input: node, isSideMode: enableSideMode() });
750750
}
751751

752752
public async searchScoreRange(): Promise<void> {
@@ -1002,8 +1002,7 @@ class TreeViewController implements Disposable {
10021002
const temp_searchSet: Map<string, ISearchSet> = this.searchSet;
10031003
const temp_waitTodayQuestion: boolean = this.waitTodayQuestion;
10041004
const temp_waitUserContest: boolean = this.waitUserContest;
1005-
BABA.sendNotification(BabaStr.QuestionData_clearCache);
1006-
BABA.sendNotification(BabaStr.QuestionData_refreshCache);
1005+
BABA.sendNotification(BabaStr.QuestionData_ReBuildQuestionData);
10071006
this.searchSet = temp_searchSet;
10081007
this.waitTodayQuestion = temp_waitTodayQuestion;
10091008
this.waitUserContest = temp_waitUserContest;

src/dao/bricksDao.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { selectWorkspaceFolder } from "../utils/ConfigUtils";
1111
import { useWsl, toWinPath, getDayStart, getDayNow, getYMD } from "../utils/SystemUtils";
1212
import * as path from "path";
1313
import * as fse from "fs-extra";
14-
import { BricksType, BricksTypeName } from "../model/Model";
14+
import { BricksType, BricksTypeName } from "../model/ConstDefind";
1515

1616
// let bricks_json = {
1717
// version: 1,

0 commit comments

Comments
 (0)