29版

.idea/gradle.xml

@@ -4,9 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -14,6 +13,7 @@
             <option value="$PROJECT_DIR$/mylibrary" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -35,6 +34,7 @@
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/activity_order_details_all.xml" value="0.2203125" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/activity_order_list.xml" value="0.32916666666666666" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/activity_search_address.xml" value="0.159375" />
+        <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/activity_weclome.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/assembly_title_block.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/fragment_huoyuan.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/fragment_order_list.xml" value="0.1" />
@@ -44,6 +44,7 @@
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/huoyuan_centent_loading_info.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/huoyuan_content.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/huoyuan_input_car.xml" value="0.36614583333333334" />
+        <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/item_address.xml" value="0.23385416666666667" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/item_cargo.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/item_node_dis.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/item_node_pretend.xml" value="0.36614583333333334" />
@@ -53,6 +54,7 @@
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/order_details_loading_all.xml" value="0.2203125" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/order_item.xml" value="0.36614583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/order_list_top.xml" value="0.25416666666666665" />
+        <entry key="..\:/goodluckapp/dhhy-cargo/app/src/main/res/layout/order_time.xml" value="0.24739583333333334" />
         <entry key="..\:/goodluckapp/dhhy-cargo/mylibrary/src/main/res/layout/common_toolbar.xml" value="0.36614583333333334" />
       </map>
     </option>

app/build.gradle

@@ -34,8 +34,8 @@ android {
         applicationId "com.oneclouds.cargo"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 27
+        versionCode 29
-        versionName "3.0.7"
+        versionName "3.0.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 27,
+      "versionCode": 28,
-      "versionName": "3.0.7",
+      "versionName": "3.0.8",
-      "outputFile": "dhhy-cargo-0830_17-18-3.0.7.apk"
+      "outputFile": "dhhy-cargo-0425_09-46-3.0.8.apk"
     }
   ]
 }

app/src/main/java/com/oneclouds/cargo/request/bean/OrderInputBean.java

@@ -291,7 +291,7 @@ public class OrderInputBean {
             private String name;
             private String num;
             private String packName;
-            private int price;
+            private String price;
             private String unit;
 
             public String getName() {
@@ -318,11 +318,11 @@ public class OrderInputBean {
                 this.packName = packName;
             }
 
-            public int getPrice() {
+            public String getPrice() {
                 return price;
             }
 
-            public void setPrice(int price) {
+            public void setPrice(String price) {
                 this.price = price;
             }
 
@@ -450,7 +450,7 @@ public class OrderInputBean {
             private String name;
             private String num;
             private String packName;
-            private int price;
+            private String price;
             private String unit;
 
             public String getName() {
@@ -477,11 +477,11 @@ public class OrderInputBean {
                 this.packName = packName;
             }
 
-            public int getPrice() {
+            public String getPrice() {
                 return price;
             }
 
-            public void setPrice(int price) {
+            public void setPrice(String price) {
                 this.price = price;
             }
 

app/src/main/java/com/oneclouds/cargo/ui/LoginActivity.java

@@ -11,8 +11,10 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -58,6 +60,8 @@ public class LoginActivity extends BaseActivity {
     private TimerTask tt;
     private int timer_sum = 60;
     private ImageButton agree_btn;
+    private LinearLayout llCheck;
+    private CheckBox cbLog;
     private CardView no_btn;
 
     private PublicRequest pr;
@@ -112,6 +116,8 @@ public class LoginActivity extends BaseActivity {
         getCode = findViewById(R.id.getCode);
         tvForget = findViewById(R.id.tvForget);
         agree_btn = findViewById(R.id.agree_btn);
+        llCheck = findViewById(R.id.ll_check);
+        cbLog = findViewById(R.id.cb);
         no_btn = findViewById(R.id.no_btn);
         pr = new PublicRequest(con, hd);
         initView(null);
@@ -125,17 +131,24 @@ public class LoginActivity extends BaseActivity {
     @Override
     public void initView(Object obj) {
         super.initView(obj);
-        agree_btn.setOnClickListener(v -> {
+        llCheck.setOnClickListener(v -> {
-            agree_btn.setVisibility(View.GONE);
+            if (cbLog.isChecked()){
-            no_btn.setVisibility(View.VISIBLE);
+                cbLog.setChecked(false);
-            key = false;
+            }else{
-        });
+                cbLog.setChecked(true);
-        no_btn.setOnClickListener(v -> {
+            }
-            agree_btn.setVisibility(View.VISIBLE);
-            no_btn.setVisibility(View.GONE);
-            key = true;
-
         });
+//        agree_btn.setOnClickListener(v -> {
+//            agree_btn.setVisibility(View.GONE);
+//            no_btn.setVisibility(View.VISIBLE);
+//            key = false;
+//        });
+//        no_btn.setOnClickListener(v -> {
+//            agree_btn.setVisibility(View.VISIBLE);
+//            no_btn.setVisibility(View.GONE);
+//            key = true;
+//
+//        });
         ConfigBean cb = ConfigParts.getConfigParts(con);
         if (cb != null) {
             url1 = cb.getData().getUserUrl();
@@ -213,7 +226,7 @@ public class LoginActivity extends BaseActivity {
             String code = String.valueOf(input_code.getText());
             Log.e("--code--", code);
             if (judgeFormat(phone, code)) {
-                if (key) {
+                if (cbLog.isChecked()) {
                     LoginRegInputBean lb = new LoginRegInputBean();
                     lb.setRoleId(2);
                     lb.setUserName(phone);

app/src/main/java/com/oneclouds/cargo/ui/MainActivity.java

@@ -31,8 +31,8 @@ public class MainActivity extends BaseAppCompatActivity {
     private LinearLayout[] rs=new LinearLayout[4];
     private ImageView[] ibs=new ImageView[4];
     private TextView[] title_view=new TextView[4];
-    private int[] img0={R.mipmap.tab1, R.mipmap.tab2, R.mipmap.waybill, R.mipmap.tab3};
+    private int[] img0={R.mipmap.tab1, R.mipmap.waybill, R.mipmap.tab2, R.mipmap.tab3};
-    private int[] img1={R.mipmap.tab1_s, R.mipmap.tab2_s, R.mipmap.waybill_s, R.mipmap.tab3_s};
+    private int[] img1={R.mipmap.tab1_s, R.mipmap.waybill_s, R.mipmap.tab2_s, R.mipmap.tab3_s};
     private Fragment[] fs=new Fragment[4];
     private BottomTabUtil bt;
 
@@ -45,8 +45,8 @@ public class MainActivity extends BaseAppCompatActivity {
         con=this;
         act=this;
         fs[0]=new HomeFragment();
-        fs[1]=new WalletFragment();
+        fs[1]=new WayBillsFragment();
-        fs[2]=new WayBillsFragment();
+        fs[2]=new WalletFragment();
         fs[3]=new MyFragment();
         initfindId();
         initswitch();
@@ -150,14 +150,15 @@ public class MainActivity extends BaseAppCompatActivity {
 
     @Subscribe
     public void ChangeTabEvent(ChangeTabEvent event){
-        switch_image(bt.getIndex(),2);
+        switch_box(1);
-        if (!fs[2].isAdded()) {
+//        switch_image(bt.getIndex(),1);
-//            bt.hide(fs[bt.getIndex()]);
+//        if (!fs[1].isAdded()) {
-            getSupportFragmentManager().beginTransaction().hide(fs[bt.getIndex()]).add(R.id.body,fs[2],"").commitAllowingStateLoss();
+////            bt.hide(fs[bt.getIndex()]);
-        }else{
+//            getSupportFragmentManager().beginTransaction().hide(fs[bt.getIndex()]).add(R.id.body,fs[1],"").commitAllowingStateLoss();
-            getSupportFragmentManager().beginTransaction().hide(fs[0]).show(fs[2]).commitAllowingStateLoss();
+//        }else{
-        }
+//            getSupportFragmentManager().beginTransaction().hide(fs[0]).show(fs[1]).commitAllowingStateLoss();
-        bt.setIndex(2);
+//        }
+//        bt.setIndex(2);
 
 //        bt.hide(fs[0]);
 //        bt.selectItem(fs[2]);

app/src/main/java/com/oneclouds/cargo/ui/WelcomeActivity.java

@@ -29,6 +29,7 @@ import com.oneclouds.cargo.request.manager.UrlManager;
 import com.oneclouds.cargo.ui.parts.ConfigParts;
 import com.oneclouds.cargo.util.MsgUtil;
 import com.oneclouds.cargo.util.SPUtil;
+import com.oneclouds.cargo.util.SPUtils;
 import com.oneclouds.cargo.util.titleutil.StatusBarUtil;
 import com.oneclouds.cargo.util.view.BaseAppCompatActivity;
 import com.umeng.commonsdk.UMConfigure;
@@ -107,13 +108,11 @@ public class WelcomeActivity extends BaseAppCompatActivity {
                             "http://agreement.dahehuoyun.com/#/user",hd))
                     .show();
         }
-//        {"code":200,"data":{"contractUrl":"http://agreement.dahehuoyun.com/#/transport",
+        Glide.with(con)
-//                "privateUrl":"http://agreement.dahehuoyun.com/#/private",
+                .load(SPUtils.getPreWelPic(this))
-//                "securityUrl":"http://agreement.dahehuoyun.com/#/security",
+                .placeholder(startImageUrl.getDrawable())
-//                "serviceMobile":"18638298513","shipperPrivateUrl":
+                .error(R.drawable.welcome_bg_default)
-//            "http://agreement.dahehuoyun.com/#/shipper/private",
+                .into(startImageUrl);
-//                    "startImageUrl":"","userUrl":"http://agreement.dahehuoyun.com/#/user"},
-//            "msg":"","res":0,"success":true}
     }
 
     public void initRermission(){
@@ -179,11 +178,15 @@ public class WelcomeActivity extends BaseAppCompatActivity {
 
     public void cdWelcome(String url){
         if(!url.equals("")){
-            Glide.with(con).load(url).into(startImageUrl);
+            Glide.with(con).load(url)
+                    .placeholder(startImageUrl.getDrawable())
+                    .error(R.drawable.welcome_bg_default)
+                    .into(startImageUrl);
         }else{
             Log.e("图片加载失败","获取动态启动页图片为空");
             //Toast.makeText(con,"配置项信息加载失败",Toast.LENGTH_SHORT).show();
         }
+        SPUtils.setPreWelPic(this, url);
         cd_view.setVisibility(View.VISIBLE);
         new CountDownTimer(3000,1000){
             @Override

app/src/main/java/com/oneclouds/cargo/ui/home/DisCarActivity.java

@@ -121,7 +121,7 @@ public class DisCarActivity extends BaseActivity {
             TextView tvContent = v.findViewById(R.id.tvName);
             LinearLayout llDisCar = v.findViewById(R.id.invoice_address);
 
-            tvContent.setText(o1.getCarNum()+"  "+o1.getDriverPhone());
+            tvContent.setText(o1.getDriverName()+"  "+o1.getCarNum()+"  "+o1.getDriverPhone());
             llDisCar.setOnClickListener(V->{
                 tvContent.setText("");
                 BaseEvent<CarBean> event = new BaseEvent<>();

app/src/main/java/com/oneclouds/cargo/ui/home/GoodsActivity.java

@@ -32,7 +32,7 @@ import java.util.List;
  * @author hlh
  * @version 1.0.0
  * @date 2021/9/13 20:49
- * @description:
+ * @description:装货货物信息
  */
 
 public class GoodsActivity extends BaseActivity {
@@ -137,7 +137,7 @@ public class GoodsActivity extends BaseActivity {
                     osg.setUnit("方");
                     osg.setNum(unitStr2);
                 }
-                osg.setPrice((int) Double.parseDouble(priceStr));
+                osg.setPrice(priceStr);
                 GoodsEvent msg = new GoodsEvent(new Gson().toJson(osg));
                 EventBus.getDefault().post(msg);
                 finish();

app/src/main/java/com/oneclouds/cargo/ui/home/GoodsDischargeActivity.java

@@ -29,7 +29,7 @@ import java.util.List;
  * @author hlh
  * @version 1.0.0
  * @date 2021/9/28 18:07
- * @description:
+ * @description:卸货货物信息
  */
 public class GoodsDischargeActivity extends BaseActivity {
 
@@ -161,7 +161,7 @@ public class GoodsDischargeActivity extends BaseActivity {
                                 osg.setUnit("方");
                                 osg.setNum(unitStr2);
                             }
-                            osg.setPrice((int) Double.parseDouble(priceStr));
+                            osg.setPrice(priceStr);
                             GoodsEvent msg = new GoodsEvent(new Gson().toJson(osg));
                             EventBus.getDefault().post(msg);
                             finish();

app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java

@@ -106,6 +106,7 @@ public class HomeFragment extends BaseFragment {
     private TextView money_view;
     private String url = "";
     private TextView etCar;
+    private EditText requirement;
 
     @Override
     public void msgMethod(Message m) {
@@ -369,6 +370,8 @@ public class HomeFragment extends BaseFragment {
         //是否购买运费险
         ImageButton isGoods = v.findViewById(R.id.isGoods);
         money_view = v.findViewById(R.id.money);
+        //备注
+        requirement = v.findViewById(R.id.requirement);
 
         r7.setOnClickListener(v14 -> {
             if (isLogin()) {
@@ -570,6 +573,7 @@ public class HomeFragment extends BaseFragment {
                                         () -> {
                                             oib.setIsSubmit(1);
                                             oib.getFormData().setIsSubmit(1);
+                                            oib.getFormData().setRequirement(requirement.getText().toString());
 //                                            oib.getFormData().setGoodsBigCate(4);//150
 //                                            oib.getFormData().setAlctGoodsType(150);
                                             //oib.getFormData()

app/src/main/java/com/oneclouds/cargo/util/SPUtils.java

@@ -0,0 +1,134 @@
+package com.oneclouds.cargo.util;
+
+import android.content.Context;
+
+import com.dahe.mylibrary.net.JsonUtils;
+import com.dahe.mylibrary.utils.BaseSPUtils;
+import com.oneclouds.cargo.bean.UserBean;
+
+
+public class SPUtils extends BaseSPUtils {
+
+    private static final String PRE_WEL_PIC = "PRE_WEL_PIC";
+
+    /**
+     * 存用户信息
+     *
+     * @param context
+     * @param json
+     */
+    public static void setUserInfo(Context context, String json) {
+        put(context, USER_INFO_KEY, json);
+    }
+
+    /**
+     * 拿用户信息
+     *
+     * @param context
+     */
+    public static UserBean getUserInfo(Context context) {
+        return JsonUtils.getInstance().fromJson((String) get(context, USER_INFO_KEY, ""), UserBean.class);
+    }
+
+    /**
+     * 存服务器类型
+     *
+     * @param context
+     * @param isTestService
+     */
+    public static void setNetServiceType(Context context, boolean isTestService) {
+        put(context, NET_SERVICE_TEST, isTestService);
+    }
+
+    /**
+     * 拿服务器类型
+     *
+     * @param context
+     */
+    public static boolean geNetServiceType(Context context) {
+        return (boolean) get(context, NET_SERVICE_TEST, false);
+    }
+
+    /**
+     * 存搜索数据
+     *
+     * @param context
+     * @param json
+     */
+    public static void setSearchCache(Context context, String json) {
+        put(context, SEARRH_CACHE, json);
+    }
+
+    public static String getSearchCache(Context context) {
+        return JsonUtils.getInstance().fromJson((String) get(context, SEARRH_CACHE, ""), String.class);
+    }
+
+    public static void removeSearchCache(Context context) {
+        remove(context, SEARRH_CACHE);
+    }
+
+    /**
+     * 导航偏好设置
+     */
+    public static void setNaviPreferenceCache(Context context, String json) {
+        put(context, NAVI_PH_EDIT_CACHE, json);
+    }
+
+    public static String getNaviPreferenceCache(Context context) {
+        return JsonUtils.getInstance().fromJson((String) get(context, NAVI_PH_EDIT_CACHE, ""), String.class);
+    }
+
+    public static void removeNaviPreference(Context context) {
+        remove(context, NAVI_PH_EDIT_CACHE);
+    }
+
+    //第一次登录
+    public static boolean getIsFirstOpen(Context context){
+        boolean b = (boolean) get(context, FIRST_OPEN, true);
+        return b;
+
+    }
+
+    public static void setIsFirstOpen(Context context, boolean json){
+        put(context, FIRST_OPEN, json);
+    }
+
+
+    /**
+     * 设置隐私协议是否同意
+     *
+     * @param value 是否同意
+     */
+    public static void setAgreePrivacyAgreement(Context context, boolean value) {
+        put(context, KEY_PRIVACY_AGREEMENT, value);
+    }
+
+    /**
+     * 是否同意了隐私协议
+     *
+     * @return true 已经同意；false 还没有同意
+     */
+    public static boolean hasAgreePrivacyAgreement(Context context) {
+        boolean b = (boolean) get(context, KEY_PRIVACY_AGREEMENT, false);
+        return b;
+    }
+
+    /**
+     * 保存欢迎页网络地址
+     * @param context
+     * @param url
+     */
+    public static void setPreWelPic(Context context, String url){
+        put(context,PRE_WEL_PIC,url);
+    }
+
+    /**
+     * 获取欢迎页地址
+     * @param context
+     * @return
+     */
+    public static String getPreWelPic(Context context){
+        return (String) get(context,PRE_WEL_PIC,"");
+    }
+
+}

app/src/main/res/drawable/select_log.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/log_sel" android:state_checked="true"></item>
+    <item android:drawable="@drawable/log_nor" android:state_checked="false"></item>
+    <item android:drawable="@drawable/log_nor"></item>
+</selector>

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

@@ -101,13 +101,32 @@
         android:layout_height="@dimen/dp_1"
         android:background="#F2F2F2"/>
     <LinearLayout
-        android:layout_marginLeft="@dimen/dp_20"
         android:layout_marginRight="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_12"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
+
+        <LinearLayout
+            android:id="@+id/ll_check"
+            android:paddingLeft="@dimen/dp_20"
+            android:paddingBottom="@dimen/dp_20"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <CheckBox
+                android:id="@+id/cb"
+                android:clickable="false"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:button="@null"
+                android:background="@drawable/select_log"
+                ></CheckBox>
+
+        </LinearLayout>
+
+
         <androidx.cardview.widget.CardView
+            android:visibility="gone"
             android:layout_marginTop="@dimen/dp_2"
             android:layout_width="@dimen/dp_14"
             android:layout_height="@dimen/dp_14"
@@ -116,6 +135,7 @@
             app:cardElevation="@dimen/dp_0">
         <androidx.cardview.widget.CardView
             android:id="@+id/no_btn"
+            android:visibility="gone"
             android:layout_width="@dimen/dp_12"
             android:layout_height="@dimen/dp_12"
             app:cardCornerRadius="@dimen/dp_6"

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

@@ -61,7 +61,7 @@
                 android:layout_gravity="center"
                 android:background="@null"
                 android:scaleType="fitXY"
-                android:src="@mipmap/tab2" />
+                android:src="@mipmap/waybill" />
 
             <TextView
                 android:id="@+id/title2"
@@ -69,7 +69,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="@dimen/dp_4"
-                android:text="钱包"
+                android:text="运单"
                 android:textColor="#ffc9c9c9"
                 android:textSize="@dimen/sp_12" />
         </LinearLayout>
@@ -90,7 +90,7 @@
                 android:layout_gravity="center"
                 android:background="@null"
                 android:scaleType="fitXY"
-                android:src="@mipmap/waybill" />
+                android:src="@mipmap/tab2" />
 
             <TextView
                 android:id="@+id/title3"
@@ -98,7 +98,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_marginTop="@dimen/dp_4"
-                android:text="运单"
+                android:text="钱包"
                 android:textColor="#ffc9c9c9"
                 android:textSize="@dimen/sp_12" />
         </LinearLayout>

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

@@ -183,6 +183,7 @@
                 </RelativeLayout>
 
                 <TextView
+                    android:visibility="gone"
                     android:layout_marginTop="@dimen/dp_32"
                     android:layout_marginLeft="@dimen/dp_20"
                     android:layout_width="wrap_content"
@@ -201,6 +202,7 @@
                      android:layout_marginBottom="@dimen/dp_20"/>-->
 
                 <RelativeLayout
+                    android:visibility="gone"
                     android:layout_marginTop="@dimen/dp_16"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">

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

@@ -10,7 +10,7 @@
         android:layout_marginRight="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_9"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_346"
+        android:layout_height="@dimen/dp_370"
         android:orientation="vertical"
         android:background="@mipmap/icon_huoyuan_bottom"
         android:paddingLeft="@dimen/dp_12"
@@ -417,7 +417,6 @@
             android:alpha="0.5"
             android:visibility="gone"/>
         <EditText
-            android:visibility="gone"
             android:id="@+id/requirement"
             android:paddingTop="@dimen/dp_8"
             android:paddingBottom="@dimen/dp_8"

build.gradle

@@ -2,7 +2,8 @@
 apply from: "compile.gradle"
 
 buildscript {
-    ext.kotlin_version = "1.5.0"
+//    ext.kotlin_version = "1.5.0"
+    ext.kotlin_version = "1.6.10"
     repositories {
         google()
 //        jcenter() // 这个

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Sep 23 20:04:06 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://mirrors.cloud.tencent.com/gradle/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME