快递柜新版本页面更新

app/src/main/java/com/emato/ich/MainActivity.java

@@ -164,19 +164,19 @@ public class MainActivity extends AppCompatActivity  {
 
         banner = findViewById(R.id.banner);
 
-        banner.setOnCarouselItemChangeListener(new OnCarouselItemChangeListener() {
-            @Override
-            public void onItemChange(int position) {
-//                Toast.makeText(MainActivity.this, String.valueOf(position), Toast.LENGTH_LONG).show();
-            }
-        });
-        banner.setOnCarouselItemClickListener(new OnCarouselItemClickListener() {
-            @Override
-            public void onItemClick(int position, String url) {
-                // 点击事件不进行处理
-                // Toast.makeText(MainActivity.this, url, Toast.LENGTH_LONG).show();
-            }
-        });
+//        banner.setOnCarouselItemChangeListener(new OnCarouselItemChangeListener() {
+//            @Override
+//            public void onItemChange(int position) {
+////                Toast.makeText(MainActivity.this, String.valueOf(position), Toast.LENGTH_LONG).show();
+//            }
+//        });
+//        banner.setOnCarouselItemClickListener(new OnCarouselItemClickListener() {
+//            @Override
+//            public void onItemClick(int position, String url) {
+//                // 点击事件不进行处理
+//                // Toast.makeText(MainActivity.this, url, Toast.LENGTH_LONG).show();
+//            }
+//        });
         //banner.initBanner(list);
 
     }
@@ -226,10 +226,10 @@ public class MainActivity extends AppCompatActivity  {
                             // 取件二维码是否展示
                             if (TakeQrCodeShowEnum.item_1.getItem().equals(takeQrCodeShow)){
                                 findViewById(R.id.fast_take_send).setVisibility(View.GONE);
-                                findViewById(R.id.fast_take_send_bg).setVisibility(View.GONE);
+                                findViewById(R.id.fast_take_send_background).setVisibility(View.GONE);
                             }else {
                                 findViewById(R.id.fast_take_send).setVisibility(View.VISIBLE);
-                                findViewById(R.id.fast_take_send_bg).setVisibility(View.VISIBLE);
+                                findViewById(R.id.fast_take_send_background).setVisibility(View.VISIBLE);
                             }
                             // 取件码取件是否展示
                             if (TakeButtonShowEnum.item_1.getItem().equals(takeButtonShow)){

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

@@ -61,10 +61,10 @@ public class MainFragment extends Fragment {
         // 取件二维码是否展示
         if (TakeQrCodeShowEnum.item_1.getItem().equals(takeQrCodeShow)){
             view.findViewById(R.id.fast_take_send).setVisibility(View.GONE);
-            view.findViewById(R.id.fast_take_send_bg).setVisibility(View.GONE);
+            view.findViewById(R.id.fast_take_send_background).setVisibility(View.GONE);
         }else {
             view.findViewById(R.id.fast_take_send).setVisibility(View.VISIBLE);
-            view.findViewById(R.id.fast_take_send_bg).setVisibility(View.VISIBLE);
+            view.findViewById(R.id.fast_take_send_background).setVisibility(View.VISIBLE);
         }
         // 取件码取件是否展示
         if (TakeButtonShowEnum.item_1.getItem().equals(takeButtonShow)){

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

@@ -23,29 +23,18 @@
         app:layout_constraintVertical_bias="0.0"
         app:navGraph="@navigation/nav_graph" />
 
+
     <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="344dp"
-        android:layout_height="290dp"
+        android:id="@+id/imageLogoView"
+        android:layout_width="56dp"
+        android:layout_height="21dp"
         android:scaleType="fitXY"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_bias="0.045"
         app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/deheguizizhutu"
+        app:srcCompat="@drawable/emato_logo"
         tools:ignore="MissingConstraints"
-        tools:layout_editor_absoluteY="0dp" />
+        tools:layout_editor_absoluteY="38dp" />
 
-    <com.hacknife.carouselbanner.CarouselBanner
-        android:id="@+id/banner"
-        android:layout_width="344dp"
-        android:layout_height="290dp"
-        app:autoPlaying="true"
-        app:indicatorGravity="left"
-        app:indicatorSelectedSrc="#d6c2c2"
-        app:indicatorUnselectedSrc="#df0000"
-        app:orientation="horizontal"
-        app:speedPerPixelMillisecond="0.8"
-        tools:layout_editor_absoluteY="0dp"
-        tools:ignore="MissingConstraints" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -34,72 +34,105 @@
     <!--德合的取件按钮隐藏-->
 
 
-    <TextView
-        android:id="@+id/fast_take_send_bg"
-        android:layout_width="120dp"
-        android:layout_height="138dp"
-        android:layout_x="181dp"
-        android:layout_y="464dp"
-        android:background="@drawable/textview_border"
-        android:gravity="center_horizontal"
-        android:paddingTop="15dp"
-        android:text="@string/fast_take_or_send"
-        android:textSize="13sp" />
+<!--    <TextView-->
+<!--        android:id="@+id/fast_take_send_bg"-->
+<!--        android:layout_width="120dp"-->
+<!--        android:layout_height="138dp"-->
+<!--        android:layout_x="181dp"-->
+<!--        android:layout_y="464dp"-->
+<!--        android:background="@drawable/textview_border"-->
+<!--        android:gravity="center_horizontal"-->
+<!--        android:paddingTop="15dp"-->
+<!--        android:text="@string/fast_take_or_send"-->
+<!--        android:textSize="13sp" />-->
 
-    <ImageView
-        android:id="@+id/serialImageView"
-        android:layout_width="263dp"
-        android:layout_height="60dp"
-        android:layout_x="46dp"
-        android:layout_y="285dp"
+<!--    <ImageView-->
+<!--        android:id="@+id/serialImageView"-->
+<!--        android:layout_width="263dp"-->
+<!--        android:layout_height="60dp"-->
+<!--        android:layout_x="46dp"-->
+<!--        android:layout_y="285dp"-->
+<!--        android:scaleType="fitXY"-->
+<!--        app:layout_constraintEnd_toEndOf="parent"-->
+<!--        app:layout_constraintHorizontal_bias="0.0"-->
+<!--        app:layout_constraintStart_toStartOf="parent"-->
+<!--        app:srcCompat="@drawable/img2" />-->
+
+    <!--    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="344dp"
+        android:layout_height="290dp"
+        android:layout_x="0dp"
+        android:layout_y="37dp"
         android:scaleType="fitXY"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/img2" />
+        app:srcCompat="@drawable/deheguizizhutu" />-->
+
+    <com.hacknife.carouselbanner.CarouselBanner
+        android:id="@+id/banner"
+        android:layout_width="339dp"
+        android:layout_height="280dp"
+        android:layout_x="0dp"
+        android:layout_y="53dp"
+        app:autoPlaying="true"
+        app:indicatorGravity="left"
+        app:indicatorSelectedSrc="#d6c2c2"
+        app:indicatorUnselectedSrc="#df0000"
+        app:orientation="horizontal"
+        app:speedPerPixelMillisecond="0.8" />
 
     <TextView
         android:id="@+id/take_btn"
-        android:layout_width="121dp"
-        android:layout_height="wrap_content"
-        android:layout_x="181dp"
-        android:layout_y="350dp"
-        android:drawableTop="@drawable/take"
+        android:layout_width="148.8dp"
+        android:layout_height="98.7dp"
+        android:layout_x="180dp"
+        android:layout_y="450dp"
+        android:background="@drawable/qujianma_qujian"
         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="121dp"
-        android:layout_height="wrap_content"
-        android:layout_x="46dp"
-        android:layout_y="350dp"
-        android:drawableTop="@drawable/jikuaidi"
+        android:layout_width="148.8dp"
+        android:layout_height="98.7dp"
+        android:layout_x="179dp"
+        android:layout_y="338dp"
+        android:background="@drawable/jikuaidi_new"
         android:gravity="center"
-        android:text="@string/express_delivery"
+
         android:textSize="15sp"
         android:textStyle="bold" />
 
     <TextView
         android:id="@+id/deliverer_btn"
-        android:layout_width="121dp"
-        android:layout_height="wrap_content"
-        android:layout_x="46dp"
-        android:layout_y="480dp"
-        android:drawableTop="@drawable/paisongyuan"
+        android:layout_width="150dp"
+        android:layout_height="31dp"
+        android:layout_x="179dp"
+        android:layout_y="557dp"
+        android:background="@drawable/paijianyuan_new"
         android:gravity="center"
-        android:text="@string/delivery"
+
         android:textSize="15sp"
         android:textStyle="bold" />
 
     <ImageView
+        android:id="@+id/fast_take_send_background"
+        android:layout_width="150.3dp"
+        android:layout_height="253.6dp"
+        android:layout_x="11dp"
+        android:layout_y="337dp"
+        android:background="@drawable/saomaqujian" />
+
+    <ImageView
         android:id="@+id/fast_take_send"
-        android:layout_width="90dp"
-        android:layout_height="90dp"
-        android:layout_x="196dp"
-        android:layout_y="500dp"
+        android:layout_width="89dp"
+        android:layout_height="91dp"
+        android:layout_x="44dp"
+        android:layout_y="410dp"
         android:background="@drawable/e_mp_qrcode_8x8_backup" />
 
     <!--    android:theme="@style/Theme.ButtonStyle.GREEN"-->

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

@@ -5,34 +5,55 @@
     android:focusable="true"
     android:focusableInTouchMode="true">
 
+
     <TextView
         android:id="@+id/timeout"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_x="285dp"
-        android:layout_y="540dp"
+        android:layout_x="271dp"
+        android:layout_y="35dp"
         android:gravity="center"
         android:textSize="22dp"
-        android:textStyle="bold"/>
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/take_text_title"
+        android:layout_width="120dp"
+        android:layout_height="40dp"
+        android:layout_x="122dp"
+        android:layout_y="40dp"
+        android:gravity="center"
+        android:text="@string/android_take"
+        android:textColor="@color/black"
+        android:textSize="16dp" />
 
     <TextView
         android:id="@+id/fast_take_send_bg1"
-        android:layout_width="160dp"
-        android:layout_height="230dp"
-        android:layout_x="19dp"
-        android:layout_y="315dp"
-        android:background="@drawable/textview_border"
+        android:layout_width="162dp"
+        android:layout_height="198dp"
+        android:layout_x="11dp"
+        android:layout_y="324dp"
+        android:background="@drawable/wxsaoma_background"
         android:gravity="center_horizontal"
         android:paddingTop="15dp"
-        android:text="@string/wx_scan_take"
+
         android:textSize="20dp" />
 
+
+    <ImageView
+        android:id="@+id/tackFlowView"
+        android:layout_width="315dp"
+        android:layout_height="70dp"
+        android:layout_x="14dp"
+        android:layout_y="544dp"
+        android:background="@drawable/quchuliucheng" />
+
     <ImageView
         android:id="@+id/textView"
-        android:layout_width="134dp"
-        android:layout_height="135dp"
-        android:layout_x="33dp"
-        android:layout_y="374dp"
+        android:layout_width="141dp"
+        android:layout_height="143dp"
+        android:layout_x="21dp"
+        android:layout_y="368dp"
         android:background="@drawable/e_mp_qrcode_8x8_backup" />
 
     <TextView
@@ -160,13 +181,13 @@
         android:id="@+id/return_btn"
         android:layout_width="80dp"
         android:layout_height="30dp"
-        android:layout_x="32dp"
-        android:layout_y="550dp"
-        android:background="@drawable/return1" />
+        android:layout_x="10dp"
+        android:layout_y="44dp"
+        android:background="@drawable/back_btn" />
 
     <TextView
         android:id="@+id/take_input_button0"
-        android:layout_width="48dp"
+        android:layout_width="81.5dp"
         android:layout_height="30dp"
         android:layout_x="182dp"
         android:layout_y="470dp"
@@ -182,9 +203,9 @@
         android:layout_height="30dp"
         android:layout_x="182dp"
         android:gravity="center"
-        android:background="@drawable/confirm_button"
+        android:background="@drawable/lijiqujian"
         android:layout_y="501dp"
-        android:text="@string/confirm_btn"
+
         android:textSize="10dp"
         android:textColor="@color/black" />