github/android-dev-ext
1
1
Fork 0
mirror of https://github.com/adelphes/android-dev-ext.git synced 2025-12-22 09:29:38 +00:00
Code Issues 41 Packages Projects Releases Wiki Activity

Fix logcat not displaying (#64)

Browse Source 
* update LogcatContent constructor to use single deviceID argument

* add support for WebviewPanel for displaying logcat data

Fixes #63
This commit is contained in:
Dave Holoway
2019-08-18 13:22:12 +01:00
committed by GitHub
parent 52ab704acd
commit 684dd39181
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/contentprovider.js
View File

@@ -44,7 +44,7 @@ class AndroidContentProvider /*extends TextDocumentContentProvider*/ {
provideLogcatDocumentContent(uri) { provideLogcatDocumentContent(uri) {
// LogcatContent depends upon AndroidContentProvider, so we must delay-load this // LogcatContent depends upon AndroidContentProvider, so we must delay-load this
const { LogcatContent } = require('./logcat'); const { LogcatContent } = require('./logcat');
var doc = this._docs[uri] = new LogcatContent(this, uri); var doc = this._docs[uri] = new LogcatContent(uri.query);
return doc.content; return doc.content;
} }
} }

23
src/logcat.js
View File

@@ -15,10 +15,8 @@ const { D } = require('./util');
*/ */
class LogcatContent { class LogcatContent {
constructor(provider/*: AndroidContentProvider*/, uri/*: Uri*/) { constructor(deviceid) {
this._provider = provider; this._logcatid = deviceid;
this._uri = uri;
this._logcatid = uri.query;
this._logs = []; this._logs = [];
this._htmllogs = []; this._htmllogs = [];
this._oldhtmllogs = []; this._oldhtmllogs = [];
@@ -27,7 +25,7 @@ class LogcatContent {
this._refreshRate = 200; // ms this._refreshRate = 200; // ms
this._state = ''; this._state = '';
this._htmltemplate = ''; this._htmltemplate = '';
this._adbclient = new ADBClient(uri.query); this._adbclient = new ADBClient(deviceid);
this._initwait = new Promise((resolve, reject) => { this._initwait = new Promise((resolve, reject) => {
this._state = 'connecting'; this._state = 'connecting';
LogcatContent.initWebSocketServer() LogcatContent.initWebSocketServer()
@@ -276,6 +274,21 @@ function openLogcatWindow(vscode) {
.then(devices => { .then(devices => {
if (!Array.isArray(devices)) return; // user cancelled (or no devices connected) if (!Array.isArray(devices)) return; // user cancelled (or no devices connected)
devices.forEach(device => { devices.forEach(device => {
if (vscode.window.createWebviewPanel) {
const panel = vscode.window.createWebviewPanel(
'androidlogcat', // Identifies the type of the webview. Used internally
`logcat-${device.serial}`, // Title of the panel displayed to the user
vscode.ViewColumn.One, // Editor column to show the new webview panel in.
{
enableScripts: true,
}
);
const logcat = new LogcatContent(device.serial);
logcat.content.then(html => {
panel.webview.html = html;
});
return;
}
var uri = AndroidContentProvider.getReadLogcatUri(device.serial); var uri = AndroidContentProvider.getReadLogcatUri(device.serial);
return vscode.commands.executeCommand("vscode.previewHtml",uri,vscode.ViewColumn.Two); return vscode.commands.executeCommand("vscode.previewHtml",uri,vscode.ViewColumn.Two);
}); });