Merge branch 'cabinet_req_2023_05_04' of zyh/ich-android into cabinet_req_2023_05_04

app/src/main/java/com/emato/ich/fragment/ChooseCabinetFragment.java

@@ -89,7 +89,7 @@ public class ChooseCabinetFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, ChooseCabinetFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, ChooseCabinetFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/CollectMaterialsFragment.java

@@ -81,7 +81,7 @@ public class CollectMaterialsFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, CollectMaterialsFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, CollectMaterialsFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/CourierFragment.java

@@ -49,7 +49,7 @@ public class CourierFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, CourierFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, CourierFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/ExceptionFragment.java

@@ -70,7 +70,7 @@ public class ExceptionFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, ExceptionFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, ExceptionFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/ExpressDeliveryFragment.java

@@ -70,7 +70,7 @@ public class ExpressDeliveryFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, ExpressDeliveryFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, ExpressDeliveryFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/InputInfoFragment.java

@@ -82,7 +82,7 @@ public class InputInfoFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, InputInfoFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, InputInfoFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/InputInfoKeyBoardFragment.java

@@ -82,7 +82,7 @@ public class InputInfoKeyBoardFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, InputInfoKeyBoardFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, InputInfoKeyBoardFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/PaymentFragment.java

@@ -81,7 +81,7 @@ public class PaymentFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, PaymentFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, PaymentFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/SendFragment.java

@@ -73,7 +73,7 @@ public class SendFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, SendFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, SendFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时异常! ", e);

app/src/main/java/com/emato/ich/fragment/SendKeyBoardFragment.java

@@ -79,7 +79,7 @@ public class SendKeyBoardFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, SendKeyBoardFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, SendKeyBoardFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时异常! ", e);

app/src/main/java/com/emato/ich/fragment/SendMainFragment.java

@@ -71,7 +71,7 @@ public class SendMainFragment extends Fragment {
         }
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, SendMainFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, SendMainFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/SendSuccessFragment.java

@@ -50,7 +50,7 @@ public class SendSuccessFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnMainBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, SendSuccessFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, SendSuccessFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/TakeCodeFragment.java

@@ -80,7 +80,7 @@ public class TakeCodeFragment extends Fragment {
 
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, TakeCodeFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, TakeCodeFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/TakeFragment.java

@@ -64,7 +64,7 @@ public class TakeFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, TakeFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, TakeFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/java/com/emato/ich/fragment/TakeSuccessFragment.java

@@ -73,7 +73,7 @@ public class TakeSuccessFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnMainBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, TakeSuccessFragment.this, binding.timeout, 120);
+            timer = TimeOutUtils.timeout(activity, TakeSuccessFragment.this, binding.timeout, 90);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

app/src/main/res/layout/fragment_main.xml

@@ -37,9 +37,9 @@
     <TextView
         android:id="@+id/fast_take_send_bg"
         android:layout_width="120dp"
-        android:layout_height="148dp"
+        android:layout_height="138dp"
         android:layout_x="181dp"
-        android:layout_y="440dp"
+        android:layout_y="464dp"
         android:background="@drawable/textview_border"
         android:gravity="center_horizontal"
         android:paddingTop="15dp"
@@ -60,17 +60,19 @@
 
     <TextView
         android:id="@+id/take_btn"
-        android:layout_width="150dp"
-        android:layout_height="87dp"
-        android:layout_x="165dp"
+        android:layout_width="121dp"
+        android:layout_height="wrap_content"
+        android:layout_x="181dp"
         android:layout_y="350dp"
-        android:background="@drawable/take"
-        android:textSize="20sp"
-        android:textStyle="" />
+        android:drawableTop="@drawable/take"
+        android:gravity="center"
+        android:text="@string/pick_up_the_item"
+        android:textSize="15sp"
+        android:textStyle="bold" />
 
     <TextView
         android:id="@+id/send_btn"
-        android:layout_width="107dp"
+        android:layout_width="121dp"
         android:layout_height="wrap_content"
         android:layout_x="46dp"
         android:layout_y="350dp"
@@ -82,10 +84,10 @@
 
     <TextView
         android:id="@+id/deliverer_btn"
-        android:layout_width="107dp"
+        android:layout_width="121dp"
         android:layout_height="wrap_content"
-        android:layout_x="49dp"
-        android:layout_y="460dp"
+        android:layout_x="46dp"
+        android:layout_y="480dp"
         android:drawableTop="@drawable/paisongyuan"
         android:gravity="center"
         android:text="@string/delivery"
@@ -96,8 +98,8 @@
         android:id="@+id/fast_take_send"
         android:layout_width="90dp"
         android:layout_height="90dp"
-        android:layout_x="197dp"
-        android:layout_y="480dp"
+        android:layout_x="196dp"
+        android:layout_y="500dp"
         android:background="@drawable/e_mp_qrcode_8x8_backup" />
 
     <!--    android:theme="@style/Theme.ButtonStyle.GREEN"-->

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

@@ -124,6 +124,7 @@
     <string name="open_info">全开柜门</string>
     <string name="register_info">注册信息</string>
     <string name="express_delivery">我要寄快递</string>
+    <string name="pick_up_the_item">取件码取件</string>
     <string name="delivery">我是派送员</string>
     <string name="courier_delivery">快递员派件</string>
     <string name="collect_materials">揽件</string>