Skip to content

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

主頁畫面調整

parent e2e0907e
Show whitespace changes
Inline Side-by-side
Showing with 140 additions and 68 deletions
app/build.gradle
View file @ 24da35c7
......@@ -10,7 +10,7 @@ android {
minSdk 27
targetSdk 32
versionCode 1
versionName "1.0"
versionName "Dev Ver.0.3.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
......
app/src/main/java/ecom/android/newparkapp/view/MainActivity.java
View file @ 24da35c7
......@@ -7,6 +7,7 @@ import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
import android.content.Intent;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.widget.Toast;
......@@ -46,6 +47,9 @@ public class MainActivity extends AppCompatActivity {
dataBinding.setUserViewModel(userViewModel);
initLayout();
// 註冊權限請求結果處理
resultLauncherRegister();
// 檢查權限
......@@ -60,6 +64,23 @@ public class MainActivity extends AppCompatActivity {
});
}
/**
* 初始化 部分 UI介面
*/
private void initLayout(){
// 設置當前版本 編號
PackageManager manager = getPackageManager();
try {
PackageInfo info = manager.getPackageInfo(getPackageName(), 0);
dataBinding.tvAppVersion.setText(getString(R.string.app_version, info.versionName));
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
}
// 離開按鈕事件註冊
dataBinding.btnExitApp.setOnClickListener(view -> android.os.Process.killProcess(android.os.Process.myPid()));
}
/**
* 權限請求方法
*/
......@@ -108,9 +129,8 @@ public class MainActivity extends AppCompatActivity {
* 所有事件註冊及綁定
*/
private void eventBinding(){
dataBinding.btnStart.setOnClickListener(view -> btnStartOnClicked() );
dataBinding.btnGoBbn.setOnClickListener(view -> btnGo2BBOnClicked());
dataBinding.btnGoImportDb.setOnClickListener(view -> btnGoImportDbOnClicked());
dataBinding.btnStartMorning.setOnClickListener(view -> btnStartOnClicked() );
dataBinding.btnStartAfternoon.setOnClickListener(view -> btnStartOnClicked() );
dataBinding.btnGoSetting.setOnClickListener(view -> {btnGoSettingOnClicked();});
}
......@@ -127,18 +147,6 @@ public class MainActivity extends AppCompatActivity {
startActivity(intent);
}
private void btnGo2BBOnClicked(){
Intent intent = new Intent();
intent.setClass(this, T01BulletinBoardActivity.class);
startActivity(intent);
}
private void btnGoImportDbOnClicked(){
Intent intent = new Intent();
intent.setClass(this, T01ImportDbActivity.class);
startActivity(intent);
}
private void btnGoSettingOnClicked(){
Intent intent = new Intent();
intent.setClass(this, T01SettingActivity.class);
......
app/src/main/java/ecom/android/newparkapp/view/T03TotalActivity.java
View file @ 24da35c7
......@@ -48,7 +48,9 @@ public class T03TotalActivity extends AppCompatActivity {
// 取得存放目錄
String szTmpPath = Environment.getExternalStorageDirectory() + getApplication().getString(R.string.sysData_path) + szYYMMDD;
// 計算當日
CalcToday(szUserId, szTmpPath, szYYMMDD, false);
// 計算當月
CalcMonth(szUserId, szTmpPath, szYYMMDD);
} else {
Toast.makeText(this, "資料異常!", Toast.LENGTH_LONG).show();
......
app/src/main/res/drawable/ic_moon_black_24dp.xml 0 → 100644
View file @ 24da35c7
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="45dp"
android:height="45dp"
android:tint="#FFFFFF"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M10,2c-1.82,0 -3.53,0.5 -5,1.35C7.99,5.08 10,8.3 10,12s-2.01,6.92 -5,8.65C6.47,21.5 8.18,22 10,22c5.52,0 10,-4.48 10,-10S15.52,2 10,2z" />
</vector>
app/src/main/res/drawable/ic_sun_black_24dp.xml 0 → 100644
View file @ 24da35c7
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="45dp"
android:height="45dp"
android:tint="#FFFFFF"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M6.76,4.84l-1.8,-1.79 -1.41,1.41 1.79,1.79 1.42,-1.41zM4,10.5L1,10.5v2h3v-2zM13,0.55h-2L11,3.5h2L13,0.55zM20.45,4.46l-1.41,-1.41 -1.79,1.79 1.41,1.41 1.79,-1.79zM17.24,18.16l1.79,1.8 1.41,-1.41 -1.8,-1.79 -1.4,1.4zM20,10.5v2h3v-2h-3zM12,5.5c-3.31,0 -6,2.69 -6,6s2.69,6 6,6 6,-2.69 6,-6 -2.69,-6 -6,-6zM11,22.45h2L13,19.5h-2v2.95zM3.55,18.54l1.41,1.41 1.79,-1.8 -1.41,-1.41 -1.79,1.8z" />
</vector>
app/src/main/res/layout/activity_main.xml
View file @ 24da35c7
......@@ -7,93 +7,135 @@
name="userViewModel"
type="ecom.android.newparkapp.viewModel.UserViewModel" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="20dp"
android:paddingTop="10dp"
android:paddingEnd="20dp"
android:paddingBottom="0dp"
tools:context=".view.MainActivity">
<Button
android:id="@+id/btn_start"
android:layout_width="wrap_content"
<TextView
android:id="@+id/textView26"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="start"
android:text="@string/title"
android:textAlignment="center"
android:textSize="36sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.026" />
<LinearLayout
<Button
android:id="@+id/btn_start_morning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:orientation="horizontal"
android:layout_height="100dp"
android:layout_weight="0.9"
android:drawableStart="@drawable/ic_sun_black_24dp"
android:drawablePadding="-35dp"
android:gravity="center"
android:paddingStart="25dp"
android:paddingEnd="0dp"
android:text="@string/morning_button_text"
android:textSize="26sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintHorizontal_bias="0.825"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.132">
app:layout_constraintVertical_bias="0.273" />
<TextView
android:id="@+id/textView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="使用者"
android:textSize="24sp" />
<Button
android:id="@+id/btn_start_afternoon"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_weight="0.9"
android:drawableStart="@drawable/ic_moon_black_24dp"
android:drawablePadding="-35dp"
android:gravity="center"
android:paddingStart="25dp"
android:paddingEnd="0dp"
android:text="@string/afternoon_button_text"
android:textSize="26sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.463" />
<TextView
android:id="@+id/textView5"
<Button
android:id="@+id/btn_go_setting"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@{userViewModel.currentUser.name}"
android:textSize="24sp" />
android:text="設定"
android:textSize="23sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.729" />
<TextView
android:id="@+id/textView8"
android:id="@+id/tv_current_usr"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@{userViewModel.currentUser.userPermission.name}"
android:textSize="24sp" />
</LinearLayout>
android:text="當前使用者"
android:textAlignment="center"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.4"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.623" />
<Button
android:id="@+id/btn_go_bbn"
android:layout_width="wrap_content"
android:id="@+id/btn_exit_app"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="公告"
android:text="離開"
android:textSize="23sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.622" />
app:layout_constraintVertical_bias="0.829" />
<Button
android:id="@+id/btn_go_import_db"
android:layout_width="wrap_content"
<TextView
android:id="@+id/textView8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="匯入資料"
android:gravity="bottom|center"
android:text="@string/ecom_title"
android:textColor="#A3D1D1"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.742" />
app:layout_constraintVertical_bias="0.94" />
<Button
android:id="@+id/btn_go_setting"
android:layout_width="wrap_content"
<TextView
android:id="@+id/tv_app_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="設定"
android:gravity="bottom|center"
android:text="@string/app_version"
android:textColor="#A3D1D1"
android:textSize="15sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.501"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.872" />
app:layout_constraintVertical_bias="0.974" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 24da35c7
<resources>
<string name="app_name">NEW PARK</string>
<string name="title">路邊停車開單系統</string>
<string name="title">路邊停車開單系統\n開發測試</string>
<string name="app_version">版本：%s</string>
<!-- 1050830 阿達:改時間 by JiaRong-->
......
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