diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 0d498f0..2266b30 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,9 +4,8 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 447200d..8b45b7e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/build.gradle b/app/build.gradle index ff37ba3..df7cb57 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,8 +34,8 @@ android { applicationId "com.oneclouds.cargo" minSdkVersion 23 targetSdkVersion 30 - versionCode 27 - versionName "3.0.7" + versionCode 29 + versionName "3.0.9" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/release/dhhy-cargo-0830_17-18-3.0.7.apk b/app/release/dhhy-cargo-0830_17-18-3.0.7.apk deleted file mode 100644 index d6dbd92..0000000 Binary files a/app/release/dhhy-cargo-0830_17-18-3.0.7.apk and /dev/null differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 767cfc5..aca089b 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -10,9 +10,9 @@ { "type": "SINGLE", "filters": [], - "versionCode": 27, - "versionName": "3.0.7", - "outputFile": "dhhy-cargo-0830_17-18-3.0.7.apk" + "versionCode": 28, + "versionName": "3.0.8", + "outputFile": "dhhy-cargo-0425_09-46-3.0.8.apk" } ] } \ No newline at end of file diff --git a/app/src/main/java/com/oneclouds/cargo/request/bean/OrderInputBean.java b/app/src/main/java/com/oneclouds/cargo/request/bean/OrderInputBean.java index ecfcf97..acebfb8 100644 --- a/app/src/main/java/com/oneclouds/cargo/request/bean/OrderInputBean.java +++ b/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; } diff --git a/app/src/main/java/com/oneclouds/cargo/ui/LoginActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/LoginActivity.java index 93d8740..9f52ad2 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/LoginActivity.java +++ b/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 -> { - 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; - + llCheck.setOnClickListener(v -> { + if (cbLog.isChecked()){ + cbLog.setChecked(false); + }else{ + cbLog.setChecked(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); diff --git a/app/src/main/java/com/oneclouds/cargo/ui/MainActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/MainActivity.java index d43e77c..8a8a165 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/MainActivity.java +++ b/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[] img1={R.mipmap.tab1_s, R.mipmap.tab2_s, R.mipmap.waybill_s, R.mipmap.tab3_s}; + private int[] img0={R.mipmap.tab1, R.mipmap.waybill, R.mipmap.tab2, R.mipmap.tab3}; + 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[2]=new WayBillsFragment(); + fs[1]=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); - if (!fs[2].isAdded()) { -// bt.hide(fs[bt.getIndex()]); - getSupportFragmentManager().beginTransaction().hide(fs[bt.getIndex()]).add(R.id.body,fs[2],"").commitAllowingStateLoss(); - }else{ - getSupportFragmentManager().beginTransaction().hide(fs[0]).show(fs[2]).commitAllowingStateLoss(); - } - bt.setIndex(2); + switch_box(1); +// switch_image(bt.getIndex(),1); +// if (!fs[1].isAdded()) { +//// bt.hide(fs[bt.getIndex()]); +// getSupportFragmentManager().beginTransaction().hide(fs[bt.getIndex()]).add(R.id.body,fs[1],"").commitAllowingStateLoss(); +// }else{ +// getSupportFragmentManager().beginTransaction().hide(fs[0]).show(fs[1]).commitAllowingStateLoss(); +// } +// bt.setIndex(2); // bt.hide(fs[0]); // bt.selectItem(fs[2]); diff --git a/app/src/main/java/com/oneclouds/cargo/ui/WelcomeActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/WelcomeActivity.java index 16a0572..6fbd0da 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/WelcomeActivity.java +++ b/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", -// "privateUrl":"http://agreement.dahehuoyun.com/#/private", -// "securityUrl":"http://agreement.dahehuoyun.com/#/security", -// "serviceMobile":"18638298513","shipperPrivateUrl": -// "http://agreement.dahehuoyun.com/#/shipper/private", -// "startImageUrl":"","userUrl":"http://agreement.dahehuoyun.com/#/user"}, -// "msg":"","res":0,"success":true} + Glide.with(con) + .load(SPUtils.getPreWelPic(this)) + .placeholder(startImageUrl.getDrawable()) + .error(R.drawable.welcome_bg_default) + .into(startImageUrl); } 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 diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/DisCarActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/home/DisCarActivity.java index 08389ac..cf98f22 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/home/DisCarActivity.java +++ b/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 event = new BaseEvent<>(); diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/GoodsActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/home/GoodsActivity.java index ca8354c..8e3bf67 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/home/GoodsActivity.java +++ b/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(); diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/GoodsDischargeActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/home/GoodsDischargeActivity.java index bdeec2c..14474de 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/home/GoodsDischargeActivity.java +++ b/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(); diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java b/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java index fedd9a4..279c8f9 100644 --- a/app/src/main/java/com/oneclouds/cargo/ui/home/HomeFragment.java +++ b/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() diff --git a/app/src/main/java/com/oneclouds/cargo/util/SPUtils.java b/app/src/main/java/com/oneclouds/cargo/util/SPUtils.java new file mode 100644 index 0000000..3d8d439 --- /dev/null +++ b/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,""); + } + +} diff --git a/app/src/main/res/drawable-xxhdpi/log_nor.png b/app/src/main/res/drawable-xxhdpi/log_nor.png new file mode 100644 index 0000000..7846c0c Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/log_nor.png differ diff --git a/app/src/main/res/drawable-xxhdpi/log_sel.png b/app/src/main/res/drawable-xxhdpi/log_sel.png new file mode 100644 index 0000000..5e7b2e3 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/log_sel.png differ diff --git a/app/src/main/res/drawable/select_log.xml b/app/src/main/res/drawable/select_log.xml new file mode 100644 index 0000000..5a9eab9 --- /dev/null +++ b/app/src/main/res/drawable/select_log.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index dfdce2c..2408d11 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -101,13 +101,32 @@ android:layout_height="@dimen/dp_1" android:background="#F2F2F2"/> + + + + + + + + android:src="@mipmap/waybill" /> @@ -90,7 +90,7 @@ android:layout_gravity="center" android:background="@null" android:scaleType="fitXY" - android:src="@mipmap/waybill" /> + android:src="@mipmap/tab2" /> diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml index b26582d..2ea879c 100644 --- a/app/src/main/res/layout/fragment_wallet.xml +++ b/app/src/main/res/layout/fragment_wallet.xml @@ -183,6 +183,7 @@ --> diff --git a/app/src/main/res/layout/huoyuan_bottom.xml b/app/src/main/res/layout/huoyuan_bottom.xml index 2d942c7..f66b0ad 100644 --- a/app/src/main/res/layout/huoyuan_bottom.xml +++ b/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"/>