whyclj
2019-10-19 557d97f3e284e2a1eaf33765bbf8bf53bb68e486
Merge branch 'hybird' of http://118.89.139.230:10101/r/hybirdApp into hybird
3个文件已修改
65 ■■■■ 已修改文件
platforms/android/android.iml 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/app/src/main/assets/www/pages/index/index.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
www/pages/index/index.js 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
platforms/android/android.iml
@@ -1,19 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="java-gradle" name="Java-Gradle">
      <configuration>
        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
        <option name="BUILDABLE" value="false" />
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="java-gradle" name="Java-Gradle">
      <configuration>
        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
        <option name="BUILDABLE" value="false" />
      </configuration>
    </facet>
  </component>
  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
      <excludeFolder url="file://$MODULE_DIR$/build" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
</module>
platforms/android/app/src/main/assets/www/pages/index/index.js
@@ -13,7 +13,6 @@
        // 设置页面中的Worker线程(需要再workers.js先定义)
        setIpWorker = new Worker('worker/data.worker.js');
        getIpWorker = new Worker('worker/data.worker.js');
        testIpWorker = new Worker('worker/data.worker.js');
        // 引入vue
        this.vm = new Vue({
            el: getPageRoot(module),
@@ -22,7 +21,6 @@
                ip: '127.0.0.1',
                setIpWorker: setIpWorker,
                getIpWorker: getIpWorker,
                testIpWorker: testIpWorker,
            },
            methods: {
                routerTo: function routerTo(path) {
@@ -44,13 +42,6 @@
                setIp: function() {
                    if(typeof(JSInterface) != 'undefined') {
                        JSInterface.setUpDeviceIp(this.ip);
                    }else {
                        bui.alert('请使用手机端登陆!');
                    }
                },
                testIp: function() {
                    if(typeof(JSInterface) != 'undefined') {
                        JSInterface.testDeviceIp(this.ip);
                    }else {
                        bui.alert('请使用手机端登陆!');
                    }
@@ -83,11 +74,6 @@
                this.getIpWorker.onmessage = function(res) {
                    bui.alert(res.data);
                };
                // 测试Ip
                this.testIpWorker.onmessage = function(res) {
                    bui.alert(res.data);
                }
            },
            destroyed: function destroyed() {
                // 关闭获取IP的worker线程
www/pages/index/index.js
@@ -13,7 +13,6 @@
        // 设置页面中的Worker线程(需要再workers.js先定义)
        setIpWorker = new Worker('worker/data.worker.js');
        getIpWorker = new Worker('worker/data.worker.js');
        testIpWorker = new Worker('worker/data.worker.js');
        // 引入vue
        this.vm = new Vue({
            el: getPageRoot(module),
@@ -22,7 +21,6 @@
                ip: '127.0.0.1',
                setIpWorker: setIpWorker,
                getIpWorker: getIpWorker,
                testIpWorker: testIpWorker,
            },
            methods: {
                routerTo: function routerTo(path) {
@@ -44,13 +42,6 @@
                setIp: function() {
                    if(typeof(JSInterface) != 'undefined') {
                        JSInterface.setUpDeviceIp(this.ip);
                    }else {
                        bui.alert('请使用手机端登陆!');
                    }
                },
                testIp: function() {
                    if(typeof(JSInterface) != 'undefined') {
                        JSInterface.testDeviceIp(this.ip);
                    }else {
                        bui.alert('请使用手机端登陆!');
                    }
@@ -83,11 +74,6 @@
                this.getIpWorker.onmessage = function(res) {
                    bui.alert(res.data);
                };
                // 测试Ip
                this.testIpWorker.onmessage = function(res) {
                    bui.alert(res.data);
                }
            },
            destroyed: function destroyed() {
                // 关闭获取IP的worker线程