Skip to content

M
manager-app-sz
提交 f2267d2b authored 作者: 吴强's avatar 吴强
浏览文件
操作

Merge branch 'master' of git://192.168.1.116/bolan-root/frontend/manager-app-sz into wq

# Conflicts: # src/models/login.js # src/routes/login.js
上级 3409ef6e 3c365f1a
隐藏空白字符变更
内嵌 并排
正在显示 包含 112 行增加 和 484 行删除
android/.idea/libraries/AraBMApiDev.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="AraBMApiDev">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/AraBMApiDev.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/AraBMApiFp.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="AraBMApiFp">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/AraBMApiFp.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/HSProtAPI.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="HSProtAPI">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/HSProtAPI.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/android_jsc_r174650.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="android-jsc-r174650">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/23128fa822f44f3a89ab1640aef81b3e155d63aa/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/23128fa822f44f3a89ab1640aef81b3e155d63aa/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/animated_vector_drawable_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="animated-vector-drawable-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/0238b4a169a04b880f15c9fff5a1a4f154f56cb3/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/0238b4a169a04b880f15c9fff5a1a4f154f56cb3/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/25.3.1/animated-vector-drawable-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/appcompat_v7_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="appcompat-v7-25.3.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/31ee92deea67d1108abac79ec733820163b714dc/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/31ee92deea67d1108abac79ec733820163b714dc/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/25.3.1/appcompat-v7-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/bolts_tasks_1_4_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="bolts-tasks-1.4.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.parse.bolts/bolts-tasks/1.4.0/d85884acf6810a3bbbecb587f239005cbc846dc4/bolts-tasks-1.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.parse.bolts/bolts-tasks/1.4.0/a523a9722ec97e8fc4f015dd50c98cdda8029ba4/bolts-tasks-1.4.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/classes.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="classes">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/drawee_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="drawee-1.0.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/7d87ef02d7ebcc14d95743a2ac759c0dad26b8d6/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/7d87ef02d7ebcc14d95743a2ac759c0dad26b8d6/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fresco/drawee/1.0.1/f1a442af599f57d8effbb3f07a5f8c8f513cbece/drawee-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/fbcore_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="fbcore-1.0.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/5b265809d44cda290fb45e966a88abf24d475e72/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/5b265809d44cda290fb45e966a88abf24d475e72/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fresco/fbcore/1.0.1/6847a62d0da3127b26ae44e32a1bd4c98c2554ec/fbcore-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/fresco_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="fresco-1.0.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/9d63b956f5f8a98f706988533114f927728e7300/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/9d63b956f5f8a98f706988533114f927728e7300/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fresco/fresco/1.0.1/f1c1758927ed489f474cd0d39aed4a999c6588d/fresco-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/gson_2_2_4.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="gson-2.2.4">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/gson-2.2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/app/libs/gson-2.2.4-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/gson_2_2_4_javadoc.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="gson-2.2.4-javadoc">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/gson-2.2.4-javadoc.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/gson_2_2_4_sources.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="gson-2.2.4-sources">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/gson-2.2.4-sources.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/imagepipeline_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="imagepipeline-1.0.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/9d01a18188db6b4cbf43fb2ed6848084c4d68b8d/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/9d01a18188db6b4cbf43fb2ed6848084c4d68b8d/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fresco/imagepipeline/1.0.1/6b7938b9810e73be111101ee184e01b2a4ec59c5/imagepipeline-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/imagepipeline_base_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="imagepipeline-base-1.0.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/5bb2c7b0b61bef2eb82713d39df0f13e834953b5/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/5bb2c7b0b61bef2eb82713d39df0f13e834953b5/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fresco/imagepipeline-base/1.0.1/e83610a54320cf1b967d3224b293cd0d9c193272/imagepipeline-base-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/imagepipeline_okhttp3_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="imagepipeline-okhttp3-1.0.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/015eff4ca38aeeb49c219ea6bc8c5bba2f058875/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/015eff4ca38aeeb49c219ea6bc8c5bba2f058875/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fresco/imagepipeline-okhttp3/1.0.1/f97ea7dcfc5ab2a48d0dab2dd977534c800d751a/imagepipeline-okhttp3-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/javax_inject_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="javax.inject-1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/a00123f261762a7c5e0ec916a2c7c8298d29c400/javax.inject-1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/jsr305_3_0_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="jsr305-3.0.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.0/5871fb60dc68d67da54a663c3fd636a10a532948/jsr305-3.0.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.0/936f4430478909ed7b138d42f9ad73c919a87b26/jsr305-3.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/jxl.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="jxl">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/jxl.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/ksoap2_android_assembly_3_0_0_jar_with_dependencies.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="ksoap2-android-assembly-3.0.0-jar-with-dependencies">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/ksoap2-android-assembly-3.0.0-jar-with-dependencies.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/multidex_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="multidex-1.0.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/6fbd1f5dc9916b4c3ff8494113bad3c8bb97bb1b/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/6fbd1f5dc9916b4c3ff8494113bad3c8bb97bb1b/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/multidex_instrumentation_1_0_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="multidex-instrumentation-1.0.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/b44a180423a267694aa691352c13f106ac783d2e/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/b44a180423a267694aa691352c13f106ac783d2e/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/okhttp_3_6_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="okhttp-3.6.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.6.0/69edde9fc4b01c9fd51d25b83428837478c27254/okhttp-3.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.6.0/7ebc06b0cc7c2752a4883747e2c70b2b301df9c0/okhttp-3.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/okhttp_urlconnection_3_6_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="okhttp-urlconnection-3.6.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp-urlconnection/3.6.0/3f9b16b774f2c36cfd86dd2053d0b3059531dacc/okhttp-urlconnection-3.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp-urlconnection/3.6.0/7eb6b2ca9b951e57e0055d5516087b178a4ef2c6/okhttp-urlconnection-3.6.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/okio_1_13_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="okio-1.13.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/f4c91e12121af963e3ef76e81c82aa75ba6e8533/okio-1.13.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/react_native_0_47_2.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="react-native-0.47.2">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/eaad07402c45659bc93566be731955d203fce538/output/jars/classes.jar!/" />
<root url="jar://$USER_HOME$/.android/build-cache/eaad07402c45659bc93566be731955d203fce538/output/jars/libs/infer-annotations-4.0.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/eaad07402c45659bc93566be731955d203fce538/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../node_modules/react-native/android/com/facebook/react/react-native/0.47.2/react-native-0.47.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/soloader_0_1_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="soloader-0.1.0">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/40e964c0aca95ca8dc368d4351482ca5466992c3/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/40e964c0aca95ca8dc368d4351482ca5466992c3/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.soloader/soloader/0.1.0/623f1bdebb31063ff52c131f38031f8f479da1c/soloader-0.1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/staticlayout_proxy_1_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="staticlayout-proxy-1.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fbui.textlayoutbuilder/staticlayout-proxy/1.0/f162442a19fff13995fbd51ba414d9ee05579080/staticlayout-proxy-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fbui.textlayoutbuilder/staticlayout-proxy/1.0/a92cf8aa8826f09a3c8c3b83b4005de77d81e959/staticlayout-proxy-1.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_annotations_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-annotations-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/25.3.1/support-annotations-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_compat_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-compat-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/2e5ff4df6cc7281a51d6903a548bb89f94b446ec/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/2e5ff4df6cc7281a51d6903a548bb89f94b446ec/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-compat/25.3.1/support-compat-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_core_ui_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-core-ui-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/f38acc8820286a625dffdb1da780cc5dd9d4fc95/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/f38acc8820286a625dffdb1da780cc5dd9d4fc95/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-core-ui/25.3.1/support-core-ui-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_core_utils_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-core-utils-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/e1b623b5c29cb0ac3c8f852808d123d24388195a/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/e1b623b5c29cb0ac3c8f852808d123d24388195a/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-core-utils/25.3.1/support-core-utils-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_fragment_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-fragment-25.3.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/5fce9847baf5705e0bc4c141ad8716b1d7603ec0/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/5fce9847baf5705e0bc4c141ad8716b1d7603ec0/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-fragment/25.3.1/support-fragment-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_media_compat_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-media-compat-25.3.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/f0bd16e307ea35de98d85a88c93b645f207ac36d/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/f0bd16e307ea35de98d85a88c93b645f207ac36d/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-media-compat/25.3.1/support-media-compat-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_v4_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-v4-25.3.1">
<CLASSES>
<root url="file://$USER_HOME$/.android/build-cache/3ccd5ce5b70c3e2462eaabf081f403dddbc98508/output/res" />
<root url="jar://$USER_HOME$/.android/build-cache/3ccd5ce5b70c3e2462eaabf081f403dddbc98508/output/jars/classes.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
android/.idea/libraries/support_vector_drawable_25_3_1.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="support-vector-drawable-25.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/1032e90f4fdfb1fcc4683d794e67d80686d6556b/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/1032e90f4fdfb1fcc4683d794e67d80686d6556b/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/25.3.1/support-vector-drawable-25.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/.idea/libraries/textlayoutbuilder_1_0_0.xml deleted 100644 → 0
浏览文件 @ 3409ef6e
<component name="libraryTable">
<library name="textlayoutbuilder-1.0.0">
<CLASSES>
<root url="jar://$USER_HOME$/.android/build-cache/0ec10e5efa4895652da8171d78c4dbf1c74fcbbd/output/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.android/build-cache/0ec10e5efa4895652da8171d78c4dbf1c74fcbbd/output/res" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.fbui.textlayoutbuilder/textlayoutbuilder/1.0.0/da40cc65e58f31104c21ec757d2c356b6de54ac3/textlayoutbuilder-1.0.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
android/app/build.gradle
浏览文件 @ f2267d2b
......@@ -138,6 +138,7 @@ android {
}
dependencies {
compile project(':react-native-device-info')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:25.3.1"
compile 'com.android.support:multidex:1.0.1'
......
android/app/src/main/AndroidManifest.xml
浏览文件 @ f2267d2b
......@@ -5,6 +5,8 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-sdk
android:minSdkVersion="16"
......
android/app/src/main/java/com/bolanmanagerapp/MainApplication.java
浏览文件 @ f2267d2b
......@@ -6,6 +6,7 @@ import android.support.multidex.MultiDex;
import com.bolan.android.modules.IDCardReactPackage;
import com.facebook.react.ReactApplication;
import com.learnium.RNDeviceInfo.RNDeviceInfo;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
......@@ -26,6 +27,7 @@ public class MainApplication extends Application implements ReactApplication {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new RNDeviceInfo(),
new IDCardReactPackage()
);
}
......
android/settings.gradle
浏览文件 @ f2267d2b
rootProject.name = 'bolanManagerApp'
include ':react-native-device-info'
project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
include ':app'
ios/bolanManagerApp.xcodeproj/project.pbxproj
浏览文件 @ f2267d2b
......@@ -5,7 +5,6 @@
};
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
......@@ -37,6 +36,8 @@
5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; };
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; };
07BDEFA20656470B88D48554 /* libRNDeviceInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DADBDDA7F504C5193847D2D /* libRNDeviceInfo.a */; };
53E9F8ADCC714D9693F0C068 /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83554850969D48C684F45F7F /* libRNDeviceInfo-tvOS.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -264,6 +265,9 @@
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = "<group>"; };
20C53C1323F44CCBB35F0247 /* RNDeviceInfo.xcodeproj */ = {isa = PBXFileReference; name = "RNDeviceInfo.xcodeproj"; path = "../node_modules/react-native-device-info/RNDeviceInfo.xcodeproj"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; };
4DADBDDA7F504C5193847D2D /* libRNDeviceInfo.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo.a"; path = "libRNDeviceInfo.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
83554850969D48C684F45F7F /* libRNDeviceInfo-tvOS.a */ = {isa = PBXFileReference; name = "libRNDeviceInfo-tvOS.a"; path = "libRNDeviceInfo-tvOS.a"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -292,6 +296,8 @@
832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
07BDEFA20656470B88D48554 /* libRNDeviceInfo.a in Frameworks */,
53E9F8ADCC714D9693F0C068 /* libRNDeviceInfo-tvOS.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -460,6 +466,7 @@
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */,
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
20C53C1323F44CCBB35F0247 /* RNDeviceInfo.xcodeproj */,
);
name = Libraries;
sourceTree = "<group>";
......@@ -586,7 +593,7 @@
83CBB9F71A601CBA00E9B192 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0610;
LastUpgradeCheck = 610;
ORGANIZATIONNAME = Facebook;
TargetAttributes = {
00E356ED1AD99517003FC87E = {
......@@ -1005,6 +1012,15 @@
);
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bolanManagerApp.app/bolanManagerApp";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
};
name = Debug;
};
......@@ -1022,6 +1038,15 @@
);
PRODUCT_NAME = "$(TARGET_NAME)";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bolanManagerApp.app/bolanManagerApp";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
};
name = Release;
};
......@@ -1040,6 +1065,10 @@
);
PRODUCT_NAME = bolanManagerApp;
VERSIONING_SYSTEM = "apple-generic";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
};
name = Debug;
};
......@@ -1057,6 +1086,10 @@
);
PRODUCT_NAME = bolanManagerApp;
VERSIONING_SYSTEM = "apple-generic";
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
};
name = Release;
};
......@@ -1083,6 +1116,15 @@
SDKROOT = appletvos;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.2;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
};
name = Debug;
};
......@@ -1109,6 +1151,15 @@
SDKROOT = appletvos;
TARGETED_DEVICE_FAMILY = 3;
TVOS_DEPLOYMENT_TARGET = 9.2;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/../node_modules/react-native-device-info/RNDeviceInfo",
);
};
name = Release;
};
......@@ -1130,6 +1181,11 @@
SDKROOT = appletvos;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bolanManagerApp-tvOS.app/bolanManagerApp-tvOS";
TVOS_DEPLOYMENT_TARGET = 10.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
};
name = Debug;
};
......@@ -1151,6 +1207,11 @@
SDKROOT = appletvos;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/bolanManagerApp-tvOS.app/bolanManagerApp-tvOS";
TVOS_DEPLOYMENT_TARGET = 10.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
"\"$(SRCROOT)/$(TARGET_NAME)\"",
);
};
name = Release;
};
......
package.json
浏览文件 @ f2267d2b
......@@ -38,8 +38,10 @@
"fastjson_ref_resolver": "0.0.3",
"lodash": "latest",
"moment": "^2.19.1",
"rc-form": "^1.4.8",
"react": "^16.0.0-beta.5",
"react-native": "^0.49.3",
"react-native-device-info": "^0.12.1",
"react-navigation": "^1.0.0-beta.14",
"react-redux": "^5.0.6",
"redux-persist": "^4.10.1"
......
src/services/login.js
浏览文件 @ f2267d2b
import Fingerprint from 'fingerprintjs';
import DeviceInfo from 'react-native-device-info';
import post from '../utils/post';
import request from '../utils/request';
import config from '../utils/config';
......@@ -19,8 +19,8 @@ export async function login(payload) {
};
}
data.tokenInfo = {
productId: 'big-machine-web-front',
deviceId: `${new Fingerprint({ ie_activex: true }).get()}`,
productId: config.productId,
deviceId: `${DeviceInfo.getUniqueID()}`,
};
return post(`${config.apiContextPath}/api/auth/login`, data, {}, {}, false);
}
......
src/utils/auth.js
浏览文件 @ f2267d2b
......@@ -2,52 +2,52 @@
* Created by yaohx_169 on 2017/6/8.
*/
import { cookie } from './config';
import { AsyncStorage } from 'react-native';
import store from './store';
export async function getToken() {
return AsyncStorage.getItem(cookie.token);
return store.getItem(cookie.token);
}
export async function setToken(token) {
return AsyncStorage.setItem(cookie.token, token);
return store.setItem(cookie.token, token);
}
export async function delToken() {
return AsyncStorage.removeItem(cookie.token);
return store.removeItem(cookie.token);
}
export async function getUser() {
return {
id: await AsyncStorage.getItem(cookie.userId),
name: await AsyncStorage.getItem(cookie.userName),
id: await store.getItem(cookie.userId),
name: await store.getItem(cookie.userName),
};
}
export async function setUser(id, name) {
await AsyncStorage.setItem(cookie.userId, id);
await AsyncStorage.setItem(cookie.userName, name);
await store.setItem(cookie.userId, id);
await store.setItem(cookie.userName, name);
}
export async function delUser() {
await AsyncStorage.removeItem(cookie.userId);
await AsyncStorage.removeItem(cookie.userName);
await store.removeItem(cookie.userId);
await store.removeItem(cookie.userName);
}
export async function getDomain() {
return {
name: await AsyncStorage.getItem(cookie.domainName),
path: await AsyncStorage.getItem(cookie.domainPath),
name: await store.getItem(cookie.domainName),
path: await store.getItem(cookie.domainPath),
};
}
export async function setDomain(name, path) {
await AsyncStorage.setItem(cookie.domainName, name);
await AsyncStorage.setItem(cookie.domainPath, path);
await store.setItem(cookie.domainName, name);
await store.setItem(cookie.domainPath, path);
}
export async function delDomain() {
await AsyncStorage.removeItem(cookie.domainName);
await AsyncStorage.removeItem(cookie.domainPath);
await store.removeItem(cookie.domainName);
await store.removeItem(cookie.domainPath);
}
export async function isAuthed() {
......
src/utils/config.js
浏览文件 @ f2267d2b
......@@ -41,6 +41,7 @@ const _contextPath = process.env.NODE_ENV === 'development' ? '' : contextPath;
const config = {
name: 'Jbpm Demo',
productId: 'manager-app-sz',
footerText: '上海铂蓝信息科技有限公司',
logo: `${_contextPath}/logo.png`,
contextPath: _contextPath,
......
src/utils/http-helper.js
浏览文件 @ f2267d2b
......@@ -86,15 +86,6 @@ export function parseObject(response, {
throw new Error(json.message);
}
});
} else if (contentType.indexOf('xml') !== -1) {
return response.text().then((text) => {
return require.ensure([], (require) => {
const { parseString } = require('xml2js');
const options = {};
const json = JSON.parse(parseString(text, options));
return needMap ? mapValue(json) : json;
});
});
} else if (contentType.indexOf('text') !== -1) {
return response.text();
} else {
......
src/utils/store.js 0 → 100644
浏览文件 @ f2267d2b
import { AsyncStorage } from 'react-native';
export default {
async getItem(key) {
const item = await AsyncStorage.getItem(key);
if (item) {
return JSON.parse(item);
} else {
return null;
}
},
async setItem(key, value) {
const item = JSON.stringify(value);
return await AsyncStorage.setItem(key, item);
},
async delItem(key) {
return AsyncStorage.removeItem(key);
},
}
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论