Skip to content

杨建斌 / dy-wx2

Go to a project
Toggle navigation
Toggle navigation pinning
5154ffd5 by ex
Options

判断环境

1 parent 76bc44e1
Inline Side-by-side
Showing 3 changed files with 139 additions and 281 deletions
.idea/workspace.xml
...@@ -2,28 +2,59 @@ ...@@ -2,28 +2,59 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment=""> 4 <list default="true" id="f03425da-2e43-4e8a-b218-238983912f5c" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/temp/wechat" beforeDir="false" />
7 </list> 7 </list>
8 <ignored path="$PROJECT_DIR$/.tmp/" /> 8 <ignored path="$PROJECT_DIR$/.tmp/" />
9 <ignored path="$PROJECT_DIR$/temp/" /> 9 <ignored path="$PROJECT_DIR$/temp/" />
10 <ignored path="$PROJECT_DIR$/tmp/" /> 10 <ignored path="$PROJECT_DIR$/tmp/" />
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" />
13 <option name="SHOW_DIALOG" value="false" /> 12 <option name="SHOW_DIALOG" value="false" />
14 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 13 <option name="HIGHLIGHT_CONFLICTS" value="true" />
15 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 14 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
16 <option name="LAST_RESOLUTION" value="IGNORE" /> 15 <option name="LAST_RESOLUTION" value="IGNORE" />
17 </component> 16 </component>
17 <component name="FUSProjectUsageTrigger">
18 <session id="526402457">
19 <usages-collector id="statistics.lifecycle.project">
20 <counts>
21 <entry key="project.closed" value="2" />
22 <entry key="project.open.time.11" value="2" />
23 <entry key="project.open.time.607" value="1" />
24 <entry key="project.opened" value="3" />
25 </counts>
26 </usages-collector>
27 <usages-collector id="statistics.file.extensions.edit">
28 <counts>
29 <entry key="js" value="56" />
30 </counts>
31 </usages-collector>
32 <usages-collector id="statistics.file.types.edit">
33 <counts>
34 <entry key="JavaScript" value="56" />
35 </counts>
36 </usages-collector>
37 <usages-collector id="statistics.file.extensions.open">
38 <counts>
39 <entry key="js" value="1" />
40 </counts>
41 </usages-collector>
42 <usages-collector id="statistics.file.types.open">
43 <counts>
44 <entry key="JavaScript" value="1" />
45 </counts>
46 </usages-collector>
47 </session>
48 </component>
18 <component name="FileEditorManager"> 49 <component name="FileEditorManager">
19 <splitter split-orientation="horizontal" split-proportion="0.43944955"> 50 <splitter split-orientation="horizontal" split-proportion="0.43944955">
20 <split-first> 51 <split-first>
21 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 52 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
22 <file leaf-file-name="bondPay.html" pinned="false" current-in-tab="true"> 53 <file pinned="false" current-in-tab="true">
23 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 54 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
24 <provider selected="true" editor-type-id="text-editor"> 55 <provider selected="true" editor-type-id="text-editor">
25 <state relative-caret-position="183"> 56 <state relative-caret-position="108">
26 <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" /> 57 <caret line="9" selection-start-line="9" selection-end-line="9" />
27 </state> 58 </state>
28 </provider> 59 </provider>
29 </entry> 60 </entry>
...@@ -32,79 +63,79 @@ ...@@ -32,79 +63,79 @@
32 </split-first> 63 </split-first>
33 <split-second> 64 <split-second>
34 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 65 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
35 <file leaf-file-name="globalService.js" pinned="false" current-in-tab="false"> 66 <file pinned="false" current-in-tab="false">
36 <entry file="file://$PROJECT_DIR$/js/service/globalService.js"> 67 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
37 <provider selected="true" editor-type-id="text-editor"> 68 <provider selected="true" editor-type-id="text-editor">
38 <state relative-caret-position="570"> 69 <state relative-caret-position="468">
39 <caret line="38" column="43" selection-start-line="38" selection-start-column="43" selection-end-line="38" selection-end-column="43" /> 70 <caret line="39" column="43" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="43" />
40 </state> 71 </state>
41 </provider> 72 </provider>
42 </entry> 73 </entry>
43 </file> 74 </file>
44 <file leaf-file-name="weixinConfig.js" pinned="false" current-in-tab="false"> 75 <file pinned="false" current-in-tab="false">
45 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js"> 76 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
46 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
47 <state relative-caret-position="870"> 78 <state relative-caret-position="696">
48 <caret line="58" column="50" selection-start-line="58" selection-start-column="50" selection-end-line="58" selection-end-column="50" /> 79 <caret line="58" column="50" selection-start-line="58" selection-start-column="50" selection-end-line="58" selection-end-column="50" />
49 </state> 80 </state>
50 </provider> 81 </provider>
51 </entry> 82 </entry>
52 </file> 83 </file>
53 <file leaf-file-name="tripDetailController.js" pinned="false" current-in-tab="false"> 84 <file pinned="false" current-in-tab="true">
85 <entry file="file://$PROJECT_DIR$/js/JSBridge.js">
86 <provider selected="true" editor-type-id="text-editor">
87 <state relative-caret-position="204">
88 <caret line="86" column="29" lean-forward="true" selection-start-line="86" selection-start-column="29" selection-end-line="86" selection-end-column="29" />
89 </state>
90 </provider>
91 </entry>
92 </file>
93 <file pinned="false" current-in-tab="false">
54 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js"> 94 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
55 <provider selected="true" editor-type-id="text-editor"> 95 <provider selected="true" editor-type-id="text-editor">
56 <state relative-caret-position="450"> 96 <state relative-caret-position="360">
57 <caret line="30" column="33" lean-forward="true" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" /> 97 <caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
58 </state> 98 </state>
59 </provider> 99 </provider>
60 </entry> 100 </entry>
61 </file> 101 </file>
62 <file leaf-file-name="dingdaService.js" pinned="false" current-in-tab="false"> 102 <file pinned="false" current-in-tab="false">
63 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js"> 103 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js">
64 <provider selected="true" editor-type-id="text-editor"> 104 <provider selected="true" editor-type-id="text-editor">
65 <state relative-caret-position="2070"> 105 <state relative-caret-position="180">
66 <caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" /> 106 <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
67 </state> 107 </state>
68 </provider> 108 </provider>
69 </entry> 109 </entry>
70 </file> 110 </file>
71 <file leaf-file-name="tripDetail.html" pinned="false" current-in-tab="false"> 111 <file pinned="false" current-in-tab="false">
72 <entry file="file://$PROJECT_DIR$/html/tripDetail.html"> 112 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
73 <provider selected="true" editor-type-id="text-editor"> 113 <provider selected="true" editor-type-id="text-editor">
74 <state relative-caret-position="540"> 114 <state relative-caret-position="432">
75 <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" /> 115 <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
76 </state> 116 </state>
77 </provider> 117 </provider>
78 </entry> 118 </entry>
79 </file> 119 </file>
80 <file leaf-file-name="index.html" pinned="false" current-in-tab="false"> 120 <file pinned="false" current-in-tab="false">
81 <entry file="file://$PROJECT_DIR$/index.html"> 121 <entry file="file://$PROJECT_DIR$/index.html">
82 <provider selected="true" editor-type-id="text-editor"> 122 <provider selected="true" editor-type-id="text-editor">
83 <state relative-caret-position="180"> 123 <state relative-caret-position="96">
84 <caret line="12" column="34" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" /> 124 <caret line="8" column="52" selection-start-line="8" selection-start-column="52" selection-end-line="8" selection-end-column="52" />
85 </state> 125 </state>
86 </provider> 126 </provider>
87 </entry> 127 </entry>
88 </file> 128 </file>
89 <file leaf-file-name="contactUs.html" pinned="false" current-in-tab="false"> 129 <file pinned="false" current-in-tab="false">
90 <entry file="file://$PROJECT_DIR$/contactUs.html"> 130 <entry file="file://$PROJECT_DIR$/contactUs.html">
91 <provider selected="true" editor-type-id="text-editor"> 131 <provider selected="true" editor-type-id="text-editor">
92 <state relative-caret-position="180"> 132 <state relative-caret-position="144">
93 <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" /> 133 <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
94 </state> 134 </state>
95 </provider> 135 </provider>
96 </entry> 136 </entry>
97 </file> 137 </file>
98 <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> 138 <file pinned="false" current-in-tab="false">
99 <entry file="file://$PROJECT_DIR$/.gitignore">
100 <provider selected="true" editor-type-id="text-editor">
101 <state>
102 <caret column="7" selection-start-column="7" selection-end-column="7" />
103 </state>
104 </provider>
105 </entry>
106 </file>
107 <file leaf-file-name="index.html.bak" pinned="false" current-in-tab="false">
108 <entry file="file://$PROJECT_DIR$/index.html.bak"> 139 <entry file="file://$PROJECT_DIR$/index.html.bak">
109 <provider selected="true" editor-type-id="text-editor" /> 140 <provider selected="true" editor-type-id="text-editor" />
110 </entry> 141 </entry>
...@@ -147,7 +178,6 @@ ...@@ -147,7 +178,6 @@
147 <list> 178 <list>
148 <option value="$PROJECT_DIR$/html/main.html" /> 179 <option value="$PROJECT_DIR$/html/main.html" />
149 <option value="$PROJECT_DIR$/js/controller/bondController.js" /> 180 <option value="$PROJECT_DIR$/js/controller/bondController.js" />
150 <option value="$PROJECT_DIR$/js/service/dingdaService.js" />
151 <option value="$PROJECT_DIR$/js/controller/bondPayController.js" /> 181 <option value="$PROJECT_DIR$/js/controller/bondPayController.js" />
152 <option value="$PROJECT_DIR$/js/service/globalService.js" /> 182 <option value="$PROJECT_DIR$/js/service/globalService.js" />
153 <option value="$PROJECT_DIR$/css/app.css" /> 183 <option value="$PROJECT_DIR$/css/app.css" />
...@@ -158,11 +188,12 @@ ...@@ -158,11 +188,12 @@
158 <option value="$PROJECT_DIR$/js/compress.js" /> 188 <option value="$PROJECT_DIR$/js/compress.js" />
159 <option value="$PROJECT_DIR$/js/controller/mapController.js" /> 189 <option value="$PROJECT_DIR$/js/controller/mapController.js" />
160 <option value="$PROJECT_DIR$/js/controller/mainController.js" /> 190 <option value="$PROJECT_DIR$/js/controller/mainController.js" />
161 <option value="$PROJECT_DIR$/js/JSBridge.js" />
162 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" /> 191 <option value="$PROJECT_DIR$/js/service/wechatPaymentService.js" />
163 <option value="$PROJECT_DIR$/build.sh" /> 192 <option value="$PROJECT_DIR$/build.sh" />
164 <option value="$PROJECT_DIR$/contactUs.html" /> 193 <option value="$PROJECT_DIR$/contactUs.html" />
165 <option value="$PROJECT_DIR$/.gitignore" /> 194 <option value="$PROJECT_DIR$/.gitignore" />
195 <option value="$PROJECT_DIR$/js/service/dingdaService.js" />
196 <option value="$PROJECT_DIR$/js/JSBridge.js" />
166 </list> 197 </list>
167 </option> 198 </option>
168 </component> 199 </component>
...@@ -172,40 +203,42 @@ ...@@ -172,40 +203,42 @@
172 <detection-done>true</detection-done> 203 <detection-done>true</detection-done>
173 <sorting>DEFINITION_ORDER</sorting> 204 <sorting>DEFINITION_ORDER</sorting>
174 </component> 205 </component>
175 <component name="NodePackageJsonFileManager"> 206 <component name="ProjectFrameBounds" extendedState="7">
176 <packageJsonPaths /> 207 <option name="x" value="118" />
177 </component> 208 <option name="y" value="24" />
178 <component name="ProjectFrameBounds" fullScreen="true">
179 <option name="x" value="38" />
180 <option name="y" value="23" />
181 <option name="width" value="1242" /> 209 <option name="width" value="1242" />
182 <option name="height" value="777" /> 210 <option name="height" value="744" />
183 </component> 211 </component>
184 <component name="ProjectView"> 212 <component name="ProjectView">
185 <navigator proportions="" version="1"> 213 <navigator proportions="" version="1">
186 <foldersAlwaysOnTop value="true" /> 214 <foldersAlwaysOnTop value="true" />
187 </navigator> 215 </navigator>
188 <panes> 216 <panes>
189 <pane id="Scope" />
190 <pane id="ProjectPane"> 217 <pane id="ProjectPane">
191 <subPane> 218 <subPane>
192 <expand> 219 <expand>
193 <path> 220 <path>
194 <item name="wxh5-1" type="b2602c69:ProjectViewProjectNode" /> 221 <item name="dy-wx2" type="b2602c69:ProjectViewProjectNode" />
195 <item name="wxh5-1" type="462c0819:PsiDirectoryNode" /> 222 <item name="dy-wx2" type="462c0819:PsiDirectoryNode" />
223 </path>
224 <path>
225 <item name="dy-wx2" type="b2602c69:ProjectViewProjectNode" />
226 <item name="dy-wx2" type="462c0819:PsiDirectoryNode" />
227 <item name="js" type="462c0819:PsiDirectoryNode" />
196 </path> 228 </path>
197 </expand> 229 </expand>
198 <select /> 230 <select />
199 </subPane> 231 </subPane>
200 </pane> 232 </pane>
233 <pane id="Scope" />
201 </panes> 234 </panes>
202 </component> 235 </component>
203 <component name="PropertiesComponent"> 236 <component name="PropertiesComponent">
237 <property name="HbShouldOpenHtmlAsHb" value="" />
238 <property name="WebServerToolWindowFactoryState" value="false" />
204 <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 239 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
205 <property name="settings.editor.selected.configurable" value="project.propDebugger" />
206 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 240 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
207 <property name="WebServerToolWindowFactoryState" value="false" /> 241 <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
208 <property name="HbShouldOpenHtmlAsHb" value="" />
209 </component> 242 </component>
210 <component name="RunDashboard"> 243 <component name="RunDashboard">
211 <option name="ruleStates"> 244 <option name="ruleStates">
...@@ -239,33 +272,35 @@ ...@@ -239,33 +272,35 @@
239 <workItem from="1534775785739" duration="19000" /> 272 <workItem from="1534775785739" duration="19000" />
240 <workItem from="1535166039526" duration="1376000" /> 273 <workItem from="1535166039526" duration="1376000" />
241 <workItem from="1535167752508" duration="31000" /> 274 <workItem from="1535167752508" duration="31000" />
275 <workItem from="1535472324604" duration="277000" />
276 <workItem from="1535473262552" duration="874000" />
277 <workItem from="1535474164804" duration="686000" />
242 </task> 278 </task>
243 <servers /> 279 <servers />
244 </component> 280 </component>
245 <component name="TimeTrackingManager"> 281 <component name="TimeTrackingManager">
246 <option name="totallyTimeSpent" value="27568000" /> 282 <option name="totallyTimeSpent" value="29405000" />
247 </component> 283 </component>
248 <component name="ToolWindowManager"> 284 <component name="ToolWindowManager">
249 <frame x="0" y="0" width="1280" height="800" extended-state="0" /> 285 <frame x="-1" y="-11" width="1368" height="780" extended-state="6" />
250 <editor active="true" />
251 <layout> 286 <layout>
252 <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12946783" /> 287 <window_info content_ui="combo" id="Project" order="0" sideWeight="0.788501" visible="true" weight="0.18215613" />
253 <window_info anchor="bottom" id="TODO" order="6" /> 288 <window_info id="Structure" order="1" sideWeight="0.21149898" side_tool="true" visible="true" weight="0.18215613" />
254 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
255 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
256 <window_info anchor="bottom" id="Version Control" order="7" weight="0.32936078" />
257 <window_info anchor="bottom" id="Run" order="2" />
258 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
259 <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.30620688" />
260 <window_info id="Favorites" order="2" side_tool="true" /> 289 <window_info id="Favorites" order="2" side_tool="true" />
290 <window_info anchor="bottom" id="Message" order="0" />
291 <window_info anchor="bottom" id="Find" order="1" />
292 <window_info anchor="bottom" id="Run" order="2" />
261 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> 293 <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
262 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 294 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
263 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 295 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
296 <window_info anchor="bottom" id="TODO" order="6" />
297 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
298 <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.24961479" />
299 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
300 <window_info anchor="bottom" id="Version Control" order="10" weight="0.32819724" />
264 <window_info anchor="right" id="Commander" order="0" weight="0.4" /> 301 <window_info anchor="right" id="Commander" order="0" weight="0.4" />
265 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 302 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
266 <window_info anchor="bottom" id="Message" order="0" /> 303 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
267 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
268 <window_info anchor="bottom" id="Find" order="1" />
269 </layout> 304 </layout>
270 </component> 305 </component>
271 <component name="TypeScriptGeneratedFilesManager"> 306 <component name="TypeScriptGeneratedFilesManager">
...@@ -275,184 +310,6 @@ ...@@ -275,184 +310,6 @@
275 <option name="myLimit" value="2678400000" /> 310 <option name="myLimit" value="2678400000" />
276 </component> 311 </component>
277 <component name="editorHistoryManager"> 312 <component name="editorHistoryManager">
278 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
279 <provider selected="true" editor-type-id="text-editor">
280 <state relative-caret-position="437">
281 <caret line="23" column="6" lean-forward="true" selection-start-line="23" selection-start-column="6" selection-end-line="23" selection-end-column="6" />
282 </state>
283 </provider>
284 </entry>
285 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
286 <provider selected="true" editor-type-id="text-editor">
287 <state relative-caret-position="475">
288 <caret line="25" column="30" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
289 </state>
290 </provider>
291 </entry>
292 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
293 <provider selected="true" editor-type-id="text-editor">
294 <state relative-caret-position="190">
295 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
296 </state>
297 </provider>
298 </entry>
299 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
300 <provider selected="true" editor-type-id="text-editor">
301 <state relative-caret-position="570">
302 <caret line="30" column="26" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
303 </state>
304 </provider>
305 </entry>
306 <entry file="file://$PROJECT_DIR$/index.html">
307 <provider selected="true" editor-type-id="text-editor">
308 <state relative-caret-position="1710">
309 <caret line="90" column="34" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
310 </state>
311 </provider>
312 </entry>
313 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
314 <provider selected="true" editor-type-id="text-editor">
315 <state relative-caret-position="323">
316 <caret line="17" column="44" selection-start-line="17" selection-start-column="36" selection-end-line="17" selection-end-column="44" />
317 </state>
318 </provider>
319 </entry>
320 <entry file="file://$PROJECT_DIR$/js/app.js">
321 <provider selected="true" editor-type-id="text-editor">
322 <state relative-caret-position="266">
323 <caret line="14" column="27" lean-forward="true" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="27" />
324 </state>
325 </provider>
326 </entry>
327 <entry file="file://$PROJECT_DIR$/js/controller/mainController.js">
328 <provider selected="true" editor-type-id="text-editor">
329 <state relative-caret-position="1976">
330 <caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
331 </state>
332 </provider>
333 </entry>
334 <entry file="file://$PROJECT_DIR$/js/controller/mapController.js">
335 <provider selected="true" editor-type-id="text-editor">
336 <state relative-caret-position="722">
337 <caret line="38" column="12" lean-forward="true" selection-start-line="38" selection-start-column="12" selection-end-line="38" selection-end-column="12" />
338 </state>
339 </provider>
340 </entry>
341 <entry file="file://$PROJECT_DIR$/css/app.css">
342 <provider selected="true" editor-type-id="text-editor">
343 <state relative-caret-position="13262">
344 <caret line="698" column="28" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
345 </state>
346 </provider>
347 </entry>
348 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
349 <provider selected="true" editor-type-id="text-editor">
350 <state relative-caret-position="1463">
351 <caret line="117" column="40" lean-forward="true" selection-start-line="117" selection-start-column="40" selection-end-line="117" selection-end-column="40" />
352 </state>
353 </provider>
354 </entry>
355 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
356 <provider selected="true" editor-type-id="text-editor">
357 <state relative-caret-position="38">
358 <caret line="2" column="101" lean-forward="true" selection-start-line="2" selection-start-column="101" selection-end-line="2" selection-end-column="101" />
359 </state>
360 </provider>
361 </entry>
362 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
363 <provider selected="true" editor-type-id="text-editor">
364 <state relative-caret-position="475">
365 <caret line="25" column="30" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="30" />
366 </state>
367 </provider>
368 </entry>
369 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
370 <provider selected="true" editor-type-id="text-editor">
371 <state relative-caret-position="779">
372 <caret line="41" column="72" lean-forward="true" selection-start-line="41" selection-start-column="72" selection-end-line="41" selection-end-column="72" />
373 </state>
374 </provider>
375 </entry>
376 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
377 <provider selected="true" editor-type-id="text-editor">
378 <state relative-caret-position="1083">
379 <caret line="97" column="23" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
380 </state>
381 </provider>
382 </entry>
383 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
384 <provider selected="true" editor-type-id="text-editor">
385 <state relative-caret-position="190">
386 <caret line="10" column="19" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="19" />
387 </state>
388 </provider>
389 </entry>
390 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
391 <provider selected="true" editor-type-id="text-editor">
392 <state relative-caret-position="570">
393 <caret line="30" column="26" selection-start-line="30" selection-start-column="19" selection-end-line="30" selection-end-column="26" />
394 </state>
395 </provider>
396 </entry>
397 <entry file="file://$PROJECT_DIR$/index.html">
398 <provider selected="true" editor-type-id="text-editor">
399 <state relative-caret-position="1710">
400 <caret line="90" column="34" lean-forward="true" selection-start-line="90" selection-start-column="34" selection-end-line="90" selection-end-column="34" />
401 </state>
402 </provider>
403 </entry>
404 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
405 <provider selected="true" editor-type-id="text-editor">
406 <state relative-caret-position="380">
407 <caret line="20" column="34" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
408 </state>
409 </provider>
410 </entry>
411 <entry file="file://$PROJECT_DIR$/css/app.css">
412 <provider selected="true" editor-type-id="text-editor">
413 <state relative-caret-position="13262">
414 <caret line="698" column="28" selection-start-line="698" selection-start-column="22" selection-end-line="698" selection-end-column="28" />
415 </state>
416 </provider>
417 </entry>
418 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
419 <provider selected="true" editor-type-id="text-editor">
420 <state relative-caret-position="646">
421 <caret line="34" column="96" lean-forward="true" selection-start-line="34" selection-start-column="31" selection-end-line="34" selection-end-column="96" />
422 </state>
423 </provider>
424 </entry>
425 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
426 <provider selected="true" editor-type-id="text-editor">
427 <state relative-caret-position="95">
428 <caret line="5" column="83" selection-start-line="5" selection-start-column="73" selection-end-line="5" selection-end-column="83" />
429 </state>
430 </provider>
431 </entry>
432 <entry file="file://$PROJECT_DIR$/css/app.css">
433 <provider selected="true" editor-type-id="text-editor">
434 <state relative-caret-position="19380">
435 <caret line="1020" column="24" lean-forward="true" selection-start-line="1020" selection-start-column="24" selection-end-line="1020" selection-end-column="24" />
436 </state>
437 </provider>
438 </entry>
439 <entry file="file://$PROJECT_DIR$/js/controller/bondPayController.js">
440 <provider selected="true" editor-type-id="text-editor" />
441 </entry>
442 <entry file="file://$PROJECT_DIR$/index.html">
443 <provider selected="true" editor-type-id="text-editor">
444 <state relative-caret-position="1653">
445 <caret line="87" column="7" lean-forward="true" selection-start-line="87" selection-start-column="7" selection-end-line="87" selection-end-column="7" />
446 </state>
447 </provider>
448 </entry>
449 <entry file="file://$PROJECT_DIR$/js/controller/bondController.js">
450 <provider selected="true" editor-type-id="text-editor">
451 <state relative-caret-position="342">
452 <caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" />
453 </state>
454 </provider>
455 </entry>
456 <entry file="file://$PROJECT_DIR$/html/pay.html"> 313 <entry file="file://$PROJECT_DIR$/html/pay.html">
457 <provider selected="true" editor-type-id="text-editor" /> 314 <provider selected="true" editor-type-id="text-editor" />
458 </entry> 315 </entry>
...@@ -522,13 +379,6 @@ ...@@ -522,13 +379,6 @@
522 </state> 379 </state>
523 </provider> 380 </provider>
524 </entry> 381 </entry>
525 <entry file="file://$PROJECT_DIR$/js/JSBridge.js">
526 <provider selected="true" editor-type-id="text-editor">
527 <state relative-caret-position="684">
528 <caret line="36" column="25" selection-start-line="36" selection-start-column="25" selection-end-line="36" selection-end-column="25" />
529 </state>
530 </provider>
531 </entry>
532 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js"> 382 <entry file="file://$PROJECT_DIR$/js/service/wechatPaymentService.js">
533 <provider selected="true" editor-type-id="text-editor"> 383 <provider selected="true" editor-type-id="text-editor">
534 <state relative-caret-position="2625"> 384 <state relative-caret-position="2625">
...@@ -543,76 +393,83 @@ ...@@ -543,76 +393,83 @@
543 </state> 393 </state>
544 </provider> 394 </provider>
545 </entry> 395 </entry>
546 <entry file="file://$PROJECT_DIR$/html/tripDetail.html"> 396 <entry file="file://$PROJECT_DIR$/build.sh">
547 <provider selected="true" editor-type-id="text-editor"> 397 <provider selected="true" editor-type-id="text-editor">
548 <state relative-caret-position="540"> 398 <state>
549 <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" /> 399 <caret column="3" selection-start-column="3" selection-end-column="3" />
550 </state> 400 </state>
551 </provider> 401 </provider>
552 </entry> 402 </entry>
553 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js"> 403 <entry file="file://$PROJECT_DIR$/.gitignore">
554 <provider selected="true" editor-type-id="text-editor"> 404 <provider selected="true" editor-type-id="text-editor">
555 <state relative-caret-position="450"> 405 <state relative-caret-position="15">
556 <caret line="30" column="33" lean-forward="true" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" /> 406 <caret line="1" column="5" lean-forward="true" selection-start-line="1" selection-start-column="5" selection-end-line="1" selection-end-column="5" />
557 </state> 407 </state>
558 </provider> 408 </provider>
559 </entry> 409 </entry>
560 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js"> 410 <entry file="file://$PROJECT_DIR$/js/service/globalService.js">
561 <provider selected="true" editor-type-id="text-editor"> 411 <provider selected="true" editor-type-id="text-editor">
562 <state relative-caret-position="2070"> 412 <state relative-caret-position="468">
563 <caret line="138" column="18" lean-forward="true" selection-start-line="138" selection-start-column="18" selection-end-line="138" selection-end-column="18" /> 413 <caret line="39" column="43" selection-start-line="39" selection-start-column="43" selection-end-line="39" selection-end-column="43" />
564 </state> 414 </state>
565 </provider> 415 </provider>
566 </entry> 416 </entry>
567 <entry file="file://$PROJECT_DIR$/js/service/globalService.js"> 417 <entry file="file://$PROJECT_DIR$/js/controller/tripDetailController.js">
568 <provider selected="true" editor-type-id="text-editor"> 418 <provider selected="true" editor-type-id="text-editor">
569 <state relative-caret-position="570"> 419 <state relative-caret-position="360">
570 <caret line="38" column="43" selection-start-line="38" selection-start-column="43" selection-end-line="38" selection-end-column="43" /> 420 <caret line="30" column="33" selection-start-line="30" selection-start-column="33" selection-end-line="30" selection-end-column="33" />
571 </state> 421 </state>
572 </provider> 422 </provider>
573 </entry> 423 </entry>
574 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js"> 424 <entry file="file://$PROJECT_DIR$/html/tripDetail.html">
575 <provider selected="true" editor-type-id="text-editor"> 425 <provider selected="true" editor-type-id="text-editor">
576 <state relative-caret-position="870"> 426 <state relative-caret-position="432">
577 <caret line="58" column="50" selection-start-line="58" selection-start-column="50" selection-end-line="58" selection-end-column="50" /> 427 <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
578 </state> 428 </state>
579 </provider> 429 </provider>
580 </entry> 430 </entry>
581 <entry file="file://$PROJECT_DIR$/html/bondPay.html"> 431 <entry file="file://$PROJECT_DIR$/index.html">
582 <provider selected="true" editor-type-id="text-editor"> 432 <provider selected="true" editor-type-id="text-editor">
583 <state relative-caret-position="183"> 433 <state relative-caret-position="96">
584 <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" /> 434 <caret line="8" column="52" selection-start-line="8" selection-start-column="52" selection-end-line="8" selection-end-column="52" />
435 </state>
436 </provider>
437 </entry>
438 <entry file="file://$PROJECT_DIR$/contactUs.html">
439 <provider selected="true" editor-type-id="text-editor">
440 <state relative-caret-position="144">
441 <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
585 </state> 442 </state>
586 </provider> 443 </provider>
587 </entry> 444 </entry>
588 <entry file="file://$PROJECT_DIR$/index.html.bak"> 445 <entry file="file://$PROJECT_DIR$/index.html.bak">
589 <provider selected="true" editor-type-id="text-editor" /> 446 <provider selected="true" editor-type-id="text-editor" />
590 </entry> 447 </entry>
591 <entry file="file://$PROJECT_DIR$/index.html"> 448 <entry file="file://$PROJECT_DIR$/js/service/dingdaService.js">
592 <provider selected="true" editor-type-id="text-editor"> 449 <provider selected="true" editor-type-id="text-editor">
593 <state relative-caret-position="180"> 450 <state relative-caret-position="180">
594 <caret line="12" column="34" selection-start-line="12" selection-start-column="34" selection-end-line="12" selection-end-column="34" /> 451 <caret line="15" column="24" lean-forward="true" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
595 </state> 452 </state>
596 </provider> 453 </provider>
597 </entry> 454 </entry>
598 <entry file="file://$PROJECT_DIR$/build.sh"> 455 <entry file="file://$PROJECT_DIR$/html/bondPay.html">
599 <provider selected="true" editor-type-id="text-editor"> 456 <provider selected="true" editor-type-id="text-editor">
600 <state> 457 <state relative-caret-position="108">
601 <caret column="3" selection-start-column="3" selection-end-column="3" /> 458 <caret line="9" selection-start-line="9" selection-end-line="9" />
602 </state> 459 </state>
603 </provider> 460 </provider>
604 </entry> 461 </entry>
605 <entry file="file://$PROJECT_DIR$/contactUs.html"> 462 <entry file="file://$PROJECT_DIR$/js/service/weixinConfig.js">
606 <provider selected="true" editor-type-id="text-editor"> 463 <provider selected="true" editor-type-id="text-editor">
607 <state relative-caret-position="180"> 464 <state relative-caret-position="696">
608 <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" /> 465 <caret line="58" column="50" selection-start-line="58" selection-start-column="50" selection-end-line="58" selection-end-column="50" />
609 </state> 466 </state>
610 </provider> 467 </provider>
611 </entry> 468 </entry>
612 <entry file="file://$PROJECT_DIR$/.gitignore"> 469 <entry file="file://$PROJECT_DIR$/js/JSBridge.js">
613 <provider selected="true" editor-type-id="text-editor"> 470 <provider selected="true" editor-type-id="text-editor">
614 <state> 471 <state relative-caret-position="204">
615 <caret column="7" selection-start-column="7" selection-end-column="7" /> 472 <caret line="86" column="29" lean-forward="true" selection-start-line="86" selection-start-column="29" selection-end-line="86" selection-end-column="29" />
616 </state> 473 </state>
617 </provider> 474 </provider>
618 </entry> 475 </entry>
......
js/JSBridge.js
...@@ -82,11 +82,15 @@ AppClient.prototype.getGPS = function (callbackName, callback, jsonStr) { ...@@ -82,11 +82,15 @@ AppClient.prototype.getGPS = function (callbackName, callback, jsonStr) {
82 // time: 10 82 // time: 10
83 // }); 83 // });
84 // } 84 // }
85 var appClient = null; 85 var appClient = new AppClient(window.android, true);
86 layer.open({ 86 layer.open({
87 content: window.android, 87 content: window.android,
88 time: 2 88 time: 2
89 }) 89 })
90 layer.open({
91 content: JSON.stringify(window) ,
92 time: 2
93 })
90 if(window.android) { 94 if(window.android) {
91 appClient = new AppClient(window.android, true); 95 appClient = new AppClient(window.android, true);
92 // 此处可以调用一些init的方法 96 // 此处可以调用一些init的方法
...@@ -106,5 +110,3 @@ if(window.android) { ...@@ -106,5 +110,3 @@ if(window.android) {
106 // 此处可以调用一些init的方法 110 // 此处可以调用一些init的方法
107 }); 111 });
108 } 112 }
109
110
......
wechat @ efa7b46b
1 Subproject commit efa7b46b5ba06587588536145356c18345036f63
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!