diff --git a/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java b/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java index 96f59aa..8a24f51 100644 --- a/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java +++ b/app/src/main/java/com/hbl/lewan/IMUIKitConfig.java @@ -16,10 +16,10 @@ public class IMUIKitConfig { public static String LOC_COUNTRY_CODE = "loc_country_code"; - public static String RBCHAT_PRIVACY_CN_URL = "https://download.hnsdl.com/userAgreement.html?v=" + System.currentTimeMillis(); - public static String RBCHAT_SERVICE_CN_URL = "https://download.hnsdl.com/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议 + public static String RBCHAT_PRIVACY_CN_URL = "https://download.bijr3t.com/userAgreement.html?v=" + System.currentTimeMillis(); + public static String RBCHAT_SERVICE_CN_URL = "https://download.bijr3t.com/serviceAgreement.html?v=" + System.currentTimeMillis(); //服务协议 - public static String MIANMI_AGREEMENT_CN_URL = "https://download.hnsdl.com/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议 + public static String MIANMI_AGREEMENT_CN_URL = "https://download.bijr3t.com/nopwdAgreement.html?v=" + System.currentTimeMillis(); //免密协议 public static String SUBSTATIONID = ApiService.SUBSTATIONID; @@ -36,19 +36,19 @@ public class IMUIKitConfig { /** * 支付地址 */ - public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://admin.hnsdl.com/#/appPay" : "https://admin-test.hnsdl.com/#/appPay"; -// public static String ONLINE_PAYMENT_URL = "https://admin.hnsdl.com/#/appPay"; + public static String ONLINE_PAYMENT_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://admin.bijr3t.com/#/appPay" : "https://admin-test.bijr3t.com/#/appPay"; +// public static String ONLINE_PAYMENT_URL = "https://admin.bijr3t.com/#/appPay"; /** * 分享落地页行动码地址 */ // public static String SHARE_INVCODE = "http://qtalk666.top/#/download?code=%s"; - public static String SHARE_INVCODE = "https://admin.hnsdl.com/#/downLoad?code=%s&userId=%s"; - public static String SHARE_INVCODEGROUP = "https://admin.hnsdl.com/#/downLoad?code=%s&teamId=%s"; - public static String SHARE_INVCODEGROUP1 = "https://admin.hnsdl.com/#/downLoad?teamId=%s"; + public static String SHARE_INVCODE = "https://admin.bijr3t.com/#/downLoad?code=%s&userId=%s"; + public static String SHARE_INVCODEGROUP = "https://admin.bijr3t.com/#/downLoad?code=%s&teamId=%s"; + public static String SHARE_INVCODEGROUP1 = "https://admin.bijr3t.com/#/downLoad?teamId=%s"; - public static String SHARE_INVCODE1 = "https://admin.hnsdl.com/#/downLoad?userId=%s"; - public static String SHARE_INVCODE_START = "https://admin.hnsdl.com/#/downLoad"; + public static String SHARE_INVCODE1 = "https://admin.bijr3t.com/#/downLoad?userId=%s"; + public static String SHARE_INVCODE_START = "https://admin.bijr3t.com/#/downLoad"; /*** * 分享用户ID 行动码 @@ -126,7 +126,7 @@ public class IMUIKitConfig { * 娃娃机地址 */ // public static String WAWAJ_PATH =ApiService.URL.equals("https://api.letschat2023.com/")?"https://toy.letschat2023.com/#/?authorizeCode=":"http://toy.newsclub666.com/#/?authorizeCode="; - public static String WAWAJ_PATH = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://toy.letschat2023.com/#/" : "https://toy-test.letschat2023.com/#/"; + public static String WAWAJ_PATH = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://toy.letschat2023.com/#/" : "https://toy-test.letschat2023.com/#/"; /** * 银币商城 @@ -140,24 +140,24 @@ public class IMUIKitConfig { /** * 银币商城 */ - public static String YINBI_PATH = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://shop.hnsdl.com/#/" : "https://shop.hnsdl.com/"; + public static String YINBI_PATH = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://shop.bijr3t.com/#/" : "https://shop.bijr3t.com/"; /** * 商户管理 */ - public static String MERCHANT_URL = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://biz.letschat2023.com/#/pages/owner/index" : "https://biz-test.letschat2023.com/#/pages/owner/index"; + public static String MERCHANT_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://biz.letschat2023.com/#/pages/owner/index" : "https://biz-test.letschat2023.com/#/pages/owner/index"; /** * 商户 用户 */ - public static String MERCHANT_USER_URL = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://biz.letschat2023.com/#/" : "https://biz-test.letschat2023.com/#/"; + public static String MERCHANT_USER_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://biz.letschat2023.com/#/" : "https://biz-test.letschat2023.com/#/"; /** * 兑换积分 */ - public static String SILVER_URL = ApiService.URL.equals("https://api.hnsdl.com/") ? "https://shop.hnsdl.com/#/pages/scanexchange/index?tagCode=" : "https://shop-test.hnsdl.com/#/pages/scanexchange/index?tagCode="; -// public static String SILVER_URL = "https://shop.hnsdl.com/#/pages/scanexchange/index?tagCode="; + public static String SILVER_URL = ApiService.URL.equals("https://api.bijr3t.com/") ? "https://shop.bijr3t.com/#/pages/scanexchange/index?tagCode=" : "https://shop-test.bijr3t.com/#/pages/scanexchange/index?tagCode="; +// public static String SILVER_URL = "https://shop.bijr3t.com/#/pages/scanexchange/index?tagCode="; // public static String SILVER_URL ="http://192.168.8.200:8080/#/pages/scanexchange/index?tagCode=" ; diff --git a/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java b/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java index 85e7b43..777e38a 100644 --- a/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java +++ b/app/src/main/java/com/hbl/lewan/game/JsBridgeActivity.java @@ -1650,7 +1650,7 @@ public class JsBridgeActivity extends BaseActivity { //{"scheme":"time_go_mm://payment_bead/","userId":"10","value":"388a762b474f944b"} String scheme = qrData.getScheme(); if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } } diff --git a/app/src/main/java/com/hbl/lewan/main/MainActivity.java b/app/src/main/java/com/hbl/lewan/main/MainActivity.java index a63abf2..6274ccf 100644 --- a/app/src/main/java/com/hbl/lewan/main/MainActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/MainActivity.java @@ -973,7 +973,7 @@ public class MainActivity extends BaseActivity { break; default: if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // showErrCode(getString(R.string.qrcode_scan_activity_not_surpport_qrcontent)); diff --git a/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java b/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java index 4e23a9e..169ef8c 100644 --- a/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/index/add/AddFriendsActivity.java @@ -593,7 +593,7 @@ public class AddFriendsActivity extends LllChatBaseActivity { default: if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { Intent intentweb = new Intent(Intent.ACTION_VIEW); @@ -612,7 +612,7 @@ public class AddFriendsActivity extends LllChatBaseActivity { } } else { if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true)); diff --git a/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java b/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java index 43854ae..4d615af 100644 --- a/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java +++ b/app/src/main/java/com/hbl/lewan/main/mine/UserInfoActivity.java @@ -379,7 +379,7 @@ public class UserInfoActivity extends BaseActivity { // break; default: if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true)); @@ -397,7 +397,7 @@ public class UserInfoActivity extends BaseActivity { } } else { if (scheme.startsWith("http")) { - if (scheme.startsWith("https://admin.hnsdl.com/") && scheme.contains("deviceId")) { + if (scheme.startsWith("https://admin.bijr3t.com/") && scheme.contains("deviceId")) { sendMachine(scheme); } else { // activity.startActivity(IntentFactory.createCommonWebActivity2Intent(activity, scheme, "", true)); diff --git a/app/src/main/res/drawable/shape_dialog_bg2.xml b/app/src/main/res/drawable/shape_dialog_bg2.xml index 8fd9f84..ebe8a69 100644 --- a/app/src/main/res/drawable/shape_dialog_bg2.xml +++ b/app/src/main/res/drawable/shape_dialog_bg2.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_send_red_packet.xml b/app/src/main/res/layout/activity_send_red_packet.xml index 026a532..1c113aa 100644 --- a/app/src/main/res/layout/activity_send_red_packet.xml +++ b/app/src/main/res/layout/activity_send_red_packet.xml @@ -24,7 +24,7 @@ diff --git a/app/src/main/res/layout/fragment_home_new.xml b/app/src/main/res/layout/fragment_home_new.xml index 7bb5c0c..0264718 100644 --- a/app/src/main/res/layout/fragment_home_new.xml +++ b/app/src/main/res/layout/fragment_home_new.xml @@ -22,7 +22,7 @@ + android:background="#F2F2F2"> #FFFDF6 #ff2b2b #ffe49c - #FFFAFA + #F2F2F2 #3D3D3D #fff5f5 #80000000 #4d000000 #F6F8FD #2E7DF3 - #fdf6f6 + #F2F2F2 #4c4b4b #403D51 #D4AB90 diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/ChatKitUIConstant.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/ChatKitUIConstant.java index 10d5d2c..70a7dba 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/ChatKitUIConstant.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/ChatKitUIConstant.java @@ -42,7 +42,7 @@ public class ChatKitUIConstant { /** * 订单详情 */ - public static String ORDERDETAILS_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/pages/payother/order?" : "https://shop-test.hnsdl.com/#/pages/payother/order?"; + public static String ORDERDETAILS_URL = ApiService.URL.equals("https://api.letschat2023.com/") ? "https://shop.letschat2023.com/#/pages/payother/order?" : "https://shop-test.bijr3t.com/#/pages/payother/order?"; // 合并转发消息数量限制 diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/ChatDataUtils.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/ChatDataUtils.java index 03d8ec0..4d1126b 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/ChatDataUtils.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/common/ChatDataUtils.java @@ -61,6 +61,13 @@ public class ChatDataUtils { return nameSetting.getBoolean(key, defaultValue); } + /** + * @param @param key 要获取的key + */ + public static long getLong(Context context, String key, long defaultValue) { + SharedPreferences nameSetting = getConfigShared(context); + return nameSetting.getLong(key, defaultValue); + } /** * @param key 要设置的key */ @@ -70,7 +77,15 @@ public class ChatDataUtils { namePref.putBoolean(key, is); namePref.commit(); } - + /** + * @param key 要设置的key + */ + public static void setLong(Context activity, String key, long is) { + SharedPreferences nameSetting = getConfigShared(activity); + SharedPreferences.Editor namePref = nameSetting.edit(); + namePref.putLong(key, is); + namePref.commit(); + } public static SharedPreferences getConfigShared(Context context) { if (context == null) { diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/ChatBusinessViewHolder.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/ChatBusinessViewHolder.java index cefa0ee..943666e 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/ChatBusinessViewHolder.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/ChatBusinessViewHolder.java @@ -66,37 +66,6 @@ public class ChatBusinessViewHolder extends FunChatBaseMessageViewHolder { String name = message.getMessageData().getMessage().getAttachStr(); BusinessShareBean circleShareBean = GsonUtils.getObjFromJSON(name, BusinessShareBean.class); Log.i("名片", "名片获取到的数据0:" + GsonUtils.beanToJSONString(circleShareBean)); -// Log.i("名片","名片获取到的数据2:"+message.getMessageData().getMessage().getSessionId()); -// if (currentMessage.getMessageData().getMessage().getSessionType() == SessionTypeEnum.Team) { -// teamId = currentMessage.getMessageData().getMessage().getSessionId(); -// NIMClient.getService(TeamService.class).searchTeam(teamId).setCallback(new RequestCallback() { -// @Override -// public void onSuccess(Team result) { -// teamOwnerId = teamInfo.getCreator(); -// if (!TextUtils.isEmpty(teamInfo.getExtension())) { -// extensionBean = GsonUtils.getObjFromJSON(teamInfo.getExtension(), TeamExtensionBean.class); -// if (extensionBean == null) { -// extensionBean = new TeamExtensionBean(Integer.parseInt(teamInfo.getExtension()), 1); -// } -// } else { -// extensionBean = new TeamExtensionBean(1, 1); -// } -// isAllowAdd = extensionBean.getAllowAddFriends(); -// } -// -// @Override -// public void onFailed(int code) { -// -// } -// -// @Override -// public void onException(Throwable exception) { -// -// } -// }); -// } else { -// teamId = ""; -// } if (message.getMessageData().getMessage().getFromAccount().equals(IMKitClient.account())) { binding.bigLy.setBackgroundResource(R.drawable.fun_message_send_bg); binding.userNameTv.setTextColor(binding.bigLy.getResources().getColor(R.color.color_white)); @@ -116,27 +85,24 @@ public class ChatBusinessViewHolder extends FunChatBaseMessageViewHolder { binding.cavIcon.setData(circleShareBean.data.getAvatar(), circleShareBean.data.getName()); } binding.userNameTv.setText(circleShareBean.data.getName()); -// binding.bigLy.setOnClickListener(v -> { -// //如果是群,且群不允许群内添加好友 当前登录用户不是群主,以及userid 也不是群主 直接跳过 + binding.bigLy.setOnClickListener(v -> { + //如果是群,且群不允许群内添加好友 当前登录用户不是群主,以及userid 也不是群主 直接跳过 // if (!TextUtils.isEmpty(teamId) && isAllowAdd == 0 && // !IMKitClient.getUserInfo().getAccount().equals(teamOwnerId) && // !circleShareBean.data.getAccout().equals(teamOwnerId)) { // return; // } -// XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE) -// .withContext(binding.bigLy.getContext()) -// .withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, circleShareBean.data.getAccout()) -// .withParam("isGroup", currentMessage.getMessageData().getMessage().getSessionType().getValue() != SessionTypeEnum.P2P.getValue()) -// .withParam("userId", circleShareBean.data.getAccout()) -// .withParam("teamId", teamId) -// .navigate(); -// }); - - + XKitRouter.withKey(RouterConstant.PATH_USER_INFO_PAGE) + .withContext(binding.bigLy.getContext()) + .withParam(RouterConstant.KEY_ACCOUNT_ID_KEY, circleShareBean.data.getAccout()) + .withParam("isGroup", currentMessage.getMessageData().getMessage().getSessionType().getValue() != SessionTypeEnum.P2P.getValue()) + .withParam("userId", circleShareBean.data.getAccout()) + .withParam("teamId", teamId) + .navigate(); + }); } catch (Exception e) { e.printStackTrace(); } - } } diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java index f3f0219..2603ce6 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/custom/RedPacketViewHolder.java @@ -139,7 +139,6 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { if (!message.getMessageData().getMessage().getFromAccount().equals(IMKitClient.account())) { baseViewBinding.otherUserAvatar.setVisibility(View.VISIBLE); } - binding.bigLy.setOnClickListener(v -> { if (!circleShareBean.data.getSenderUid().equals(IMKitClient.account())) { @@ -186,9 +185,10 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { actionDialog.show(); } - + RedpacketGroupBean redpacketGroupBean; private void getRedInfo(RedpacketBean1 data, RedpacketViewheadBinding binding, ChatMessageBean message, boolean isTopRed) { Log.i("名片", "名片获取到的数据4:" + data.getGroupId()); //兼容ios + if (TextUtils.isEmpty(data.getGroupId())||data.getGroupId().equals("(null)")) { Api.getInstance().redPacketInfo(data.getId() + "") .subscribeOn(Schedulers.io()) @@ -214,6 +214,15 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { }); } else { + //请求不要太频繁 没意义 限流 + if(!isTiaoZhuan&&System.currentTimeMillis()-ChatDataUtils.getLong(binding.bigLy.getContext(), "redpacktime_" + data.getId(), 0) < 10*1000&&redpacketGroupBean!=null){ + RedpacketBean1 redpacketBean1 = RedpacketBean1.getRedpacket(redpacketGroupBean); + if(!TextUtils.isEmpty(data.getReceiverUid())){ + redpacketBean1.setReceiverUid(data.getReceiverUid()); + } + changeInfo(redpacketBean1, binding, message, null, redpacketGroupBean); + return; + } if(data.getCoinType().equals("2")){ Api.getInstance().redGroupGiftPacketInfo(data.getId() + "") .subscribeOn(Schedulers.io()) @@ -222,6 +231,8 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { @Override public void onSuccess(Result feedbackResp) { + ChatDataUtils.setLong(binding.bigLy.getContext(), "redpacktime_" + feedbackResp.data.getId(), System.currentTimeMillis()); + ChatDataUtils.set(binding.bigLy.getContext(), "redpack_" + feedbackResp.data.getId(), feedbackResp.data.getStatus()); if (isTopRed && feedbackResp.data.getStatus() > 0) RxBus.getInstance().post(new RxHongBaoBean(feedbackResp.data.getId() + "")); @@ -255,6 +266,8 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { @Override public void onSuccess(Result feedbackResp) { + ChatDataUtils.setLong(binding.bigLy.getContext(), "redpacktime_" + feedbackResp.data.getId(), System.currentTimeMillis()); + ChatDataUtils.set(binding.bigLy.getContext(), "redpack_" + feedbackResp.data.getId(), feedbackResp.data.getStatus()); if (isTopRed && feedbackResp.data.getStatus() > 0) RxBus.getInstance().post(new RxHongBaoBean(feedbackResp.data.getId() + "")); @@ -263,6 +276,7 @@ public class RedPacketViewHolder extends ChatBaseMessageViewHolder { redpacketBean1.setReceiverUid(data.getReceiverUid()); } changeInfo(redpacketBean1, binding, message, null, feedbackResp.data); + redpacketGroupBean = feedbackResp.data; if(feedbackResp.data.getType() == 2){ binding.mingpianTv.setText("专属红包"); } diff --git a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java index 4277ffb..04b8eba 100644 --- a/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java +++ b/chatkit-ui/src/main/java/com/netease/yunxin/kit/chatkit/ui/network/ApiService.java @@ -39,7 +39,7 @@ import retrofit2.http.QueryMap; public interface ApiService { // String URL_BASE="47.242.235.9"; - String URL="http://192.168.110.6:8003/"; +// String URL="http://192.168.110.6:8003/"; // String URL1="http://"+ ApiService.URL; // String URL= BuildConfig.HTTP_BASE_URL; @@ -49,13 +49,13 @@ public interface ApiService { /** * 正式环境 */ -// String URL = "https://api.hnsdl.com/"; + String URL = "http://api.bijr3t.com/"; /** * 测试环境 */ // String URL = "https://api-test.letschat2023.com/"; -// String URL = "https://api-test.hnsdl.com/"; +// String URL = "https://api-test.bijr3t.com/"; String SUBSTATIONID = "1703655363476242434"; diff --git a/chatkit-ui/src/main/res-fun/layout/fun_chat_view.xml b/chatkit-ui/src/main/res-fun/layout/fun_chat_view.xml index 57b231d..68d608d 100644 --- a/chatkit-ui/src/main/res-fun/layout/fun_chat_view.xml +++ b/chatkit-ui/src/main/res-fun/layout/fun_chat_view.xml @@ -9,6 +9,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="#F2F2F2" android:orientation="vertical"> - + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b6fc91d..82dcb5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,5 +31,9 @@ android.nonTransitiveRClass=true android.enableJetifier=true android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.configureondemand=true + #android.overridePathCheck=false #android.suppressUnsupportedCompileSdk=34 #??????sdk??