gaojian/xz_cultural
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面调整

Browse Source
This commit is contained in:
itgaojian 2023-02-20 09:48:03 +08:00
parent 6601b30cfe
commit 77d1ac2ece
6 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/retrofit_net/BaseUrlApi.java
View File

@ -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/";

2
cm_utils/src/main/java/com/sucstepsoft/cm_utils/core/widget/base/BaseActivity.java
View File

@ -621,7 +621,7 @@ public abstract class BaseActivity extends AppCompatActivity {
/**
* 是否登录
*
* @return
* @return true 已经登录 false 未登录
*/
protected boolean isLogin() {
return !TextUtils.isEmpty(UserLgUtils.getToken());

2
modulemain/src/main/java/com/tengshisoft/mudulemain/cultural/activitys/news/NewsPdfActivity.java
View File

@ -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

9
modulemine/src/main/java/com/tengshisoft/modulemine/fragments/MineMainFragment.java
View File

@ -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()

24
moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/GoodsDetailActivity.java
View File

@ -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() {

2
moduleshop/src/main/java/com/tenlionsoft/moduleshop/activitys/OrderConfirmActivity.java
View File

@ -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