weizhengliang 3 vuotta sitten
vanhempi
commit
9cd2ca4224
100 muutettua tiedostoa jossa 8 lisäystä ja 61 poistoa
  1. 3 7
      .gitignore
  2. BIN
      .gradle/4.10.1/fileChanges/last-build.bin
  3. BIN
      .gradle/4.10.1/fileContent/fileContent.lock
  4. BIN
      .gradle/4.10.1/fileHashes/fileHashes.bin
  5. BIN
      .gradle/4.10.1/fileHashes/fileHashes.lock
  6. BIN
      .gradle/4.10.1/fileHashes/resourceHashesCache.bin
  7. 0 0
      .gradle/4.10.1/gc.properties
  8. BIN
      .gradle/4.10.1/javaCompile/classAnalysis.bin
  9. BIN
      .gradle/4.10.1/javaCompile/javaCompile.lock
  10. BIN
      .gradle/4.10.1/javaCompile/taskHistory.bin
  11. BIN
      .gradle/4.10.1/taskHistory/taskHistory.bin
  12. BIN
      .gradle/4.10.1/taskHistory/taskHistory.lock
  13. 0 0
      .gradle/vcs-1/gc.properties
  14. 0 0
      .gradle/vcsWorkingDirs/gc.properties
  15. 0 30
      .idea/gradle.xml
  16. 0 12
      .idea/runConfigurations.xml
  17. 0 6
      .idea/vcs.xml
  18. 4 5
      WebRTC/src/main/java/com/wdkl/core/consts/Urls.java
  19. 0 0
      app/.gitignore
  20. 0 0
      app/build.gradle
  21. 0 0
      app/proguard-rules.pro
  22. BIN
      app/release/app-release.apk
  23. BIN
      app/release/icu_visiting_v1.0.6_show_IP119_8006.apk
  24. BIN
      app/release/icu_visiting_v1.0.7_7_show_IP119_8006.apk
  25. BIN
      app/release/icu_visiting_v1.0.8_8_8inch_IP172.28.100.100.apk
  26. BIN
      app/release/icu_visiting_v1.0.8_8_show_IP119_8006.apk
  27. BIN
      app/release/icu_visiting_v1.0.9_9_13.3inch_IP172.28.100.100.apk
  28. BIN
      app/release/icu_visiting_v1.0.9_9_13.3inch_show_IP119_8006.apk
  29. 1 1
      app/release/output.json
  30. 0 0
      app/src/androidTest/java/com/enation/javashop/android/ExampleInstrumentedTest.java
  31. 0 0
      app/src/main/AndroidManifest.xml
  32. 0 0
      app/src/main/assets/config.wdkl
  33. 0 0
      app/src/main/code/com/wdkl/app/ncs/activity/SchemeActivity.kt
  34. 0 0
      app/src/main/code/com/wdkl/app/ncs/application/Application.kt
  35. 0 0
      app/src/main/res/layout/notification_lay.xml
  36. 0 0
      app/src/test/java/com/enation/javashop/android/ExampleUnitTest.java
  37. 0 0
      build.gradle
  38. 0 0
      common/.gitignore
  39. 0 0
      common/build.gradle
  40. 0 0
      common/libs/chinese2py.jar
  41. 0 0
      common/proguard-rules.pro
  42. 0 0
      common/src/androidTest/java/com/enation/javashop/android/lib/ExampleInstrumentedTest.java
  43. 0 0
      common/src/main/AndroidManifest.xml
  44. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/adapter/BaseDelegateAdapter.kt
  45. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/adapter/ListViewBaseAdapter.kt
  46. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/adapter/TextViewDelegateAdapter.kt
  47. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/adapter/VlayoutHolderAdapter.kt
  48. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/BaseActivity.kt
  49. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/BaseApplication.kt
  50. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/BaseContract.kt
  51. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/BaseControl.kt
  52. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/BaseFragment.kt
  53. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/BaseLaunch.kt
  54. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/DisposableManager.kt
  55. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/GalleryActivity.kt
  56. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/GalleryFragment.kt
  57. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/base/RxPresenter.kt
  58. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/bind/BaseBindingHelper.kt
  59. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/ActivityLifeController.kt
  60. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/Framework.kt
  61. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/InstallResourceHelper.kt
  62. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/JavaShopInstrumentationHook.java
  63. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/ResourceManager.java
  64. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/framework/UnInstallResourceHelper.kt
  65. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/hack/AndroidHack.kt
  66. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/runtime/ClassNotFoundInterceptor.kt
  67. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/runtime/JavaShopActivityTask.kt
  68. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/split/ComponentManager.kt
  69. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/core/split/ComponentManagerImpl.kt
  70. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/jni/CommonJNI.kt
  71. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/AppTool.kt
  72. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/AutoClearHelper.kt
  73. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/AutoClearValue.kt
  74. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/BaseRecyclerViewHolder.kt
  75. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/ChineseSortHelper.kt
  76. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/ConnectionObserver.kt
  77. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/ConnectionQualityMonitor.kt
  78. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/Do.kt
  79. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/EcodeHelper.kt
  80. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/ExtendMethods.kt
  81. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/GalleryHelper.kt
  82. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/ImageWatchLoader.kt
  83. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/JsonTranforHelper.kt
  84. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/MD5Util.kt
  85. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/NetReceiver.kt
  86. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/NoAlphaItemAnimator.kt
  87. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/OnClickListenerAntiViolence.kt
  88. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/OnItemClickListenerAntiViolence.kt
  89. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/RecycleViewScrollHelper.kt
  90. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/ReflexHelper.kt
  91. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/RegularHelper.kt
  92. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/RxExtra.kt
  93. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/SmartHideViewHelper.kt
  94. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/TangramPlugin.kt
  95. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/TimeEngine.kt
  96. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/TimeHandle.kt
  97. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/UUID.kt
  98. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/utils/VlayoutHelper.kt
  99. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/vo/MenuVo.kt
  100. 0 0
      common/src/main/code/com/wdkl/ncs/android/lib/vo/NetModel.kt

+ 3 - 7
.gitignore

@@ -5,11 +5,7 @@
 .DS_Store
 /build
 /captures
+/gradle
 .externalNativeBuild
-<<<<<<< HEAD
-.gradle/4.4/fileHashes/fileHashes.bin
-.gradle/4.4/fileHashes/fileHashes.lock
-=======
-.gradle
-.idea
->>>>>>> c9df07eda6e810c75f1abe78d37ee0c421bfcd04
+/.gradle
+/.idea

BIN
.gradle/4.10.1/fileChanges/last-build.bin


BIN
.gradle/4.10.1/fileContent/fileContent.lock


BIN
.gradle/4.10.1/fileHashes/fileHashes.bin


BIN
.gradle/4.10.1/fileHashes/fileHashes.lock


BIN
.gradle/4.10.1/fileHashes/resourceHashesCache.bin


+ 0 - 0
.gradle/4.10.1/gc.properties


BIN
.gradle/4.10.1/javaCompile/classAnalysis.bin


BIN
.gradle/4.10.1/javaCompile/javaCompile.lock


BIN
.gradle/4.10.1/javaCompile/taskHistory.bin


BIN
.gradle/4.10.1/taskHistory/taskHistory.bin


BIN
.gradle/4.10.1/taskHistory/taskHistory.lock


+ 0 - 0
.gradle/vcs-1/gc.properties


+ 0 - 0
.gradle/vcsWorkingDirs/gc.properties


+ 0 - 30
.idea/gradle.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/WebRTC" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/common" />
-            <option value="$PROJECT_DIR$/home" />
-            <option value="$PROJECT_DIR$/keepalive" />
-            <option value="$PROJECT_DIR$/libwebrtc" />
-            <option value="$PROJECT_DIR$/middleware" />
-            <option value="$PROJECT_DIR$/resource" />
-            <option value="$PROJECT_DIR$/rtc-chat" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
-      </GradleProjectSettings>
-    </option>
-    <option name="offlineMode" value="true" />
-  </component>
-</project>

+ 0 - 12
.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

+ 0 - 6
.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

+ 4 - 5
WebRTC/src/main/java/com/wdkl/core/consts/Urls.java

@@ -6,11 +6,10 @@ package com.wdkl.core.consts;
  */
 public class Urls {
 
-    //private final static String IP = "192.168.2.111";
-    //public final static String IP = "42.192.40.58:5000";
-//    public final static String IP = "172.28.100.100:5000";
-
-    public final static String IP = "120.76.246.253:5000";
+    //public final static String IP = "172.28.100.100:5000";
+    //public final static String IP = "120.76.246.253:5000";
+    //public final static String IP = "119.23.151.229:5000";
+    public final static String IP = "8.129.220.143:5000";
 
     private final static String HOST = "http://" + IP + "/";
 

+ 0 - 0
app/.gitignore


+ 0 - 0
app/build.gradle


+ 0 - 0
app/proguard-rules.pro


BIN
app/release/app-release.apk


BIN
app/release/icu_visiting_v1.0.6_show_IP119_8006.apk


BIN
app/release/icu_visiting_v1.0.7_7_show_IP119_8006.apk


BIN
app/release/icu_visiting_v1.0.8_8_8inch_IP172.28.100.100.apk


BIN
app/release/icu_visiting_v1.0.8_8_show_IP119_8006.apk


BIN
app/release/icu_visiting_v1.0.9_9_13.3inch_IP172.28.100.100.apk


BIN
app/release/icu_visiting_v1.0.9_9_13.3inch_show_IP119_8006.apk


+ 1 - 1
app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.wdkl.app.ncs.watch","split":"","minSdkVersion":"17"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":9},"path":"app-release.apk","properties":{"packageId":"com.wdkl.app.ncs.visiting","split":"","minSdkVersion":"22"}}]

+ 0 - 0
app/src/androidTest/java/com/enation/javashop/android/ExampleInstrumentedTest.java


+ 0 - 0
app/src/main/AndroidManifest.xml


+ 0 - 0
app/src/main/assets/config.wdkl


+ 0 - 0
app/src/main/code/com/wdkl/app/ncs/activity/SchemeActivity.kt


+ 0 - 0
app/src/main/code/com/wdkl/app/ncs/application/Application.kt


+ 0 - 0
app/src/main/res/layout/notification_lay.xml


+ 0 - 0
app/src/test/java/com/enation/javashop/android/ExampleUnitTest.java


+ 0 - 0
build.gradle


+ 0 - 0
common/.gitignore


+ 0 - 0
common/build.gradle


+ 0 - 0
common/libs/chinese2py.jar


+ 0 - 0
common/proguard-rules.pro


+ 0 - 0
common/src/androidTest/java/com/enation/javashop/android/lib/ExampleInstrumentedTest.java


+ 0 - 0
common/src/main/AndroidManifest.xml


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/adapter/BaseDelegateAdapter.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/adapter/ListViewBaseAdapter.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/adapter/TextViewDelegateAdapter.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/adapter/VlayoutHolderAdapter.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseActivity.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseApplication.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseContract.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseControl.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseFragment.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/BaseLaunch.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/DisposableManager.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/GalleryActivity.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/GalleryFragment.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/base/RxPresenter.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/bind/BaseBindingHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/ActivityLifeController.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/Framework.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/InstallResourceHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/JavaShopInstrumentationHook.java


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/ResourceManager.java


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/framework/UnInstallResourceHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/hack/AndroidHack.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/runtime/ClassNotFoundInterceptor.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/runtime/JavaShopActivityTask.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/split/ComponentManager.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/core/split/ComponentManagerImpl.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/jni/CommonJNI.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/AppTool.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/AutoClearHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/AutoClearValue.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/BaseRecyclerViewHolder.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/ChineseSortHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/ConnectionObserver.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/ConnectionQualityMonitor.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/Do.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/EcodeHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/ExtendMethods.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/GalleryHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/ImageWatchLoader.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/JsonTranforHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/MD5Util.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/NetReceiver.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/NoAlphaItemAnimator.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/OnClickListenerAntiViolence.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/OnItemClickListenerAntiViolence.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/RecycleViewScrollHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/ReflexHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/RegularHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/RxExtra.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/SmartHideViewHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/TangramPlugin.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/TimeEngine.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/TimeHandle.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/UUID.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/utils/VlayoutHelper.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/vo/MenuVo.kt


+ 0 - 0
common/src/main/code/com/wdkl/ncs/android/lib/vo/NetModel.kt


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä