Signed-off-by: AIE_Hope <omg112119@gmail.com>

.idea/codeStyles/Project.xml

-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>
\ No newline at end of file

.idea/encodings.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file

.idea/gradle.xml

@@ -3,6 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">

.idea/misc.xml

@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.ecom.park_jy"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/com/ecom/park_jy/Commin.java

@@ -436,6 +436,9 @@ public class Commin {
 
         s1 = string1.toCharArray();
         s2 = string2.toCharArray();
+        System.out.println(s1);
+        System.out.println(s2);//回報測試
+
         for (int temp = 0; temp < 9; temp++) {
             if (temp % 2 == 0)    //基數位數
             {

app/src/main/java/com/ecom/park_jy/Start.java

@@ -988,30 +988,48 @@ public class Start extends AppCompatActivity implements LocationListener {
     private void setBillingNumber() {   //單號產生
         String tof = "";
         calendar = Calendar.getInstance();
+        System.out.println("calendar-=>"+calendar);
         termCalendar = Calendar.getInstance();
-
+        System.out.println("termCalendar-=>"+termCalendar);
         termCalendar.add(Calendar.DATE, 19);
+        System.out.println("termCalendar_add-=>"+termCalendar);//註解
         billingNumber1 = String.valueOf(termCalendar.get(Calendar.YEAR) - 11).substring(2);
-        if (String.valueOf(termCalendar.get(Calendar.MONTH) + 1).length() == 1)
+        System.out.println("billingNumber1-=>"+billingNumber1);//註解
+        if (String.valueOf(termCalendar.get(Calendar.MONTH) + 1).length() == 1)   //月份小於10則在前面補0
             billingNumber1 += "0";
         billingNumber1 += String.valueOf(termCalendar.get(Calendar.MONTH) + 1);
-        if (String.valueOf(termCalendar.get(Calendar.DATE)).length() == 1)
+        System.out.println("billingNumber1_add_m-=>"+billingNumber1);//註解
+        if (String.valueOf(termCalendar.get(Calendar.DATE)).length() == 1)         //日期小於10則在前面補0
             billingNumber1 += "0";
         billingNumber1 += String.valueOf(termCalendar.get(Calendar.DATE));
+        System.out.println("billingNumber1_add_d-=>"+billingNumber1);//註解
         billingNumber1 += "207";
-
+        System.out.println("billingNumber1_add_207-=>"+billingNumber1);//註解
         userNum = getIntent().getStringExtra("PU").split(",");
+        for(int dig=0;dig<userNum.length;dig++) {
+            System.out.println("userNum["+dig+"]-=>" + userNum[dig]);//註解
+        }
         sNum = getIdx(false);
-
+        System.out.println("sNum="+sNum);//註解
         if (userNum[0].length() > 2) {
-            tof = userNum[0].substring(1, 2) + userNum[0].substring(2, 3);
-        } else {
-            tof = userNum[0];
+            tof = userNum[0].substring(1, 2) + userNum[0].substring(2, 3);      //2位數以上只取到第二位
+                    //取第二個字                 //取第三個字   //123 --> 23
+        }
+        else if(userNum[0].length() == 1){          //只有1位數就補0前面        2 --> 02
+            tof = "0" +userNum[0];
         }
+        else {
+            tof = userNum[0];                   //2位數直接輸出
+        }
+        System.out.println("tof-=>"+tof);//註解
         billingNumber = tof;
+        System.out.println("billingNumber-=>"+billingNumber);//註解
         billingNumber += Commin.getTwoNumber(calendar.get(Calendar.YEAR) - 1911);
+        System.out.println("billingNumber_get_y-=>"+billingNumber);//註解
         billingNumber += Commin.getOneNumber(calendar.get(Calendar.MONTH) + 1);
+        System.out.println("billingNumber_get_m-=>"+billingNumber);//註解
         billingNumber += Commin.getOneNumber(calendar.get(Calendar.DATE));
+        System.out.println("billingNumber_get_d-=>"+billingNumber);//註解
 
         sNum %= 1000;
         if (sNum < 100) {
@@ -1020,8 +1038,12 @@ public class Start extends AppCompatActivity implements LocationListener {
         if (sNum < 10) {
             billingNumber += "0";
         }
+        System.out.println("billingNumber_add_0-=>"+billingNumber);//註解
+
         billingNumber += String.valueOf(sNum);
+        System.out.println("billingNumber_valueOf-=>"+billingNumber);//註解
         billingNumber += Commin.check(billingNumber1, billingNumber);
+        System.out.println("billingNumber_Commin.check_+00-=>"+billingNumber);//註解
         t17.setText("單號:" + billingNumber);
     }
 

app/src/main/java/com/ecom/park_jy/start_btdevice.java

@@ -35,6 +35,8 @@ public class start_btdevice extends Activity {
     Button btn;
     bt_socket bts = new bt_socket();
 
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -55,9 +57,11 @@ public class start_btdevice extends Activity {
         newDv.setOnItemClickListener(mDv);
 
         filter = new IntentFilter(BluetoothDevice.ACTION_FOUND);
+        System.out.println("filter-=>"+filter);         //測試回報
         this.registerReceiver(receiver, filter);
 
         filter = new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED);
+        System.out.println("filter-=>"+filter);         //測試回報
         this.registerReceiver(receiver, filter);
 
         adapter = BluetoothAdapter.getDefaultAdapter();

app/src/main/res/values/strings.xml

 <resources>
-    <string name="title">路邊停車管理系統v1.0.6</string>
-    <string name="app_name">PARKv1.0.6</string>
+    <string name="title">路邊停車管理系統v1.1.0</string>
+    <string name="app_name">PARKv1.1.0</string>
     <color name="white">#ffffff</color>
     <color name="red">#FF0000</color>
     <color name="green">#00ff00</color>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

-#Fri Apr 12 16:25:08 CST 2019
+#Thu Jun 27 13:51:37 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip