From 42dc1b93a7aa7dd5ff4ee2420183fe0ccceec7b9 Mon Sep 17 00:00:00 2001
From: surunzi <redhoodsu@tencent.com>
Date: Wed, 29 Apr 2020 22:50:37 +0800
Subject: [PATCH] chore: small changes

---
 src/Console/Console.hbs |  4 ++--
 src/Console/Log.js      |  2 +-
 src/Console/Logger.js   | 38 ++++++++++++++++++++++++++++----------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/Console/Console.hbs b/src/Console/Console.hbs
index d4334cf..e279baf 100644
--- a/src/Console/Console.hbs
+++ b/src/Console/Console.hbs
@@ -10,8 +10,8 @@
   </div>
   <div {{{class 'logs-container'}}}>
     <div {{{class 'logs-space'}}}>
-      <ul {{{class 'fake-logs'}}}></ul>
-      <ul {{{class 'logs'}}}></ul>
+      <div {{{class 'fake-logs'}}}></div>
+      <div {{{class 'logs'}}}></div>
     </div>
   </div>
   <div {{{class 'js-input'}}}>
diff --git a/src/Console/Log.js b/src/Console/Log.js
index e2566bf..18b3cbb 100644
--- a/src/Console/Log.js
+++ b/src/Console/Log.js
@@ -61,7 +61,7 @@ export default class Log extends Emitter {
     this.headers = headers
     this.ignoreFilter = ignoreFilter
     this.collapsed = false
-    this.el = document.createElement('li')
+    this.el = document.createElement('div')
     this.el.log = this
     this.height = 0
     this.width = 0
diff --git a/src/Console/Logger.js b/src/Console/Logger.js
index adb0379..81e17bd 100644
--- a/src/Console/Logger.js
+++ b/src/Console/Logger.js
@@ -28,6 +28,9 @@ import {
 } from '../lib/util'
 import evalCss from '../lib/evalCss'
 
+const u = navigator.userAgent
+const isAndroid = u.indexOf('Android') > -1 || u.indexOf('Adr') > -1
+
 let id = 0
 
 export default class Logger extends Emitter {
@@ -37,9 +40,9 @@ export default class Logger extends Emitter {
 
     this._$container = $container
     this._container = $container.get(0)
-    this._$el = $container.find('ul.eruda-logs')
+    this._$el = $container.find('.eruda-logs')
     this._el = this._$el.get(0)
-    this._$fakeEl = $container.find('ul.eruda-fake-logs')
+    this._$fakeEl = $container.find('.eruda-fake-logs')
     this._fakeEl = this._$fakeEl.get(0)
     this._$space = $container.find('.eruda-logs-space')
     this._space = this._$space.get(0)
@@ -48,6 +51,9 @@ export default class Logger extends Emitter {
     this._bottomSpaceHeight = 0
     this._lastScrollTop = 0
     this._lastTimestamp = 0
+    this._speedToleranceFactor = 100
+    this._maxSpeedTolerance = 2000
+    this._minSpeedTolerance = 100
     this._logs = []
     this._displayLogs = []
     this._timer = {}
@@ -62,6 +68,13 @@ export default class Logger extends Emitter {
     this._isAtBottom = true
     this._groupStack = new Stack()
 
+    // For android slowing rendering
+    if (isAndroid) {
+      this._speedToleranceFactor = 800
+      this._maxSpeedTolerance = 3000
+      this._minSpeedTolerance = 800
+    }
+
     this.renderViewport = throttle(options => {
       this._renderViewport(options)
     }, 16)
@@ -641,23 +654,27 @@ export default class Logger extends Emitter {
       const duration = timestamp - lastTimestamp
       const distance = scrollTop - lastScrollTop
       const speed = Math.abs(distance / duration)
-      let speedTolerance = speed * 800
+      let speedTolerance = speed * this._speedToleranceFactor
       if (duration > 1000) {
         speedTolerance = 1000
       }
-      if (speedTolerance > 4000) speedTolerance = 4000
-      if (speedTolerance < 500) speedTolerance = 1000
+      if (speedTolerance > this._maxSpeedTolerance) {
+        speedTolerance = this._maxSpeedTolerance
+      }
+      if (speedTolerance < this._minSpeedTolerance) {
+        speedTolerance = this._minSpeedTolerance
+      }
       this._lastScrollTop = scrollTop
       this._lastTimestamp = timestamp
 
       let topTolerance = 0
       let bottomTolerance = 0
       if (lastScrollTop < scrollTop) {
-        topTolerance = 500
+        topTolerance = this._minSpeedTolerance
         bottomTolerance = speedTolerance
       } else {
         topTolerance = speedTolerance
-        bottomTolerance = 500
+        bottomTolerance = this._minSpeedTolerance
       }
 
       if (
@@ -728,14 +745,15 @@ export default class Logger extends Emitter {
     this._updateSpace(currentHeight)
     this._updateTopSpace(topSpaceHeight)
     this._updateBottomSpace(bottomSpaceHeight)
-    el.innerHTML = ''
+
+    while (el.firstChild) {
+      el.removeChild(el.lastChild)
+    }
     el.appendChild(frag)
 
     const { scrollHeight } = container
     if (this._isAtBottom && scrollTop <= scrollHeight - offsetHeight) {
       container.scrollTop = 10000000
-    } else {
-      container.scrollTop = scrollTop
     }
   }
 }