Commit f2e2d901 authored by lai\lai's avatar lai\lai

git update

parent 1ef1587f
<?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="C:\Users\k5499\.android\avd\Pixel_7_API_30.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2025-04-14T01:43:03.881431600Z" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetSelector">
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
</SelectionState>
</selectionStates>
</component>
</project>
\ No newline at end of file
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="jbr-17" /> <option name="gradleJvm" value="jbr-17" />
<option name="modules"> <option name="modules">
...@@ -14,6 +13,7 @@ ...@@ -14,6 +13,7 @@
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
</set> </set>
</option> </option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectMigrations">
<option name="MigrateToGradleLocalJavaHome">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</component>
</project>
\ No newline at end of file
This diff is collapsed.
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
defaultConfig { defaultConfig {
applicationId "ecom.android.newparkapp" applicationId "ecom.android.newparkapp"
minSdk 27 minSdk 27
targetSdk 30 targetSdk 31
versionCode 1 versionCode 1
versionName "Dev Ver.3.0.8(無車辨)" versionName "Dev Ver.3.0.8(無車辨)"
......
...@@ -383,6 +383,8 @@ public class CarPrinter_LKP34L{ ...@@ -383,6 +383,8 @@ public class CarPrinter_LKP34L{
nowCalendar.add(Calendar.MINUTE, carCase.space.getAddMinutes()); nowCalendar.add(Calendar.MINUTE, carCase.space.getAddMinutes());
nHour = nowCalendar.get(Calendar.HOUR_OF_DAY); nHour = nowCalendar.get(Calendar.HOUR_OF_DAY);
b60Min = nowCalendar.get(Calendar.MINUTE) == 59; b60Min = nowCalendar.get(Calendar.MINUTE) == 59;
if(nHour>=22)
break;
} }
// 開始列印 // 開始列印
......
...@@ -693,7 +693,7 @@ public class T02StartViewModel extends AndroidViewModel { ...@@ -693,7 +693,7 @@ public class T02StartViewModel extends AndroidViewModel {
/*第一段條碼**[09][07][07][207]*********************************************************************************************/ /*第一段條碼**[09][07][07][207]*********************************************************************************************/
StringBuilder BN1 = new StringBuilder(9); StringBuilder BN1 = new StringBuilder(9);
BN1.append(String.valueOf(termCalendar.get(Calendar.YEAR) - 11).substring(2)); //2碼繳費期限年份取後2位->[09] BN1.append(String.valueOf(termCalendar.get(Calendar.YEAR) - 11).substring(2)); //2碼繳費期限年份取後2位->[09]
BN1.append(String.format(Locale.TAIWAN, "%02d", termCalendar.get(Calendar.MONTH) + 1));//2碼繳費期限月份->[07] BN1.append(String.format(Locale.TAIWAN, "%02d", termCalendar.get(Calendar.MONTH) + 1));//2碼繳費期限月份->[07]
BN1.append(String.format(Locale.TAIWAN, "%02d", termCalendar.get(Calendar.DATE))); //2碼繳費期限日期->[07] BN1.append(String.format(Locale.TAIWAN, "%02d", termCalendar.get(Calendar.DATE))); //2碼繳費期限日期->[07]
BN1.append(getApplication().getString(R.string.jiaYiCityParkNumber)); //3碼嘉義代碼->[207] BN1.append(getApplication().getString(R.string.jiaYiCityParkNumber)); //3碼嘉義代碼->[207]
...@@ -711,7 +711,7 @@ public class T02StartViewModel extends AndroidViewModel { ...@@ -711,7 +711,7 @@ public class T02StartViewModel extends AndroidViewModel {
serialNumber %= 1000; //取流水號餘數0~999 serialNumber %= 1000; //取流水號餘數0~999
BN2.append(String.format(Locale.TAIWAN, "%03d", serialNumber)); //3碼流水號超過1000重置->[005] BN2.append(String.format(Locale.TAIWAN, "%03d", serialNumber)); //3碼流水號超過1000重置->[005]
thisCase.billingNumber2 = BN2.toString(); thisCase.billingNumber2 = BN2.toString();
BN2.append(Common.check(thisCase.billingNumber1, thisCase.billingNumber2)); //2碼檢查碼->[19] BN2.append(Common.check(thisCase.billingNumber1, thisCase.billingNumber2)); //2碼檢查碼->[19]
thisCase.billingNumber2 = BN2.toString(); thisCase.billingNumber2 = BN2.toString();
// TODO: 2022/7/29 加入與資料庫 billingNumber2 欄位比較是否重複 // TODO: 2022/7/29 加入與資料庫 billingNumber2 欄位比較是否重複
......
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id 'com.android.application' version '7.2.1' apply false id 'com.android.application' version '7.4.2' apply false
id 'com.android.library' version '7.2.1' apply false id 'com.android.library' version '7.4.2' apply false
} }
task clean(type: Delete) { task clean(type: Delete) {
......
#Thu Jul 14 17:20:14 CST 2022 #Thu Jul 14 17:20:14 CST 2022
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment