Commit 22a717ffc5824ea3adbadd1bd85e6351e4c3d6fb
1 parent
da545be8
畅游通核销4.0:1.更换地址
Showing
4 changed files
with
8 additions
and
102 deletions
CYTAndroid4.0.iml
| @@ -3,7 +3,6 @@ | @@ -3,7 +3,6 @@ | ||
| 3 | <component name="FacetManager"> | 3 | <component name="FacetManager"> |
| 4 | <facet type="android-gradle" name="Android-Gradle"> | 4 | <facet type="android-gradle" name="Android-Gradle"> |
| 5 | <configuration> | 5 | <configuration> |
| 6 | - <option name="GRADLE_PROJECT_PATH" value=":" /> | ||
| 7 | <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.4.0" /> | 6 | <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.4.0" /> |
| 8 | <option name="LAST_KNOWN_AGP_VERSION" value="3.4.0" /> | 7 | <option name="LAST_KNOWN_AGP_VERSION" value="3.4.0" /> |
| 9 | </configuration> | 8 | </configuration> |
| @@ -11,113 +10,19 @@ | @@ -11,113 +10,19 @@ | ||
| 11 | <facet type="android" name="Android"> | 10 | <facet type="android" name="Android"> |
| 12 | <configuration> | 11 | <configuration> |
| 13 | <option name="SELECTED_BUILD_VARIANT" value="debug" /> | 12 | <option name="SELECTED_BUILD_VARIANT" value="debug" /> |
| 14 | - <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> | ||
| 15 | - <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> | ||
| 16 | - <afterSyncTasks> | ||
| 17 | - <task>generateDebugSources</task> | ||
| 18 | - </afterSyncTasks> | ||
| 19 | <option name="ALLOW_USER_CONFIGURATION" value="false" /> | 13 | <option name="ALLOW_USER_CONFIGURATION" value="false" /> |
| 20 | - <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res;file://$MODULE_DIR$/build-types/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" /> | ||
| 21 | - <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" /> | 14 | + <option name="RES_FOLDERS_RELATIVE_PATH" value="" /> |
| 15 | + <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" /> | ||
| 22 | </configuration> | 16 | </configuration> |
| 23 | </facet> | 17 | </facet> |
| 24 | </component> | 18 | </component> |
| 25 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> | 19 | <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> |
| 26 | - <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" /> | ||
| 27 | - <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" /> | ||
| 28 | <exclude-output /> | 20 | <exclude-output /> |
| 29 | <content url="file://$MODULE_DIR$"> | 21 | <content url="file://$MODULE_DIR$"> |
| 30 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" /> | ||
| 31 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" /> | ||
| 32 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> | ||
| 33 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> | ||
| 34 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> | ||
| 35 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" /> | ||
| 36 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" /> | ||
| 37 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" /> | ||
| 38 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" /> | ||
| 39 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | ||
| 40 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | ||
| 41 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | ||
| 42 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | ||
| 43 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | ||
| 44 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | ||
| 45 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> | ||
| 46 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> | ||
| 47 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> | ||
| 48 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" /> | ||
| 49 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> | ||
| 50 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> | ||
| 51 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" /> | ||
| 52 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" /> | ||
| 53 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" /> | ||
| 54 | - <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" /> | ||
| 55 | - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" /> | ||
| 56 | - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" /> | ||
| 57 | - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" /> | ||
| 58 | - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" /> | ||
| 59 | - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" /> | ||
| 60 | - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" /> | ||
| 61 | - <sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" /> | ||
| 62 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" /> | ||
| 63 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" /> | ||
| 64 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" /> | ||
| 65 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" /> | ||
| 66 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" /> | ||
| 67 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" /> | ||
| 68 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" /> | ||
| 69 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" /> | ||
| 70 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" /> | ||
| 71 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" /> | ||
| 72 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" /> | ||
| 73 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" /> | ||
| 74 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" /> | ||
| 75 | - <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" /> | ||
| 76 | - <sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" /> | ||
| 77 | - <sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" /> | ||
| 78 | - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | ||
| 79 | - <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> | ||
| 80 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> | ||
| 81 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> | ||
| 82 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> | ||
| 83 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" /> | ||
| 84 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" /> | ||
| 85 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> | ||
| 86 | - <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> | ||
| 87 | - <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> | ||
| 88 | - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> | ||
| 89 | - <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> | ||
| 90 | - <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> | ||
| 91 | - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> | ||
| 92 | - <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> | ||
| 93 | - <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> | ||
| 94 | <excludeFolder url="file://$MODULE_DIR$/build" /> | 22 | <excludeFolder url="file://$MODULE_DIR$/build" /> |
| 95 | <excludeFolder url="file://$MODULE_DIR$/.gradle" /> | 23 | <excludeFolder url="file://$MODULE_DIR$/.gradle" /> |
| 96 | </content> | 24 | </content> |
| 97 | <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> | 25 | <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> |
| 98 | <orderEntry type="sourceFolder" forTests="false" /> | 26 | <orderEntry type="sourceFolder" forTests="false" /> |
| 99 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/external_libs/classes_2.1.11_20160907.jar" level="project" /> | ||
| 100 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/external_libs/bw_odm_20160526.jar" level="project" /> | ||
| 101 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/android-support-v4.jar" level="project" /> | ||
| 102 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/bcprov-jdk16-1.45.jar" level="project" /> | ||
| 103 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/dom4j-1.6.1.jar" level="project" /> | ||
| 104 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/fastjson-1.2.3.jar" level="project" /> | ||
| 105 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/sunjce_provider.jar" level="project" /> | ||
| 106 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/zbar.jar" level="project" /> | ||
| 107 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/zxing.jar" level="project" /> | ||
| 108 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/gson-2.6.2.jar" level="project" /> | ||
| 109 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/rskapi.jar" level="project" /> | ||
| 110 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/zkandroidcore.jar" level="project" /> | ||
| 111 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/zkandroididcardreader.jar" level="project" /> | ||
| 112 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/iodev2.jar" level="project" /> | ||
| 113 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/decoderapijni.jar" level="project" /> | ||
| 114 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/android-logging-log4j-1.0.3.jar" level="project" /> | ||
| 115 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/log4j-1.2.17.jar" level="project" /> | ||
| 116 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/zypos1.8.jar" level="project" /> | ||
| 117 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/jsch-0.1.54.jar" level="project" /> | ||
| 118 | - <orderEntry type="library" name="Gradle: D./desk file/work/CYTAndroid4.0/libs/bw_pos_sdk2.0.18.jar" level="project" /> | ||
| 119 | - <orderEntry type="library" name="Gradle: org.jetbrains:annotations-java5:15.0" level="project" /> | ||
| 120 | - <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.6.0" level="project" /> | ||
| 121 | - <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.11.0" level="project" /> | ||
| 122 | </component> | 27 | </component> |
| 123 | </module> | 28 | </module> |
| 124 | \ No newline at end of file | 29 | \ No newline at end of file |
build/generated/source/buildConfig/debug/com/ectrip/trips/check/BuildConfig.java
| @@ -8,6 +8,6 @@ public final class BuildConfig { | @@ -8,6 +8,6 @@ public final class BuildConfig { | ||
| 8 | public static final String APPLICATION_ID = "com.ectrip.trips.check"; | 8 | public static final String APPLICATION_ID = "com.ectrip.trips.check"; |
| 9 | public static final String BUILD_TYPE = "debug"; | 9 | public static final String BUILD_TYPE = "debug"; |
| 10 | public static final String FLAVOR = ""; | 10 | public static final String FLAVOR = ""; |
| 11 | - public static final int VERSION_CODE = 26; | ||
| 12 | - public static final String VERSION_NAME = "4.23"; | 11 | + public static final int VERSION_CODE = 27; |
| 12 | + public static final String VERSION_NAME = "4.24"; | ||
| 13 | } | 13 | } |
local.properties
| @@ -4,6 +4,6 @@ | @@ -4,6 +4,6 @@ | ||
| 4 | # Location of the SDK. This is only used by Gradle. | 4 | # Location of the SDK. This is only used by Gradle. |
| 5 | # For customization when using a Version Control System, please read the | 5 | # For customization when using a Version Control System, please read the |
| 6 | # header note. | 6 | # header note. |
| 7 | -#Tue Nov 07 15:15:32 CST 2023 | ||
| 8 | -sdk.dir=D\:\\adroid_sdk | 7 | +#Mon Feb 26 18:25:25 CST 2024 |
| 8 | +sdk.dir=D\:\\Android\\sdk | ||
| 9 | ndk.dir=D\:\\AndroidTools\\AStudioSDK\\ndk\\21.0.6113669 | 9 | ndk.dir=D\:\\AndroidTools\\AStudioSDK\\ndk\\21.0.6113669 |
src/com/ectrip/trips/net/HttpHelper.java
| @@ -42,7 +42,8 @@ public class HttpHelper extends HttpHelperCore { | @@ -42,7 +42,8 @@ public class HttpHelper extends HttpHelperCore { | ||
| 42 | private Integer type; | 42 | private Integer type; |
| 43 | private static BaseActivity activity; | 43 | private static BaseActivity activity; |
| 44 | // public static final String action="/service/terminal-2.action"; | 44 | // public static final String action="/service/terminal-2.action"; |
| 45 | - public final String action = "/service/terminal-3.do"; | 45 | +// public final String action = "/service/terminal-3.do"; |
| 46 | + public final String action = "/prod-api/manager/service/terminal-3"; | ||
| 46 | private ArrayList<ConfigBean> configBeans = DbManager.GetConfigs(); | 47 | private ArrayList<ConfigBean> configBeans = DbManager.GetConfigs(); |
| 47 | 48 | ||
| 48 | public static HttpHelper getInstance(Context mContext) { | 49 | public static HttpHelper getInstance(Context mContext) { |