Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
Madara
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
Madara
Commits
d08fba1e
Commit
d08fba1e
authored
Oct 09, 2019
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复部分已知BUG
parent
f25b83b3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
3842 additions
and
8 deletions
+3842
-8
index.js
src/main/index.js
+11
-1
index.vue
src/renderer/components/index.vue
+16
-2
chat.vue
src/renderer/components/msssage/chat.vue
+5
-5
NIM_Web_SDK_nodejs_v6.9.0.js
src/sdk/NIM_Web_SDK_nodejs_v6.9.0.js
+7
-0
defaultLogo.png
static/icons/defaultLogo.png
+0
-0
install-spinner.gif
static/icons/install-spinner.gif
+0
-0
logo_offline.png
static/icons/logo_offline.png
+0
-0
NIM_Web_SDK_nodejs_v6.9.0.js
static/sdk/NIM_Web_SDK_nodejs_v6.9.0.js
+3803
-0
No files found.
src/main/index.js
View file @
d08fba1e
...
...
@@ -9,8 +9,11 @@ const WinReg = require('winreg')
const
fs
=
require
(
'fs'
)
const
electron
=
require
(
'electron'
)
const
screenshot
=
require
(
'screenshot-desktop'
)
const
SDK
=
require
(
'../../static/sdk/NIM_Web_
NIM_nodejs_v5.9.1
.js'
)
const
SDK
=
require
(
'../../static/sdk/NIM_Web_
SDK_nodejs_v6.9.0
.js'
)
const
http
=
require
(
'http'
)
// const unhandled = require('electron-unhandled');
// unhandled();
const
ipc
=
electron
.
ipcMain
const
shell
=
electron
.
shell
...
...
@@ -644,6 +647,13 @@ ipc.on('setClipboard', function(event, content, type) {
clipboard.writeText(content)
}
})
ipc.on('
setLineStatus
', function(event, status) {
if (status == 1) {
appIcon.setImage(path.join(__static, '
.
/
icons
/
logo
.
png
'))
} else {
appIcon.setImage(path.join(__static, '
.
/
icons
/
logo_offline
.
png
'))
}
})
ipc.on('
getNetworkImage
', function(event, url) {
http.get(url, function(res) {
var chunks = [];
...
...
src/renderer/components/index.vue
View file @
d08fba1e
...
...
@@ -97,11 +97,24 @@ export default {
left
:
0
,
currentAccount
:
''
},
reconnecloading
:
false
reconnecloading
:
false
,
isdissconnection
:
false
};
},
mounted
()
{
const
updateOnlineStatus
=
()
=>
{
if
(
navigator
.
onLine
&&
this
.
isdissconnection
){
this
.
isdissconnection
=
false
setTimeout
(()
=>
{
this
.
reconnect
()
},
5000
);
}
else
if
(
!
navigator
.
onLine
){
this
.
isdissconnection
=
true
}
}
window
.
addEventListener
(
'online'
,
updateOnlineStatus
)
window
.
addEventListener
(
'offline'
,
updateOnlineStatus
)
updateOnlineStatus
()
// var devInnerHeight = 658.0;
// var devDevicePixelRatio = 1.5;
// var devScaleFactor = 1.5;
...
...
@@ -231,6 +244,7 @@ export default {
},
computed
:
{
netState
(){
return
this
.
$store
.
state
.
isNetError
}
}
...
...
src/renderer/components/msssage/chat.vue
View file @
d08fba1e
...
...
@@ -401,11 +401,11 @@ export default {
if
(
msgs
.
length
>
0
)
this
.
lstTimer
=
msgs
[
msgs
.
length
-
1
].
time
if
(
this
.
scene
==
'team'
){
//
msgs=msgs.filter(x=>{
//
if(x.type!='notification' ||(x.type=='notification' && !x.attach.team.custom))
//
return x
//
return;
//
})
msgs
=
msgs
.
filter
(
x
=>
{
if
(
x
.
type
!=
'notification'
||
(
x
.
type
==
'notification'
&&
!
x
.
attach
.
team
.
custom
))
return
x
return
;
})
}
// console.log(msgs)
return
msgs
;
...
...
src/sdk/NIM_Web_SDK_nodejs_v6.9.0.js
0 → 100644
View file @
d08fba1e
This source diff could not be displayed because it is too large. You can
view the blob
instead.
static/icons/defaultLogo.png
deleted
100644 → 0
View file @
f25b83b3
12.6 KB
static/icons/install-spinner.gif
deleted
100644 → 0
View file @
f25b83b3
64.3 KB
static/icons/logo_offline.png
0 → 100644
View file @
d08fba1e
1.34 KB
static/sdk/NIM_Web_SDK_nodejs_v6.9.0.js
0 → 100644
View file @
d08fba1e
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment