Showing
1 changed file
with
10 additions
and
10 deletions
| @@ -31,7 +31,7 @@ class PageStack with WidgetsBindingObserver { | @@ -31,7 +31,7 @@ class PageStack with WidgetsBindingObserver { | ||
| 31 | push(Route route, Element element, Route? previousRoute) { | 31 | push(Route route, Element element, Route? previousRoute) { |
| 32 | Page page = Page(route, element); | 32 | Page page = Page(route, element); |
| 33 | _stack.add(page); | 33 | _stack.add(page); |
| 34 | - _task.addpush(page, page.previous); | 34 | + _task.addPush(page, page.previous); |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | pop(Route route, Route? previousRoute) { | 37 | pop(Route route, Route? previousRoute) { |
| @@ -41,7 +41,7 @@ class PageStack with WidgetsBindingObserver { | @@ -41,7 +41,7 @@ class PageStack with WidgetsBindingObserver { | ||
| 41 | 41 | ||
| 42 | Page? page = _findPage(route); | 42 | Page? page = _findPage(route); |
| 43 | if (page != null) { | 43 | if (page != null) { |
| 44 | - _task.addpop(page, page.previous); | 44 | + _task.addPop(page, page.previous); |
| 45 | } | 45 | } |
| 46 | _removeAllAfter(page); | 46 | _removeAllAfter(page); |
| 47 | } | 47 | } |
| @@ -65,7 +65,7 @@ class PageStack with WidgetsBindingObserver { | @@ -65,7 +65,7 @@ class PageStack with WidgetsBindingObserver { | ||
| 65 | _removeAllAfter(oldPage); | 65 | _removeAllAfter(oldPage); |
| 66 | } | 66 | } |
| 67 | _stack.add(newPage); | 67 | _stack.add(newPage); |
| 68 | - _task.addreplace(newPage, oldPage); | 68 | + _task.addReplace(newPage, oldPage); |
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | Page? _findPage(Route route) { | 71 | Page? _findPage(Route route) { |
| @@ -124,21 +124,21 @@ class _PageTask { | @@ -124,21 +124,21 @@ class _PageTask { | ||
| 124 | final List<_PageTaskData> _list = []; | 124 | final List<_PageTaskData> _list = []; |
| 125 | bool _taskRunning = false; | 125 | bool _taskRunning = false; |
| 126 | 126 | ||
| 127 | - addpush(Page page, Page? prevPage) { | 127 | + addPush(Page page, Page? prevPage) { |
| 128 | _PageTaskData taskData = _PageTaskData(_PageTaskType.push, page); | 128 | _PageTaskData taskData = _PageTaskData(_PageTaskType.push, page); |
| 129 | taskData.prevPage = prevPage; | 129 | taskData.prevPage = prevPage; |
| 130 | _list.add(taskData); | 130 | _list.add(taskData); |
| 131 | _triggerTask(); | 131 | _triggerTask(); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | - addpop(Page page, Page? prevPage) { | 134 | + addPop(Page page, Page? prevPage) { |
| 135 | _PageTaskData taskData = _PageTaskData(_PageTaskType.pop, page); | 135 | _PageTaskData taskData = _PageTaskData(_PageTaskType.pop, page); |
| 136 | taskData.prevPage = prevPage; | 136 | taskData.prevPage = prevPage; |
| 137 | _list.add(taskData); | 137 | _list.add(taskData); |
| 138 | _triggerTask(); | 138 | _triggerTask(); |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | - addreplace(Page page, Page? prevPage) { | 141 | + addReplace(Page page, Page? prevPage) { |
| 142 | _PageTaskData taskData = _PageTaskData(_PageTaskType.replace, page); | 142 | _PageTaskData taskData = _PageTaskData(_PageTaskType.replace, page); |
| 143 | taskData.prevPage = prevPage; | 143 | taskData.prevPage = prevPage; |
| 144 | _list.add(taskData); | 144 | _list.add(taskData); |
| @@ -182,14 +182,14 @@ class _PageTask { | @@ -182,14 +182,14 @@ class _PageTask { | ||
| 182 | } | 182 | } |
| 183 | } | 183 | } |
| 184 | if (enterPage != leavePage) { | 184 | if (enterPage != leavePage) { |
| 185 | - if (enterPage != null && !enterPage.pageInfo.ignore) { | ||
| 186 | - enterPage.pageInfo.timer.start(); | ||
| 187 | - Track.instance.pageView(enterPage.pageInfo); | ||
| 188 | - } | ||
| 189 | if (leavePage != null && !leavePage.pageInfo.ignore) { | 185 | if (leavePage != null && !leavePage.pageInfo.ignore) { |
| 190 | leavePage.pageInfo.timer.end(); | 186 | leavePage.pageInfo.timer.end(); |
| 191 | Track.instance.pageLeave(leavePage.pageInfo); | 187 | Track.instance.pageLeave(leavePage.pageInfo); |
| 192 | } | 188 | } |
| 189 | + if (enterPage != null && !enterPage.pageInfo.ignore) { | ||
| 190 | + enterPage.pageInfo.timer.start(); | ||
| 191 | + Track.instance.pageView(enterPage.pageInfo); | ||
| 192 | + } | ||
| 193 | } | 193 | } |
| 194 | _taskRunning = false; | 194 | _taskRunning = false; |
| 195 | } | 195 | } |
-
Please register or login to post a comment