From 77d1ac2ecef62954e357645f5f3ff57bbceae7c0 Mon Sep 17 00:00:00 2001 From: itgaojian Date: Mon, 20 Feb 2023 09:48:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/retrofit_net/BaseUrlApi.java | 6 ++--- .../core/widget/base/BaseActivity.java | 2 +- .../activitys/news/NewsPdfActivity.java | 2 +- .../fragments/MineMainFragment.java | 9 ++++--- .../activitys/GoodsDetailActivity.java | 24 +++++++++++++++---- .../activitys/OrderConfirmActivity.java | 2 +- 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java index ec14dac..1dba1d2 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java @@ -17,10 +17,10 @@ public class BaseUrlApi { public static final String IP = "https://www.xzszwhy.cn/usercenter/";/* 正式IP */ // public static final String BASE_SYSTEM_IP = "http://192.168.0.115:8082/"; public static final String BASE_SYSTEM_IP = "http://v3.xzszwhy.cn/xzszwhy/"; -// public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/"; + // public static final String BASE_SYSTEM_IP = "https://www.xzszwhy.cn/"; // public static final String IP = "http://192.168.0.113:7001/usercenter/";/* 测试IP */ public static final String PROJECT_NAME = "app/"; - public static final String BASE_URL = IP; + public static final String BASE_URL = BASE_SYSTEM_IP; public static final int PHOTO_REQUEST = 233; public static final int VIDEO_REQUEST_ALBUM = 77; public static final int VIDEO_REQUEST_CAMERA = 88; @@ -80,7 +80,7 @@ public class BaseUrlApi { public static final String BASE_VOLUNTEER_IMG_URL = BASE_VOLUNTEER_IP + "route/file/download/true/"; public static final String BASE_NEWS_IMG_URL = BASE_NEWS_IP + "route/file/download/true/"; public static final String BASE_LIVE_IMG_IP = BASE_LIVE_IP + "route/file/download/true/"; - public static final String BASE_IMG_URL = IP + "route/file/download/true/"; + public static final String BASE_IMG_URL = BASE_SYSTEM_IP + "route/file/download/true/"; public static final String BASE_SHOP_IMG_URL = BASE_SHOP_IP + "/route/file/download/true/"; public static final String BASE_LEGACY_IMG_URL = BASE_LEGACY_IP + "route/file/download/true/"; diff --git a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java index 02d20e2..7cbd524 100755 --- a/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java +++ b/cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java @@ -621,7 +621,7 @@ public abstract class BaseActivity extends AppCompatActivity { /** * 是否登录 * - * @return + * @return true 已经登录 false 未登录 */ protected boolean isLogin() { return !TextUtils.isEmpty(UserLgUtils.getToken()); diff --git a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java index bf17efb..5c678b6 100755 --- a/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java +++ b/modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java @@ -40,7 +40,7 @@ public class NewsPdfActivity extends BaseActivity { refreshView(STATE_LOAD_LOADING); String absolutePath = getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath() + File.separator + System.currentTimeMillis() + ".pdf"; - InputParameter parameter = new InputParameter.Builder(BaseUrlApi.IP, url, absolutePath).setCallbackOnUiThread(true).build(); + InputParameter parameter = new InputParameter.Builder(BaseUrlApi.BASE_SYSTEM_IP, url, absolutePath).setCallbackOnUiThread(true).build(); DownloadUtil.getInstance() .downloadFile(parameter, new DownloadListener() { @Override diff --git a/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java b/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java index 51c558b..9bab747 100755 --- a/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java +++ b/modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java @@ -174,13 +174,16 @@ public class MineMainFragment extends BaseFragment { pagePath = PathConfig.PATH_MODULE_CULTURAL_ACTIVITY_SHARE_MINE_LIST; break; case "收货地址": - pagePath= PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_ADDRESS; + pagePath = PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_ADDRESS; break; case "购物车": - pagePath=PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_CAR; + pagePath = PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_CAR; break; case "我的商城订单": - pagePath=PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER; + pagePath = PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_MINE_ORDER; + break; + case "我的场馆订单": + pagePath = PathConfig.PATH_MODULE_PLACE_ORDER; break; } ARouter.getInstance() diff --git a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java index e997d92..fa6a216 100644 --- a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java +++ b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java @@ -154,10 +154,26 @@ public class GoodsDetailActivity extends BaseActivity { mTvGoodsStock.setText("库存:" + b.getGoodsItemTotal()); mStandardAdapter.setSelPos(p); }); - mTvAddCar.setOnClickListener(v -> addToCar(mCurrentBean)); - mLlCar.setOnClickListener(v -> ARouter.getInstance() - .build(PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_CAR) - .navigation()); + mTvAddCar.setOnClickListener(v -> { + if (isLogin()) { + addToCar(mCurrentBean); + } else { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_MAIN_LOGIN) + .navigation(); + } + }); + mLlCar.setOnClickListener(v -> { + if (isLogin()) { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_SHOP_ACTIVITY_SHOP_CAR) + .navigation(); + } else { + ARouter.getInstance() + .build(PathConfig.PATH_MODULE_MAIN_LOGIN) + .navigation(); + } + }); } private void parserShopCar() { diff --git a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java index ec351f5..407392c 100644 --- a/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java +++ b/moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java @@ -174,7 +174,7 @@ public class OrderConfirmActivity extends BaseActivity { for (int i = 0; i < mDatas.size(); i++) { price += (mDatas.get(i).getCarAmount() * mDatas.get(i).getGoodsPrice()); } - mTvPrice.setText(price + ""); + mTvPrice.setText("¥ " + price + ""); } @Override