Commit 786930c0 authored by YONG-LIN SU's avatar YONG-LIN SU

1. 補充部份文件

2. 修正UI電池顯示排版問題
3. 修正累計顯示錯誤
parent 72908966
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
</deviceKey> </deviceKey>
</Target> </Target>
</runningDeviceTargetSelectedWithDropDown> </runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-08-19T03:06:22.756618100Z" /> <timeTargetWasSelectedWithDropDown value="2022-08-19T08:00:42.164342600Z" />
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -69,7 +69,7 @@ public class ConvertBindingAdapter { ...@@ -69,7 +69,7 @@ public class ConvertBindingAdapter {
public static void PrinterPowerPercent2String(TextView textView, float printerPowerPercent){ public static void PrinterPowerPercent2String(TextView textView, float printerPowerPercent){
String printerPowerPercentString = "未偵測到電池"; String printerPowerPercentString = "未偵測到電池";
if (printerPowerPercent >= 0){ if (printerPowerPercent >= 0){
printerPowerPercentString = printerPowerPercent + "%"; printerPowerPercentString = " " + printerPowerPercent + "%";
} }
textView.setText(printerPowerPercentString); textView.setText(printerPowerPercentString);
......
...@@ -555,8 +555,9 @@ public class T02StartActivity extends AppCompatActivity { ...@@ -555,8 +555,9 @@ public class T02StartActivity extends AppCompatActivity {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setClass(this, T03TotalActivity.class); intent.setClass(this, T03TotalActivity.class);
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
// 取二位ID
bundle.putString("USER_ID", String.valueOf(currentUser.id)); String userId = String.format("%02d",currentUser.id);
bundle.putString("USER_ID", userId);
intent.putExtras(bundle); intent.putExtras(bundle);
startActivity(intent); startActivity(intent);
......
...@@ -39,7 +39,7 @@ tools:layout_editor_absoluteY="25dp"> ...@@ -39,7 +39,7 @@ tools:layout_editor_absoluteY="25dp">
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_marginTop="5dp" android:layout_gravity="center"
> >
<TextView <TextView
...@@ -49,6 +49,7 @@ tools:layout_editor_absoluteY="25dp"> ...@@ -49,6 +49,7 @@ tools:layout_editor_absoluteY="25dp">
android:layout_weight="0.6" android:layout_weight="0.6"
android:paddingStart="3dp" android:paddingStart="3dp"
android:text="印表機" android:text="印表機"
android:gravity="center_vertical"
android:textSize="21sp" /> android:textSize="21sp" />
<TextView <TextView
...@@ -58,6 +59,7 @@ tools:layout_editor_absoluteY="25dp"> ...@@ -58,6 +59,7 @@ tools:layout_editor_absoluteY="25dp">
android:layout_weight="0.95" android:layout_weight="0.95"
android:text="@{blueToothViewModel.bluetoothDevice.name}" android:text="@{blueToothViewModel.bluetoothDevice.name}"
android:textAlignment="center" android:textAlignment="center"
android:gravity="center"
android:textSize="20sp" /> android:textSize="20sp" />
<TextView <TextView
...@@ -68,7 +70,8 @@ tools:layout_editor_absoluteY="25dp"> ...@@ -68,7 +70,8 @@ tools:layout_editor_absoluteY="25dp">
android:textAlignment="center" android:textAlignment="center"
android:textColor="#8BC34A" android:textColor="#8BC34A"
android:textSize="20sp" android:textSize="20sp"
app:blueToothStatus2String="@{blueToothViewModel.blueToothStatus}"/> android:gravity="center"
app:blueToothStatus2String="@{blueToothViewModel.blueToothStatus}" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
...@@ -81,17 +84,17 @@ tools:layout_editor_absoluteY="25dp"> ...@@ -81,17 +84,17 @@ tools:layout_editor_absoluteY="25dp">
android:id="@+id/imageView" android:id="@+id/imageView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_weight="1"
android:rotation="0" android:rotation="0"
android:gravity="center"
app:printerPowerPercent2Image="@{blueToothViewModel.printerPowerPercentFull}"/> app:printerPowerPercent2Image="@{blueToothViewModel.printerPowerPercentFull}"/>
<TextView <TextView
android:id="@+id/textView22" android:id="@+id/textView22"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:textAlignment="center" android:textAlignment="center"
android:textSize="16sp" android:textSize="16sp"
android:gravity="center"
app:printerPowerPercent2String="@{blueToothViewModel.printerPowerPercentFull}"/> app:printerPowerPercent2String="@{blueToothViewModel.printerPowerPercentFull}"/>
</LinearLayout> </LinearLayout>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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