DESKTOP-6R169VE\hrj 1 рік тому
батько
коміт
4c363c2886

+ 1 - 0
app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"1.0.5","enabled":true,"outputFile":"Ò½Ôººô½Ð»úV1.0.5_2023-04-18.apk","fullName":"release","baseName":"release"},"path":"Ò½Ôººô½Ð»úV1.0.5_2023-04-18.apk","properties":{}}]

BIN
app/release/医院呼叫机V1.0.5_2023-04-18.apk


+ 2 - 2
app/src/main/res/layout-large/activity_home.xml

@@ -111,7 +111,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="false"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="180dp"
+                    android:layout_marginStart="@dimen/dp_180"
                     android:text="@string/activity_home_patient"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/sp_32" />
@@ -121,7 +121,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="false"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="330dp"
+                    android:layout_marginStart="@dimen/dp_380"
                     android:text="@string/activity_home_undone_times"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/sp_32" />

+ 6 - 6
app/src/main/res/layout-large/activity_home_adapter_item.xml

@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:visibility="invisible"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="@dimen/dp_10"
         android:src="@mipmap/call_home_itemtip" />
 
 
@@ -21,7 +21,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_marginStart="10dp"
+        android:layout_marginStart="@dimen/dp_10"
         android:layout_toEndOf="@+id/home_adapter_item_iv_icon"
         android:textColor="@color/text_color_000f3d"
         android:textSize="@dimen/sp_32"
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="false"
         android:layout_centerVertical="true"
-        android:layout_marginStart="175dp"
+        android:layout_marginStart="@dimen/dp_175"
         android:gravity="center"
         android:textColor="@color/text_color_000f3d"
         android:textSize="@dimen/sp_32"
@@ -57,10 +57,10 @@
         android:id="@+id/home_adapter_item_tv_times"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+        android:layout_centerInParent="false"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="205dp"
-        android:textColor="@color/text_color_000f3d"
+        android:layout_marginStart="@dimen/dp_410"
+        android:textColor="@color/text_color_0065dc"
         android:textSize="@dimen/sp_32"
         tools:text="35" />
 

+ 3 - 3
app/src/main/res/layout/activity_home.xml

@@ -113,7 +113,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="false"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="180dp"
+                    android:layout_marginStart="@dimen/dp_130"
                     android:text="@string/activity_home_patient"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/sp_32" />
@@ -123,7 +123,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="false"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="330dp"
+                    android:layout_marginStart="@dimen/dp_250"
                     android:text="@string/activity_home_undone_times"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/sp_32" />
@@ -134,7 +134,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginRight="@dimen/dp_30"
+                    android:layout_marginRight="@dimen/dp_10"
                     android:text="@string/activity_home_undone_total"
                     android:textColor="@android:color/white"
                     android:textSize="@dimen/sp_32" />

+ 5 - 4
app/src/main/res/layout/activity_home_adapter_item.xml

@@ -30,9 +30,9 @@
         android:id="@+id/home_adapter_item_tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerInParent="false"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="@dimen/dp_80"
-        android:layout_toStartOf="@+id/activity_home_times"
+        android:layout_marginStart="@dimen/dp_140"
         android:textColor="@color/text_color_000f3d"
         android:textSize="@dimen/sp_16"
         tools:text="李*敏" />
@@ -55,8 +55,9 @@
         android:id="@+id/home_adapter_item_tv_times"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerInParent="false"
         android:layout_centerVertical="true"
-        android:layout_toStartOf="@+id/home_adapter_item_tv_total"
+        android:layout_marginStart="@dimen/dp_290"
         android:textColor="@color/text_color_0065dc"
         android:textSize="@dimen/sp_16"
         android:textStyle="bold"
@@ -71,6 +72,6 @@
         android:layout_marginEnd="@dimen/dp_60"
         android:textColor="@color/text_color_000f3d"
         android:textSize="@dimen/sp_16"
-        tools:text="/50" />
+        tools:text="50" />
 
 </RelativeLayout>

+ 9 - 1
app/src/main/res/values/dimens.xml

@@ -11,8 +11,16 @@
     <dimen name="dp_80">90dp</dimen>
     <dimen name="dp_100">100dp</dimen>
     <dimen name="dp_120">120dp</dimen>
+    <dimen name="dp_130">130dp</dimen>
+    <dimen name="dp_140">140dp</dimen>
     <dimen name="dp_150">150dp</dimen>
-
+    <dimen name="dp_180">180dp</dimen>
+    <dimen name="dp_175">175dp</dimen>
+    <dimen name="dp_250">250dp</dimen>
+    <dimen name="dp_290">290dp</dimen>
+    <dimen name="dp_350">350dp</dimen>
+    <dimen name="dp_380">380dp</dimen>
+    <dimen name="dp_410">410dp</dimen>
 
 
     <dimen name="sp_16">16sp</dimen>