lingling
/
media_player_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://www.cloudview.work/git/fangxiang/media_player_client into 融合

This commit is contained in:
shefengchun 2022-12-30 12:08:40 +08:00
parent f9075ed78d 3519d2bf6e
commit 9782be5cd4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/ClientConnection.ts
View File

@ -1410,7 +1410,7 @@ export default class ClientConnection {
public async SetBlendingOverlap( public async SetBlendingOverlap(
row: number, row: number,
column: number, column: number,
location: number, location: number,
enable: boolean, enable: boolean,
width: number width: number
) { ) {
@ -1418,7 +1418,7 @@ export default class ClientConnection {
new Protocol.SetBlendingOverlapRequestEntity( new Protocol.SetBlendingOverlapRequestEntity(
row, row,
column, column,
location, location,
enable, enable,
width width
) )

6
src/entities/WSProtocol.ts
View File

@ -3304,7 +3304,7 @@ export namespace Protocol {
super.flag = PacketEntity.FLAG_REQUEST; super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id; super.rpc_id = rpc_id;
this.enable = row ?? false; this.enable = enable ?? false;
} }
enable = false; enable = false;
} }
@ -3326,12 +3326,12 @@ export namespace Protocol {
this.row = row ?? 0; this.row = row ?? 0;
this.column = column ?? 0; this.column = column ?? 0;
this.location = location ?? 0; this.location = location ?? 0;
this.enable = row ?? false; this.enable = enable ?? false;
this.width = width ?? 0; this.width = width ?? 0;
} }
row = 0; row = 0;
column = 0; column = 0;
location = 0; //0：左融合带，1：上融合带，2：右融合带，3：下融合带 location = 0; //0：左融合带，1：上融合带，2：右融合带，3：下融合带
enable = false; enable = false;
width = 0; width = 0;
} }