Skip to content

N
NewParkAPP
Commit c6955aeb authored by YONG-LIN SU's avatar YONG-LIN SU
Browse files
Options

新增累加時段頁面 

清楚垃圾檔案
parent 266ff846
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 88 deletions
.idea/misc.xml
View file @ c6955aeb
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/activity_t03_cumulative.xml" value="0.34375" /> <entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/activity_t03_cumulative.xml" value="0.34375" />
<entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/activity_t03_img_viewer.xml" value="0.34375" /> <entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/activity_t03_img_viewer.xml" value="0.34375" />
<entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/card_view_image_plate_number_item.xml" value="0.34375" /> <entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/card_view_image_plate_number_item.xml" value="0.34375" />
<entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/content_t02_select_road.xml" value="0.1875" />
<entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/recycler_view_bulletin_board_item.xml" value="0.34375" /> <entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/recycler_view_bulletin_board_item.xml" value="0.34375" />
<entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/recycler_view_db_table_item.xml" value="0.33" /> <entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/recycler_view_db_table_item.xml" value="0.33" />
<entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/recycler_view_item.xml" value="0.34375" /> <entry key="..\:/Users/pp931/Desktop/RD/Projects/NewParkApp/app/src/main/res/layout/recycler_view_item.xml" value="0.34375" />
......
app/src/main/AndroidManifest.xml
View file @ c6955aeb
...@@ -27,18 +27,7 @@ ...@@ -27,18 +27,7 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" android:theme="@style/Theme.AppCompat.Light.NoActionBar"
tools:targetApi="31"> tools:targetApi="31">
<activity
android:name=".view.T03CumulativeActivity"
android:exported="false" />
<activity
android:name=".view.T03ImgViewerActivity"
android:exported="false" />
<activity
android:name=".view.T02KeyInPlateNumberActivity"
android:exported="false" />
<activity
android:name=".view.T02SelectRoadActivity"
android:exported="false" />
<activity <activity
android:name=".view.MainActivity" android:name=".view.MainActivity"
android:exported="true"> android:exported="true">
...@@ -48,6 +37,8 @@ ...@@ -48,6 +37,8 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".view.T01SettingActivity" android:name=".view.T01SettingActivity"
android:exported="false" android:exported="false"
...@@ -62,6 +53,15 @@ ...@@ -62,6 +53,15 @@
android:exported="false" android:exported="false"
android:label="系統公告" android:label="系統公告"
android:theme="@style/Theme.AppCompat.Light" /> android:theme="@style/Theme.AppCompat.Light" />
<activity
android:name=".view.T02KeyInPlateNumberActivity"
android:exported="false" />
<activity
android:name=".view.T02SelectRoadActivity"
android:exported="false" />
<activity <activity
android:name=".view.T02StartActivity" android:name=".view.T02StartActivity"
android:exported="false" /> android:exported="false" />
...@@ -75,6 +75,17 @@ ...@@ -75,6 +75,17 @@
android:name=".view.T02SelectUserActivity" android:name=".view.T02SelectUserActivity"
android:exported="false" /> android:exported="false" />
<activity
android:name=".view.T03CumulativeActivity"
android:exported="false"
android:label="資料匯入"
android:theme="@style/Theme.AppCompat.Light.Dialog" />
<activity
android:name=".view.T03ImgViewerActivity"
android:exported="false" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="ecom.android.newparkapp.fileprovider" android:authorities="ecom.android.newparkapp.fileprovider"
......
app/src/main/java/ecom/android/newparkapp/view/T02StartActivity.java
View file @ c6955aeb
...@@ -38,6 +38,7 @@ public class T02StartActivity extends AppCompatActivity { ...@@ -38,6 +38,7 @@ public class T02StartActivity extends AppCompatActivity {
private ActivityResultLauncher spaceResultLauncher; private ActivityResultLauncher spaceResultLauncher;
private ActivityResultLauncher plateNumberResultLauncher; private ActivityResultLauncher plateNumberResultLauncher;
private ActivityResultLauncher takePhotosActivityResultLauncher; private ActivityResultLauncher takePhotosActivityResultLauncher;
private ActivityResultLauncher cumulativeTimeActivityResultLauncher;
private User currentUser; private User currentUser;
private File photoFile; private File photoFile;
...@@ -72,6 +73,9 @@ public class T02StartActivity extends AppCompatActivity { ...@@ -72,6 +73,9 @@ public class T02StartActivity extends AppCompatActivity {
dataBinding.btnPageDown.setOnClickListener(v -> btnPageDownOnClicked()); dataBinding.btnPageDown.setOnClickListener(v -> btnPageDownOnClicked());
dataBinding.btnPageUp.setOnClickListener(v -> btnPageUpOnClicked()); dataBinding.btnPageUp.setOnClickListener(v -> btnPageUpOnClicked());
dataBinding.btnPhotoCount.setOnClickListener(v -> btnPhotoCountOnClicked()); dataBinding.btnPhotoCount.setOnClickListener(v -> btnPhotoCountOnClicked());
dataBinding.btnCumulativeTime.setOnClickListener(v -> btnCumulativeTimeOnClicked());
dataBinding.btnStartBack.setOnClickListener(v -> {finish();}); dataBinding.btnStartBack.setOnClickListener(v -> {finish();});
} }
...@@ -112,6 +116,10 @@ public class T02StartActivity extends AppCompatActivity { ...@@ -112,6 +116,10 @@ public class T02StartActivity extends AppCompatActivity {
} }
}); });
cumulativeTimeActivityResultLauncher = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
});
} }
private void observeBinding(){ private void observeBinding(){
...@@ -235,4 +243,10 @@ public class T02StartActivity extends AppCompatActivity { ...@@ -235,4 +243,10 @@ public class T02StartActivity extends AppCompatActivity {
intent.putExtra("BillingNumber2", tempCase.billingNumber2); intent.putExtra("BillingNumber2", tempCase.billingNumber2);
startActivity(intent); startActivity(intent);
} }
private void btnCumulativeTimeOnClicked(){
Intent intent = new Intent();
intent.setClass(this, T03CumulativeActivity.class);
cumulativeTimeActivityResultLauncher.launch(intent);
}
} }
\ No newline at end of file
app/src/main/res/layout/activity_t03_cumulative.xml
View file @ c6955aeb
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:paddingStart="10dp"
android:paddingTop="10dp"
android:paddingEnd="10dp"
android:paddingBottom="150dp"
tools:context=".view.T03CumulativeActivity"> tools:context=".view.T03CumulativeActivity">
</androidx.constraintlayout.widget.ConstraintLayout> <LinearLayout
\ No newline at end of file android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/textView5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="累加時間"
android:textSize="21sp"
tools:ignore="NestedWeights" />
<TextView
android:id="@+id/cumulativeTime_textView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="00:00"
android:textSize="21sp" />
<Button
android:id="@+id/periodSub_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="減段"
android:textSize="21sp" />
<Button
android:id="@+id/periodAdd_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="加段"
android:textSize="21sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/textView10"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="開單時間"
android:textSize="21sp"
tools:ignore="NestedWeights" />
<TextView
android:id="@+id/BillingTime_textView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="00:00"
android:textColor="@color/yellow_2"
android:textSize="21sp" />
<Space
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.666" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/textView12"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="停車時數"
android:textSize="21sp"
tools:ignore="NestedWeights" />
<TextView
android:id="@+id/parkingHours_textView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="1"
android:textSize="21sp" />
<Space
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.666" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/textView15"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_vertical"
android:text="停車費"
android:textSize="21sp"
tools:ignore="NestedWeights" />
<TextView
android:id="@+id/parkingExpenses_textView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="20"
android:textSize="21sp" />
<Space
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.666" />
</LinearLayout>
<Space
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="0.7" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:id="@+id/off_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="註銷本單"
android:textSize="21sp"
tools:ignore="ButtonStyle,NestedWeights" />
<Button
android:id="@+id/confirm_button"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="累加確認"
android:textSize="21sp"
tools:ignore="ButtonStyle" />
</LinearLayout>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/content_t02_select_road.xml deleted 100644 → 0
View file @ 266ff846
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<fragment
android:id="@+id/nav_host_fragment_content_t02_select_road"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/nav_graph" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_first.xml deleted 100644 → 0
View file @ 266ff846
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".FirstFragment">
<TextView
android:id="@+id/textview_first"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/hello_first_fragment"
app:layout_constraintBottom_toTopOf="@id/button_first"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_first"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/next"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_first" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_second.xml deleted 100644 → 0
View file @ 266ff846
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SecondFragment">
<TextView
android:id="@+id/textview_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@id/button_second"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/button_second"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/previous"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_second" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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