diff --git a/README.md b/README.md index 725372c86a518055c47f9c6301441f47ac27fa59..ad3fcdb977800ec5fa2ddd5fd0e88dd546d87c59 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/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java index 61aed88460a3a32f07986a5e19deb44acb927207..a7a352111e7dcc75fac38adc29521e639eb8d0d5 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 dde4042344b917313d6fd83bbc8c37afc6e45389..aa8ba95877c7a9e0058c306112935f67fec20fb6 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 75721b49bbec064fbe55f81b87d92876393dde9c..400672f35fe49b9e13eb4d156d9601a273e0a81b 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 6698ed334e30971f597d3343f88a6a8f216b5c62..f61c8b1c13f44b41f7722a1370c3ab1c7e1eafaa 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 0ea60bdabcb5872f44cddc716d3088eb9337bc9c..c1dfacb2db2f0d79f36d960d797b0f04ca8b7955 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 1d9de02af8ea451a626cb325837b1df27d41ef36..a038a97bb760df84cd13f4c33e2328d816ea583c 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()); diff --git a/config.gradle b/config.gradle index a0c5b9a4e63783fbaa86a30b42bbde2a16eb904e..e2435c23c6624e92b8071c104d7ef4ce5f3fc1e2 100644 --- a/config.gradle +++ b/config.gradle @@ -5,5 +5,5 @@ ext.versions = [ compileSdkVersion : 28, buildToolsVersion : '28.0.3', versionCode : 1, - versionName : '23.6.3', + versionName : '23.6.3.1', ] \ No newline at end of file