Compare commits
No commits in common. 'master' and 'Huatao_branch' have entirely different histories.
master
...
Huatao_bra
Before Width: | Height: | Size: 23 MiB |
Before Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 226 KiB |
Before Width: | Height: | Size: 194 KiB |
Before Width: | Height: | Size: 39 KiB |
Before Width: | Height: | Size: 42 KiB |
Before Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 263 KiB |
Before Width: | Height: | Size: 182 KiB |
Before Width: | Height: | Size: 236 KiB |
Before Width: | Height: | Size: 108 KiB |
Before Width: | Height: | Size: 110 KiB |
Before Width: | Height: | Size: 163 KiB |
Before Width: | Height: | Size: 113 KiB |
Before Width: | Height: | Size: 107 KiB |
Before Width: | Height: | Size: 118 KiB |
Before Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 131 KiB |
Before Width: | Height: | Size: 165 KiB |
Before Width: | Height: | Size: 347 KiB |
Before Width: | Height: | Size: 60 KiB |
Before Width: | Height: | Size: 125 KiB |
Before Width: | Height: | Size: 74 KiB |
Before Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 188 KiB |
Before Width: | Height: | Size: 263 KiB |
Before Width: | Height: | Size: 490 KiB |
Before Width: | Height: | Size: 144 KiB |
Before Width: | Height: | Size: 145 KiB |
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 104 KiB |
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 26 KiB |
Before Width: | Height: | Size: 147 KiB |
Before Width: | Height: | Size: 22 KiB |
Before Width: | Height: | Size: 162 KiB |
Before Width: | Height: | Size: 157 KiB |
Before Width: | Height: | Size: 128 KiB |
Before Width: | Height: | Size: 136 KiB |
Before Width: | Height: | Size: 102 KiB |
@ -1,15 +0,0 @@
|
||||
*.iml
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
/.idea/workspace.xml
|
||||
/.idea/navEditor.xml
|
||||
/.idea/assetWizardSettings.xml
|
||||
.DS_Store
|
||||
/build
|
||||
/captures
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
@ -1,3 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="11" />
|
||||
</component>
|
||||
</project>
|
@ -1,17 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="deploymentTargetDropDown">
|
||||
<targetSelectedWithDropDown>
|
||||
<Target>
|
||||
<type value="QUICK_BOOT_TARGET" />
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="VIRTUAL_DEVICE_PATH" />
|
||||
<value value="E:\SDK\avd\.android\avd\Pixel_XL_API_30.avd" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</targetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2022-07-10T02:39:23.302314100Z" />
|
||||
</component>
|
||||
</project>
|
@ -1,20 +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="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
<option value="$PROJECT_DIR$/app" />
|
||||
</set>
|
||||
</option>
|
||||
<option name="resolveModulePerSourceSet" value="false" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
@ -1,63 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DesignSurface">
|
||||
<option name="filePathToZoomLevelMap">
|
||||
<map>
|
||||
<entry key="..\:/Logistics/app/src/main/res/drawable/ic_launcher_background.xml" value="0.193" />
|
||||
<entry key="..\:/Logistics/app/src/main/res/drawable/translucent_button.xml" value="0.1175" />
|
||||
<entry key="..\:/Logistics/app/src/main/res/drawable/translucent_edit.xml" value="0.1175" />
|
||||
<entry key="..\:/Logistics/app/src/main/res/layout/activity_main.xml" value="0.10126582278481013" />
|
||||
<entry key="..\:/Logistics/app/src/main/res/layout/activity_sign_up.xml" value="0.1" />
|
||||
<entry key="..\:/Logistics/app/src/main/res/layout/buttom.xml" value="0.15" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/border_input_box.xml" value="0.1" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/button_shape.xml" value="0.1" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/ic_launcher_background.xml" value="0.194" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/tab_menu_better.xml" value="0.1135" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/tab_menu_text.xml" value="0.1" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/translucent_button.xml" value="0.194" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/drawable/translucent_edit.xml" value="0.1135" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_history.xml" value="0.22" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_main.xml" value="0.1" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_main2.xml" value="0.10235507246376811" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_menu.xml" value="0.25" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_no_pick.xml" value="0.2" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_sign_up.xml" value="0.22" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/activity_wait.xml" value="0.18" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/buttom.xml" value="0.10235507246376811" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/forget.xml" value="0.2630208333333333" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/fragment_my.xml" value="0.10235507246376811" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/item.xml" value="0.22" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment1.xml" value="0.1" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment2.xml" value="0.18489583333333334" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment3.xml" value="0.2" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/pickup.xml" value="0.1" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/tab1.xml" value="0.10235507246376811" />
|
||||
<entry key="..\:/shijianer/xcr_se/src/Logistics/app/src/main/res/layout/top.xml" value="0.3717105263157895" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.1" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/bg_go.xml" value="0.255" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/border_input_box.xml" value="0.1" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/button_shape.xml" value="0.1" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/ic_launcher_background.xml" value="0.1" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/drawable/translucent_edit.xml" value="0.1555" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_history.xml" value="0.2" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_main.xml" value="0.264" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_menu.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_no_pick.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/activity_sign_up.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/forget.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/item.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment1.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment2.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/my_fragment3.xml" value="0.20652173913043478" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/layout/pickup.xml" value="0.2" />
|
||||
<entry key="..\:/无人物流/xcr_se/src/Logistics/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.255" />
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
</project>
|
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
@ -1 +0,0 @@
|
||||
/build
|
@ -1,47 +0,0 @@
|
||||
plugins {
|
||||
id 'com.android.application'
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdk 32
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.example.logistics"
|
||||
minSdk 21
|
||||
targetSdk 32
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility JavaVersion.VERSION_1_8
|
||||
targetCompatibility JavaVersion.VERSION_1_8
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||
implementation 'com.jakewharton:butterknife:10.0.0'
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
|
||||
implementation files('libs/json-simple-1.1.jar')
|
||||
|
||||
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
|
||||
implementation 'androidx.appcompat:appcompat:1.3.0'
|
||||
implementation 'com.google.android.material:material:1.4.0'
|
||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
|
||||
implementation files('libs\\mysql-connector-java-5.0.7.jar')
|
||||
implementation 'androidx.navigation:navigation-fragment:2.3.5'
|
||||
implementation 'androidx.navigation:navigation-ui:2.3.5'
|
||||
testImplementation 'junit:junit:4.13.2'
|
||||
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
|
||||
implementation "org.java-websocket:Java-WebSocket:1.4.0"
|
||||
}
|