From 77e631c6e9a039c6fb1aa67803af98ada3bd9b0b Mon Sep 17 00:00:00 2001 From: justinlei Date: Thu, 26 Sep 2024 11:22:21 +0800 Subject: [PATCH 1/6] adapt hm --- app/build.gradle | 2 +- .../model/direct/ConnectInfoModel.java | 2 +- app/src/main/res/values/strings.xml | 2 +- cloudphone/src/main/cpp/CasController.cpp | 2 +- cloudphone/src/main/cpp/cas_common/CasLog.cpp | 2 +- config.gradle | 2 +- gradle.properties | 19 +++++++++---------- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f5c2cf1..e0293da 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { compileSdkVersion versions.compileSdkVersion buildToolsVersion versions.buildToolsVersion defaultConfig { - applicationId "com.huawei.cloudapp.b004" + applicationId "com.huawei.cloudapp.hmos.b004" minSdkVersion versions.minSdkVersion targetSdkVersion versions.targetSdkVersion versionCode versions.versionCode diff --git a/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java b/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java index 4e41d71..3a08726 100644 --- a/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java +++ b/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java @@ -108,7 +108,7 @@ public class ConnectInfoModel implements IConnectInfoModel { String.valueOf(ConnectInfo.getAccessInfo().getAccessPort()), ConnectInfo.getAccessInfo().getSessionId(), ConnectInfo.getAccessInfo().getTicket(), - ConnectInfo.getPhoneId(), + ConnectInfo.getAccessInfo().getSessionId(), ConnectInfo.getAccessInfo().getTimestamp())); } else { CPHError rsp; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ede62b7..1867262 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - CPH-24.7.0 + CPH-HMOS CasCloudAppMainActivity GameListActivity GameListActivity2 diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp index 5086f47..1c4de23 100644 --- a/cloudphone/src/main/cpp/CasController.cpp +++ b/cloudphone/src/main/cpp/CasController.cpp @@ -39,7 +39,7 @@ const int TIMES = 8; const int FRAME_RATE_MIN = 10; const int FRAME_RATE_MAX = 60; const std::string CLIENT_TYPE = "1"; -const std::string HRTP_LOG_PATH = "/sdcard/Android/media/com.huawei.cloudapp.b004/"; +const std::string HRTP_LOG_PATH = "/sdcard/Android/media/com.huawei.cloudapp.hmos.b004/"; const uint64_t DURATION_USEC = 1000000ULL; int32_t OnRecvVideoStreamData(uint8_t* data, uint32_t length); diff --git a/cloudphone/src/main/cpp/cas_common/CasLog.cpp b/cloudphone/src/main/cpp/cas_common/CasLog.cpp index 899a3f9..bbad5ee 100644 --- a/cloudphone/src/main/cpp/cas_common/CasLog.cpp +++ b/cloudphone/src/main/cpp/cas_common/CasLog.cpp @@ -22,7 +22,7 @@ std::shared_ptr sdkLogger = nullptr; void LogToFile(int level, const char *filename, int line, const char *function, const char* msg) { if (sdkLogger == nullptr) { - sdkLogger = spdlog::rotating_logger_mt("sdk_logger", "/sdcard/Android/media/com.huawei.cloudapp.b004/sdk_log.txt", max_size, max_files); + sdkLogger = spdlog::rotating_logger_mt("sdk_logger", "/sdcard/Android/media/com.huawei.cloudapp.hmos.b004/sdk_log.txt", max_size, max_files); } switch (level) { case ANDROID_LOG_DEBUG: diff --git a/config.gradle b/config.gradle index c8bf37c..075a0e7 100644 --- a/config.gradle +++ b/config.gradle @@ -5,5 +5,5 @@ ext.versions = [ compileSdkVersion : 31, buildToolsVersion : '28.0.3', versionCode : 1, - versionName : '24.7.0', + versionName : 'HMOS_24.7.0', ] \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d546dea..ee81f5c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,16 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit +## For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -android.enableJetifier=true -android.useAndroidX=true -org.gradle.jvmargs=-Xmx1536m +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true - - +#Tue Sep 10 16:34:48 CST 2024 +org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx1536M" +android.enableJetifier=true +android.useAndroidX=true -- Gitee From 740a61b5ab6d9fec359f6e55998d748575d058bf Mon Sep 17 00:00:00 2001 From: justinlei Date: Thu, 26 Sep 2024 14:50:52 +0800 Subject: [PATCH 2/6] adapt hm --- config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.gradle b/config.gradle index 075a0e7..cf88092 100644 --- a/config.gradle +++ b/config.gradle @@ -5,5 +5,5 @@ ext.versions = [ compileSdkVersion : 31, buildToolsVersion : '28.0.3', versionCode : 1, - versionName : 'HMOS_24.7.0', + versionName : 'HMOS_24.8.1', ] \ No newline at end of file -- Gitee From 8193eb9c8dbb1a4f14a5435fcb13783554d57d61 Mon Sep 17 00:00:00 2001 From: justinlei Date: Wed, 9 Oct 2024 17:42:14 +0800 Subject: [PATCH 3/6] adapt hm --- .../ui/fragment/home/PhoneListFragment.java | 2 ++ cloudphone/src/main/cpp/CasController.cpp | 5 +++++ cloudphone/src/main/cpp/CasController.h | 2 ++ .../cpp/cas_stream/CasStreamRecvParser.cpp | 2 +- .../audio/AudioTrackerCallback.java | 19 ++++++++++++++++++- .../huawei/cloudphone/utils/CasAESUtils.java | 16 ++++++++++++---- config.gradle | 2 +- 7 files changed, 41 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/huawei/cloudapp/ui/fragment/home/PhoneListFragment.java b/app/src/main/java/com/huawei/cloudapp/ui/fragment/home/PhoneListFragment.java index b369e65..1a55b90 100644 --- a/app/src/main/java/com/huawei/cloudapp/ui/fragment/home/PhoneListFragment.java +++ b/app/src/main/java/com/huawei/cloudapp/ui/fragment/home/PhoneListFragment.java @@ -627,6 +627,7 @@ public class PhoneListFragment extends CloudPhoneFragment implements IHandleData if (mPhoneListAdapter != null && !mPhoneListAdapter.getData().isEmpty()) { mPhoneListAdapter.setNewInstance(null); } + mPosition = 0; } PhoneModel phoneModel = new PhoneModel(); PhonePresenter phonePresenter = new PhonePresenter(this, phoneModel); @@ -647,6 +648,7 @@ public class PhoneListFragment extends CloudPhoneFragment implements IHandleData PhoneModel phoneModel = new PhoneModel(); PhonePresenter phonePresenter = new PhonePresenter(this, phoneModel); phonePresenter.getPhoneDetailInfo(mUser, selectedRegion, mUser.getUserProjectId().get(selectedRegion), phoneId); + mPosition = 0; } private void restartPhone(String phoneId) { diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp index 1c4de23..db259bc 100644 --- a/cloudphone/src/main/cpp/CasController.cpp +++ b/cloudphone/src/main/cpp/CasController.cpp @@ -1169,6 +1169,11 @@ void CasController::RecvdAudioData(uint8_t *data, int length) } } +bool CasController::IsMtransValid() +{ + return m_isMTransValid; +} + int32_t OnRecvVideoStreamData(uint8_t* data, uint32_t length) { CasController::GetInstance()->RecvdVideoData(data, length); diff --git a/cloudphone/src/main/cpp/CasController.h b/cloudphone/src/main/cpp/CasController.h index 9064f6f..86def00 100644 --- a/cloudphone/src/main/cpp/CasController.h +++ b/cloudphone/src/main/cpp/CasController.h @@ -96,6 +96,8 @@ public: std::string GetSimpleRecvStats(); + bool IsMtransValid(); + private: bool Release(); diff --git a/cloudphone/src/main/cpp/cas_stream/CasStreamRecvParser.cpp b/cloudphone/src/main/cpp/cas_stream/CasStreamRecvParser.cpp index 20a6fcf..a47fd28 100644 --- a/cloudphone/src/main/cpp/cas_stream/CasStreamRecvParser.cpp +++ b/cloudphone/src/main/cpp/cas_stream/CasStreamRecvParser.cpp @@ -121,7 +121,7 @@ void HandleCompletePktMsg(CasStreamParseThread *streamParseThread, streamMsgHead CasPktHandle *serviceHandle = streamParseThread->m_streamRecvParser->GetServiceHandle(msgHead->type); if (serviceHandle) { // 直接喂数据给解码控制器逻辑，处理缓存队列解码和直接解码并发问题 - if (msgHead->type == Video) { + if (CasController::GetInstance()->IsMtransValid() && msgHead->type == Video) { CasDataPipe *videoCasDataPipe = (CasDataPipe *)serviceHandle; if (videoCasDataPipe->m_unprocessedSize == 0) { // Video Data pipe 无数据，就转为直接提交MediaCodec diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/audio/AudioTrackerCallback.java b/cloudphone/src/main/java/com/huawei/cloudphone/audio/AudioTrackerCallback.java index af20b60..76013a2 100644 --- a/cloudphone/src/main/java/com/huawei/cloudphone/audio/AudioTrackerCallback.java +++ b/cloudphone/src/main/java/com/huawei/cloudphone/audio/AudioTrackerCallback.java @@ -27,6 +27,7 @@ import com.huawei.cloudphone.datacenter.NewPacketCallback; import com.huawei.cloudphone.jniwrapper.OpusJNIWrapper; import java.util.ArrayList; +import java.util.Arrays; /** * AudioTrackerCallback @@ -147,6 +148,8 @@ public class AudioTrackerCallback implements NewPacketCallback { private int bufferSizeInBytes = 0; private float vl = 50; private float vr = 50; + private static final int USERSIZE_PCM = 1920; + private static final int USERSIZE_OPUS = 240; public CasAudioPlayer(int pid) { mPid = pid; @@ -217,7 +220,21 @@ public class AudioTrackerCallback implements NewPacketCallback { int userSize = msg.getSize(); byte[] buffer = msg.readBytes(userSize); - mTrackPlayer.write(buffer, 0, userSize, AudioTrack.WRITE_NON_BLOCKING); + if (userSize == USERSIZE_OPUS) { + // decode and play + short[] data = new short[bufferSizeInBytes]; + int dataLen = OpusJNIWrapper.opusDecode(mDecoder, buffer, userSize, data, bufferSizeInBytes * 2); + if (dataLen < 0) { + CASLog.e(TAG, "OPUS decode fail" + "userSize : " + userSize + "inputBuffer : " + Arrays.toString(buffer) + + "outputBuffer :" + Arrays.toString(data)); + return; + } + mTrackPlayer.write(data, 0, dataLen, AudioTrack.WRITE_NON_BLOCKING); + } else if (userSize == USERSIZE_PCM) { + mTrackPlayer.write(buffer, 0, userSize, AudioTrack.WRITE_NON_BLOCKING); + } else { + CASLog.e(TAG, "audioTrackPlayer failed to write, invalid userSize."); + } } private void handleStop(CasRemoteMessage msg) { diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasAESUtils.java b/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasAESUtils.java index eadb0b3..415abac 100644 --- a/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasAESUtils.java +++ b/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasAESUtils.java @@ -18,6 +18,7 @@ package com.huawei.cloudphone.utils; import com.huawei.cloudphone.common.CASLog; +import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import javax.crypto.Cipher; @@ -124,10 +125,17 @@ public final class CasAESUtils { * @return 盐值 */ public static String getHexSalt() { - SecureRandom random = CasSecurityUtil.drbg(); - byte[] bytes = new byte[SECRET_KET_LENGTH]; - random.nextBytes(bytes); - return bytesToHex(bytes); + SecureRandom random = null; + try { + random = SecureRandom.getInstanceStrong(); + byte[] bytes = new byte[SECRET_KET_LENGTH]; + random.nextBytes(bytes); + String salt = bytesToHex(bytes); + return salt; + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + return null; } /** diff --git a/config.gradle b/config.gradle index cf88092..6b984e9 100644 --- a/config.gradle +++ b/config.gradle @@ -5,5 +5,5 @@ ext.versions = [ compileSdkVersion : 31, buildToolsVersion : '28.0.3', versionCode : 1, - versionName : 'HMOS_24.8.1', + versionName : '24.8.3', ] \ No newline at end of file -- Gitee From f5fa985d41772982e282205d417510f1654b05f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=96=E6=A4=92=E8=82=89=E4=B8=9D?= <641840315@qq.com> Date: Wed, 23 Oct 2024 16:42:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=9C=A3=E5=9C=B0?= =?UTF-8?q?=E4=BA=9A=E5=93=A5region?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java b/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java index 3fde14c..9936ec7 100644 --- a/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java +++ b/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java @@ -254,6 +254,7 @@ public class CasConstantsUtil { REGION_NAME.add("cn-south-1"); REGION_NAME.add("cn-southwest-2"); REGION_NAME.add("ru-northwest-2"); + REGION_NAME.add("la-south-2"); } public static final Map REGION_INFO; @@ -267,6 +268,7 @@ public class CasConstantsUtil { REGION_INFO.put(REGION_NAME.get(5), "广州"); REGION_INFO.put(REGION_NAME.get(6), "贵阳一"); REGION_INFO.put(REGION_NAME.get(7), "莫斯科二"); + REGION_INFO.put(REGION_NAME.get(8), "圣地亚哥"); } public static final Map PHONE_STATUS; -- Gitee From 7c2e28048273fa5360071e992a8a9d3dbfa418a9 Mon Sep 17 00:00:00 2001 From: Kobetao <15503630572@163.com> Date: Wed, 30 Oct 2024 15:35:00 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 +- app/src/main/res/values/strings.xml | 2 +- cloudphone/src/main/cpp/CasController.cpp | 2 +- cloudphone/src/main/cpp/cas_common/CasLog.cpp | 2 +- config.gradle | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 467b755..e3916a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { compileSdkVersion versions.compileSdkVersion buildToolsVersion versions.buildToolsVersion defaultConfig { - applicationId "com.huawei.cloudapp.hmos.b004" + applicationId "com.huawei.cloudapp.b004" minSdkVersion versions.minSdkVersion targetSdkVersion versions.targetSdkVersion versionCode versions.versionCode diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1867262..ce884e8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - CPH-HMOS + 华为云云手机 CasCloudAppMainActivity GameListActivity GameListActivity2 diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp index db259bc..7734d60 100644 --- a/cloudphone/src/main/cpp/CasController.cpp +++ b/cloudphone/src/main/cpp/CasController.cpp @@ -39,7 +39,7 @@ const int TIMES = 8; const int FRAME_RATE_MIN = 10; const int FRAME_RATE_MAX = 60; const std::string CLIENT_TYPE = "1"; -const std::string HRTP_LOG_PATH = "/sdcard/Android/media/com.huawei.cloudapp.hmos.b004/"; +const std::string HRTP_LOG_PATH = "/sdcard/Android/media/com.huawei.cloudapp.b004/"; const uint64_t DURATION_USEC = 1000000ULL; int32_t OnRecvVideoStreamData(uint8_t* data, uint32_t length); diff --git a/cloudphone/src/main/cpp/cas_common/CasLog.cpp b/cloudphone/src/main/cpp/cas_common/CasLog.cpp index bbad5ee..899a3f9 100644 --- a/cloudphone/src/main/cpp/cas_common/CasLog.cpp +++ b/cloudphone/src/main/cpp/cas_common/CasLog.cpp @@ -22,7 +22,7 @@ std::shared_ptr sdkLogger = nullptr; void LogToFile(int level, const char *filename, int line, const char *function, const char* msg) { if (sdkLogger == nullptr) { - sdkLogger = spdlog::rotating_logger_mt("sdk_logger", "/sdcard/Android/media/com.huawei.cloudapp.hmos.b004/sdk_log.txt", max_size, max_files); + sdkLogger = spdlog::rotating_logger_mt("sdk_logger", "/sdcard/Android/media/com.huawei.cloudapp.b004/sdk_log.txt", max_size, max_files); } switch (level) { case ANDROID_LOG_DEBUG: diff --git a/config.gradle b/config.gradle index 6b984e9..3dcc74b 100644 --- a/config.gradle +++ b/config.gradle @@ -5,5 +5,5 @@ ext.versions = [ compileSdkVersion : 31, buildToolsVersion : '28.0.3', versionCode : 1, - versionName : '24.8.3', + versionName : '24.8.1', ] \ No newline at end of file -- Gitee From 37a85b0501d5bd69581f5b886466c832e7225b01 Mon Sep 17 00:00:00 2001 From: Kobetao <15503630572@163.com> Date: Wed, 30 Oct 2024 15:42:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=AB=AF=E4=BE=A7SDK=E9=80=82=E9=85=8D?= =?UTF-8?q?=E9=B8=BF=E8=92=99/=E5=AE=89=E5=8D=93=E4=BA=91=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=BD=92=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/bean/direct/ConnectInfos.java | 4 ++++ .../model/direct/ConnectInfoModel.java | 24 +++++++++++++------ .../cloudapp/utils/CasConstantsUtil.java | 2 -- gradle.properties | 19 +++++++-------- 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/huawei/cloudapp/model/bean/direct/ConnectInfos.java b/app/src/main/java/com/huawei/cloudapp/model/bean/direct/ConnectInfos.java index 1aa47fc..ba79983 100644 --- a/app/src/main/java/com/huawei/cloudapp/model/bean/direct/ConnectInfos.java +++ b/app/src/main/java/com/huawei/cloudapp/model/bean/direct/ConnectInfos.java @@ -43,6 +43,8 @@ public class ConnectInfos implements Parcelable { public static class ConnectInfo implements Parcelable { @SerializedName("phone_id") private String phoneId; + @SerializedName("udid") + private String udid; @SerializedName("access_info") public AccessInfo accessInfo; @@ -50,6 +52,8 @@ public class ConnectInfos implements Parcelable { return phoneId; } + public String getUdid() { return udid; } + public void setPhoneId(String phoneId) { this.phoneId = phoneId; } diff --git a/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java b/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java index 3a08726..823711d 100644 --- a/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java +++ b/app/src/main/java/com/huawei/cloudapp/model/direct/ConnectInfoModel.java @@ -103,13 +103,23 @@ public class ConnectInfoModel implements IConnectInfoModel { throw new CustomException.FailedToGetConnectInfoException(rsp.getErrors().get(0).getErrorMsg()); } ConnectInfos.ConnectInfo ConnectInfo = rsp.getConnectInfos().get(0); - return Collections.singletonList( - GenerateConnectInfo(ConnectInfo.getAccessInfo().getAccessIp(), - String.valueOf(ConnectInfo.getAccessInfo().getAccessPort()), - ConnectInfo.getAccessInfo().getSessionId(), - ConnectInfo.getAccessInfo().getTicket(), - ConnectInfo.getAccessInfo().getSessionId(), - ConnectInfo.getAccessInfo().getTimestamp())); + if (ConnectInfo.getUdid() != null) { + return Collections.singletonList( + GenerateConnectInfo(ConnectInfo.getAccessInfo().getAccessIp(), + String.valueOf(ConnectInfo.getAccessInfo().getAccessPort()), + ConnectInfo.getAccessInfo().getSessionId(), + ConnectInfo.getAccessInfo().getTicket(), + ConnectInfo.getAccessInfo().getSessionId(), + ConnectInfo.getAccessInfo().getTimestamp())); + } else { + return Collections.singletonList( + GenerateConnectInfo(ConnectInfo.getAccessInfo().getAccessIp(), + String.valueOf(ConnectInfo.getAccessInfo().getAccessPort()), + ConnectInfo.getAccessInfo().getSessionId(), + ConnectInfo.getAccessInfo().getTicket(), + ConnectInfo.getPhoneId(), + ConnectInfo.getAccessInfo().getTimestamp())); + } } else { CPHError rsp; try { diff --git a/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java b/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java index 9936ec7..3fde14c 100644 --- a/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java +++ b/app/src/main/java/com/huawei/cloudapp/utils/CasConstantsUtil.java @@ -254,7 +254,6 @@ public class CasConstantsUtil { REGION_NAME.add("cn-south-1"); REGION_NAME.add("cn-southwest-2"); REGION_NAME.add("ru-northwest-2"); - REGION_NAME.add("la-south-2"); } public static final Map REGION_INFO; @@ -268,7 +267,6 @@ public class CasConstantsUtil { REGION_INFO.put(REGION_NAME.get(5), "广州"); REGION_INFO.put(REGION_NAME.get(6), "贵阳一"); REGION_INFO.put(REGION_NAME.get(7), "莫斯科二"); - REGION_INFO.put(REGION_NAME.get(8), "圣地亚哥"); } public static final Map PHONE_STATUS; diff --git a/gradle.properties b/gradle.properties index ee81f5c..16508a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,15 @@ -## For more details on how to configure your build environment visit +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html -# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx1024m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -# +android.enableJetifier=true +android.useAndroidX=true +org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -#Tue Sep 10 16:34:48 CST 2024 -org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx1536M" -android.enableJetifier=true -android.useAndroidX=true +# org.gradle.parallel=true \ No newline at end of file -- Gitee