From 1824419f8aa10996732f93d1f1b2786fcb526429 Mon Sep 17 00:00:00 2001 From: wangshuo <584363327@qq.com> Date: Mon, 24 Jul 2023 15:16:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?startParam=E6=B7=BB=E5=8A=A0userId=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java | 1 + cloudphone/src/main/cpp/CasConf.h | 3 ++- cloudphone/src/main/cpp/CasController.cpp | 2 ++ cloudphone/src/main/cpp/CasController.h | 1 + .../main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java | 1 + .../main/java/com/huawei/cloudphone/service/CasProcessor.java | 2 ++ 6 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java index 61aed88..a7a3521 100644 --- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java +++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java @@ -139,6 +139,7 @@ public class CasCloudMainActivity extends Activity { connectorInfo.setAesKey("11111111111111111111111111111111"); connectorInfo.setAuthTs("987654321"); connectorInfo.setTouchTimeout("0"); + connectorInfo.setUserId("user_id"); return connectorInfo; } diff --git a/cloudphone/src/main/cpp/CasConf.h b/cloudphone/src/main/cpp/CasConf.h index dde4042..aa8ba95 100644 --- a/cloudphone/src/main/cpp/CasConf.h +++ b/cloudphone/src/main/cpp/CasConf.h @@ -32,6 +32,7 @@ struct CasConf { std::string ticket; std::string sessionId; std::string aesIv; + std::string userId; std::string encryptedData; std::string authTs; std::string verifyData; @@ -56,7 +57,7 @@ struct CasConf { token = (jniConf)[KEY_TOKEN]; ticket = (jniConf)[KEY_TICKET]; sessionId = (jniConf)[KEY_SESSION_ID]; - + userId = (jniConf)[KEY_USER_ID]; aesIv = (jniConf)[KEY_AES_IV]; encryptedData = (jniConf)[KEY_ENCRYPTED_DATA]; authTs = (jniConf)[KEY_AUTH_TS]; diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp index 75721b4..400672f 100644 --- a/cloudphone/src/main/cpp/CasController.cpp +++ b/cloudphone/src/main/cpp/CasController.cpp @@ -158,6 +158,7 @@ bool CasController::Start(ANativeWindow *nativeWindow, bool isHome) m_verifyData = m_conf.verifyData; m_authTs = m_conf.authTs; m_aesIv = m_conf.aesIv; + m_userId = m_conf.userId; m_clientType = CLIENT_TYPE; m_maxDisconnectDuration = CalcMaxDisconnectDuration(m_conf.backgroundTimeout); @@ -975,6 +976,7 @@ bool CasController::SendStartCmd() { KEY_VERIFY_DATA, m_verifyData }, { KEY_ENCRYPTED_DATA, m_encryptedData }, { KEY_SESSION_ID, m_sessionId }, + { KEY_USER_ID, m_userId }, { KEY_AES_IV, m_aesIv }, { KEY_SDK_VERSION, m_conf.sdkVersion }, { KEY_PROTOCOL_VERSION, m_conf.protocolVersion }, diff --git a/cloudphone/src/main/cpp/CasController.h b/cloudphone/src/main/cpp/CasController.h index 6698ed3..f61c8b1 100644 --- a/cloudphone/src/main/cpp/CasController.h +++ b/cloudphone/src/main/cpp/CasController.h @@ -158,6 +158,7 @@ private: std::string m_verifyData; std::string m_authTs; std::string m_aesIv; + std::string m_userId; std::string m_clientType; std::string m_maxDisconnectDuration; FrameType m_frameType; diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java b/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java index 0ea60bd..c1dfacb 100644 --- a/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java +++ b/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java @@ -28,6 +28,7 @@ public class JNIWrapper { public static final String KEY_TOKEN = "token"; public static final String KEY_TICKET = "ticket"; public static final String KEY_SESSION_ID = "session_id"; + public static final String KEY_USER_ID = "user_id"; public static final String KEY_AES_IV = "aes_iv"; public static final String KEY_ENCRYPTED_DATA = "encrypted_data"; public static final String KEY_BACKGROUND_TIMEOUT = "backgroundTimeout"; diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java b/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java index 1d9de02..a038a97 100644 --- a/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java +++ b/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java @@ -50,6 +50,7 @@ import static com.huawei.cloudphone.jniwrapper.JNIWrapper.KEY_PROTOCOL_VERSION; import static com.huawei.cloudphone.jniwrapper.JNIWrapper.KEY_SDK_VERSION; import static com.huawei.cloudphone.jniwrapper.JNIWrapper.KEY_SESSION_ID; import static com.huawei.cloudphone.jniwrapper.JNIWrapper.KEY_TICKET; +import static com.huawei.cloudphone.jniwrapper.JNIWrapper.KEY_USER_ID; import static com.huawei.cloudphone.jniwrapper.JNIWrapper.KEY_VERIFY_DATA; /** @@ -250,6 +251,7 @@ public class CasProcessor extends ICASAidlInterface.Stub { JniBridge.getInstance().setJniConf(KEY_PORT, info.getConnectPort()); JniBridge.getInstance().setJniConf(KEY_TICKET, info.getTicket()); JniBridge.getInstance().setJniConf(KEY_SESSION_ID, info.getSessionId()); + JniBridge.getInstance().setJniConf(KEY_USER_ID, info.getUserId()); JniBridge.getInstance().setJniConf(KEY_AES_IV, info.getAesIv()); JniBridge.getInstance().setJniConf(KEY_AUTH_TS, info.getAuthTs()); JniBridge.getInstance().setJniConf(KEY_SDK_VERSION, info.getSdkVersion()); -- Gitee From b7f05dae26d3019042f33c16107706a8e7a68ea3 Mon Sep 17 00:00:00 2001 From: wangshuo <584363327@qq.com> Date: Mon, 24 Jul 2023 19:32:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9readme=E4=B8=ADuser=5Fid?= =?UTF-8?q?=E4=B8=BA=E5=BF=85=E9=80=89,=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=E8=87=B323.6.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- config.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 725372c..ad3fcdb 100644 --- a/README.md +++ b/README.md @@ -323,7 +323,7 @@ https://gitee.com/HuaweiCloudDeveloper/huaweicloud-cloudPhoneAccess-android/rele | background_timeout | 是 | String | home时长 | | available_playtime | 是 | String | 试玩时长 | | touch_timeout | 否 | String | 无触控时长 | - | user_id | 否 | String | 用户id | + | user_id | 是 | String | 用户id | - 调用示例 diff --git a/config.gradle b/config.gradle index ed1c329..e2435c2 100644 --- a/config.gradle +++ b/config.gradle @@ -5,5 +5,5 @@ ext.versions = [ compileSdkVersion : 28, buildToolsVersion : '28.0.3', versionCode : 1, - versionName : '23.6.0', + versionName : '23.6.3.1', ] \ No newline at end of file -- Gitee