From ff226a31984e4e526178a25bea0d774c3301a453 Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Thu, 29 Jun 2023 17:21:01 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E4=BA=91?=
 =?UTF-8?q?=E6=9C=BA=E9=9F=B3=E8=A7=86=E9=A2=91=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloudapp/ui/CasCloudMainActivity.java     |  81 +---------
 .../cloudapp/ui/CasCloudPhoneActivity.java    |   6 +-
 .../res/layout/activity_cas_cloud_main.xml    | 144 ------------------
 cloudphone/src/main/cpp/CasCommon.h           |   3 +-
 cloudphone/src/main/cpp/CasController.cpp     |  70 ++++-----
 cloudphone/src/main/cpp/CasController.h       |   7 +-
 6 files changed, 37 insertions(+), 274 deletions(-)

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 2fdeeac..6e9a04d 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
@@ -57,14 +57,6 @@ public class CasCloudMainActivity extends Activity {
     private static final String TAG = "CasCloudMainActivity";
     private AutoCompleteTextView mCloudPhoneIp;
     private AutoCompleteTextView mCloudPhonePort;
-    private RadioGroup mEncodeTypeGroup;
-    private int mEncodeType = 0;
-    private String mFrameType = "h264";
-    private LinearLayout mRemoteEncodeServerIpLayout;
-    private LinearLayout mRemoteEncodeServerPortLayout;
-    private EditText mRemoteEncodeServerIp;
-    private EditText mRemoteEncodeServerPort;
-    private RadioGroup mFrameTypeGroup;
     private TagFlowLayout mFlowLayout;
     private CasHistory mCasHistory;
 
@@ -90,60 +82,8 @@ public class CasCloudMainActivity extends Activity {
         initAutoCompleteTextView("ip", mCloudPhoneIp);
         mCloudPhonePort = findViewById(R.id.cloud_phone_port);
         initAutoCompleteTextView("port", mCloudPhonePort);
-        mEncodeTypeGroup = findViewById(R.id.encodeTypeRadioButtonGroup);
-        mFrameTypeGroup = findViewById(R.id.frameTypeRadioButtonGroup);
-        mRemoteEncodeServerIpLayout = findViewById(R.id.remote_ip_view_layout);
-        mRemoteEncodeServerPortLayout = findViewById(R.id.remote_port_view_layout);
-        mRemoteEncodeServerIp = findViewById(R.id.edit_text_remote_ip);
-        mRemoteEncodeServerPort = findViewById(R.id.edit_text_remote_port);
         mFlowLayout = findViewById(R.id.flow);
         setAdapter(mFlowLayout);
-
-        mEncodeTypeGroup.check(R.id.radioButtonCpu);
-        mEncodeTypeGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                switch (i) {
-                    case R.id.radioButtonCpu:
-                        mEncodeType = 1;
-                        mRemoteEncodeServerIpLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerIp.setText("");
-                        mRemoteEncodeServerPort.setText("");
-                        break;
-                    case R.id.radioButtonGpu:
-                        mEncodeType = 2;
-                        mRemoteEncodeServerIpLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerIp.setText("");
-                        mRemoteEncodeServerPort.setText("");
-                        break;
-                    case R.id.radioButtonRemote:
-                        mRemoteEncodeServerIpLayout.setVisibility(View.VISIBLE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.VISIBLE);
-                        break;
-                    default:
-                        mEncodeType = 0;
-                        mRemoteEncodeServerIpLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerIp.setText("");
-                        mRemoteEncodeServerPort.setText("");
-                        break;
-                }
-            }
-        });
-
-        mFrameTypeGroup.check(R.id.radioButtonH264);
-        mFrameTypeGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                if (i == R.id.radioButtonH265) {
-                    mFrameType = "h265";
-                } else {
-                    mFrameType = "h264";
-                }
-            }
-        });
     }
 
     public void cloudPhoneConnect(View view) {
@@ -157,31 +97,14 @@ public class CasCloudMainActivity extends Activity {
             CASLog.e(TAG, "输入Port为空");
             return;
         }
-        String remoteEncodeServerIp = mRemoteEncodeServerIp.getText().toString().trim();
-        String remoteEncodeServerPort = mRemoteEncodeServerPort.getText().toString().trim();
-        if (mEncodeType == 3) {
-            if (remoteEncodeServerIp.isEmpty() || remoteEncodeServerPort.isEmpty()) {
-                CASLog.e(TAG, "远编服务器信息不全");
-                return;
-            }
-        }
-
-        startCloudPhoneActivity(phoneIp, phonePort, remoteEncodeServerIp, remoteEncodeServerPort);
+        startCloudPhoneActivity(phoneIp, phonePort);
     }
 
-    private void startCloudPhoneActivity(String phoneIp, String phonePort, String remoteEncodeServerIp, String remoteEncodeServerPort) {
+    private void startCloudPhoneActivity(String phoneIp, String phonePort) {
 
         Intent intent = new Intent(CasCloudMainActivity.this, CasCloudPhoneActivity.class);
         CasConnectInfo connectorInfo = getCasConnectorInfo(phoneIp, phonePort);
-        Map<String, String> mediaConfig = new HashMap<String, String>();
-        mediaConfig.put(FRAME_TYPE, mFrameType);
-        mediaConfig.put(ENCODE_TYPE, String.valueOf(mEncodeType));
-        if (!remoteEncodeServerIp.isEmpty() && !remoteEncodeServerPort.isEmpty()) {
-            mediaConfig.put(REMOTE_SCHEDULING_ELB_IP, remoteEncodeServerIp);
-            mediaConfig.put(REMOTE_SCHEDULING_ELB_PORT, remoteEncodeServerPort);
-        }
         intent.putExtra(CasConnectInfo.BUNDLE_KEY, connectorInfo);
-        intent.putExtra(MEDIA_CONFIG, (Serializable) mediaConfig);
         startActivity(intent);
     }
 
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
index 92b1362..68bdafa 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
@@ -651,15 +651,15 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         setResult(RESULT_OK);
         finish();
         gAcitivity = null;
+        if (mVirtualDeviceSession != null) {
+            mVirtualDeviceSession.stop();
+        }
         new Thread(new Runnable() {
             @Override
             public void run() {
                 bIsStart = false;
                 try {
                     mCloudPhone.exitCloudPhone();
-                    if (mVirtualDeviceSession != null) {
-                        mVirtualDeviceSession.stop();
-                    }
                 } catch (Exception e) {
                     CASLog.e(TAG, "stop cloud phone failed " + e.getMessage());
                 }
diff --git a/app/src/main/res/layout/activity_cas_cloud_main.xml b/app/src/main/res/layout/activity_cas_cloud_main.xml
index 6dcf8df..51dd1fb 100644
--- a/app/src/main/res/layout/activity_cas_cloud_main.xml
+++ b/app/src/main/res/layout/activity_cas_cloud_main.xml
@@ -65,150 +65,6 @@
 
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="20dp"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <RadioGroup
-            android:id="@+id/encodeTypeRadioButtonGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/cloud_phone_encode_type"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonCpu"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/encode_type_cpu"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonGpu"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/encode_type_gpu"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonRemote"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/encode_type_remote"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-        </RadioGroup>
-
-        <LinearLayout
-            android:id="@+id/remote_ip_view_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/remote_encode_server_ip"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <EditText
-                android:id="@+id/edit_text_remote_ip"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:inputType="text"
-                android:textColor="@android:color/black"
-                android:hint="请输入服务器ip"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/remote_port_view_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/remote_encode_server_port"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <EditText
-                android:id="@+id/edit_text_remote_port"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:inputType="text"
-                android:textColor="@android:color/black"
-                android:hint="请输入端口号"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="20dp"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <RadioGroup
-            android:id="@+id/frameTypeRadioButtonGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/cloud_phone_frame_type"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonH264"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/frame_type_h264"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonH265"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/frame_type_h265"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-        </RadioGroup>
-    </LinearLayout>
-
     <Button
         android:id="@+id/cloud_phone_connect"
         android:layout_width="match_parent"
diff --git a/cloudphone/src/main/cpp/CasCommon.h b/cloudphone/src/main/cpp/CasCommon.h
index 3b75466..4e97cf0 100644
--- a/cloudphone/src/main/cpp/CasCommon.h
+++ b/cloudphone/src/main/cpp/CasCommon.h
@@ -82,7 +82,8 @@ enum {
     CAS_SWITCH_FOREGROUND_ERROR         = 0x1501,
 
     CAS_ORIENTATION                     = 0x1600,
-    CAS_EXIT                       = 0x1700
+    CAS_EXIT                       = 0x1700,
+    CAS_MEDIA_CONFIG                    = 0x2000
 };
 
 const int CAS_THREAD_RUNNING = 1;
diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp
index 2b4b253..d746c53 100644
--- a/cloudphone/src/main/cpp/CasController.cpp
+++ b/cloudphone/src/main/cpp/CasController.cpp
@@ -120,11 +120,12 @@ void CasController::SetState(JNIState state)
 
 bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
 {
+    m_nativeWindow = nativeWindow;
     bool res = false;
     if (isHome && this->GetState() != STOPPED && m_casClientSocket->GetStatus() != SOCKET_STATUS_RUNNING) {
         res = Reconnect();
         if (res) {
-            CreateDecWorker(nativeWindow, m_needVideoDecode);
+            CreateDecWorker(m_nativeWindow, m_needVideoDecode);
             StartDecWorker(!m_retainVideoDecode);
             return true;
         } else {
@@ -134,7 +135,7 @@ bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
     }
     std::lock_guard<std::mutex> lockGuard(this->m_lock);
     if (isHome) {
-        return ProcessEnterForeground(nativeWindow);
+        return ProcessEnterForeground(m_nativeWindow);
     }
 
     if (this->GetState() == STOPPED) {
@@ -167,9 +168,10 @@ bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
         return false;
     }
 
-    res = CreateWorkers(nativeWindow, m_needVideoDecode);
+    res = CreateWorkers();
     if (!res) {
-        DestroyWorkers(false);
+        DestroyWorkers();
+        StopDecWorker(false);
         return false;
     }
 
@@ -178,7 +180,7 @@ bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
         return false;
     }
 
-    StartWorkers(!m_retainVideoDecode);
+    StartWorkers();
 
     std::string startCmd = CMD_START_APP;
     map<string, string> parameters = { { KEY_COMMAND, startCmd },
@@ -275,7 +277,8 @@ bool CasController::Stop(bool isHome)
     usleep(200000);
     this->SetState(STOPPED);
 
-    DestroyWorkers(!m_retainVideoDecode);
+    DestroyWorkers();
+    StopDecWorker(!m_retainVideoDecode);
     CloseDataStream();
 
     m_isNotifyFirstFrame = false;
@@ -292,7 +295,8 @@ bool CasController::Release()
         return false;
     }
 
-    DestroyWorkers(m_retainVideoDecode);
+    DestroyWorkers();
+    StopDecWorker(m_retainVideoDecode);
     ClearDataStream();
     return true;
 }
@@ -311,9 +315,9 @@ bool CasController::Reconnect()
         return false;
     }
 
-    res = CreateWorkers(nullptr, !m_needVideoDecode);
+    res = CreateWorkers();
     if (!res) {
-        DestroyWorkers(false);
+        DestroyWorkers();
         return false;
     }
 
@@ -342,11 +346,11 @@ bool CasController::Reconnect()
         return false;
     }
 
-    StartWorkers(m_retainVideoDecode);
+    StartWorkers();
     return true;
 }
 
-bool CasController::CreateWorkers(ANativeWindow *nativeWindow, bool needVideoDecode)
+bool CasController::CreateWorkers()
 {
     m_casClientSocket = new (std::nothrow) CasTcpClientSocket(m_ip, m_port);
     if (m_casClientSocket == nullptr) {
@@ -406,15 +410,6 @@ bool CasController::CreateWorkers(ANativeWindow *nativeWindow, bool needVideoDec
     m_streamParser->SetServiceHandle(CasMsgType::Channel, m_channelStream);
     m_streamParser->SetServiceHandle(CasMsgType::VirtualDevice, m_virtualDeviceStream);
 
-    if (needVideoDecode) {
-        m_videoDecodeThread = new (std::nothrow) CasVideoHDecodeThread(nativeWindow, m_frameType);
-        if (m_videoDecodeThread == nullptr) {
-            ERR("Failed to new video decode thread.");
-            return false;
-        }
-        m_videoDecodeThread->SetDecodePktHandle(m_videoPacketStream);
-    }
-
     m_touch = new (std::nothrow) CasTouch(m_casClientSocket);
     if (m_touch == nullptr) {
         ERR("Failed to new touch.");
@@ -424,25 +419,16 @@ bool CasController::CreateWorkers(ANativeWindow *nativeWindow, bool needVideoDec
     return true;
 }
 
-bool CasController::StartWorkers(bool retainVideoDecode)
+bool CasController::StartWorkers()
 {
     m_streamParseThread->Start();
-
-    if (retainVideoDecode) {
-        if (m_videoDecodeThread != nullptr) {
-            m_videoDecodeThread->Restart();
-        }
-    } else {
-        m_videoDecodeThread->Start();
-    }
-
     m_heartbeatThread->Start();
     m_controlThread->Start();
     INFO("Succeed to start workers");
     return true;
 }
 
-bool CasController::DestroyWorkers(bool retainVideoDecode)
+bool CasController::DestroyWorkers()
 {
     if (m_streamParseThread != nullptr) {
         m_streamParseThread->Stop();
@@ -483,18 +469,6 @@ bool CasController::DestroyWorkers(bool retainVideoDecode)
         m_cmdController = nullptr;
     }
 
-    if (retainVideoDecode) {
-        if (m_videoDecodeThread != nullptr) {
-            m_videoDecodeThread->Stop();
-        }
-    } else {
-        if (m_videoDecodeThread != nullptr) {
-            m_videoDecodeThread->Exit();
-            delete m_videoDecodeThread;
-            m_videoDecodeThread = nullptr;
-        }
-    }
-
     if (m_streamBuildSender != nullptr) {
         delete m_streamBuildSender;
         m_streamBuildSender = nullptr;
@@ -850,6 +824,7 @@ bool CasController::CreateDecWorker(ANativeWindow *nativeWindow, bool needVideoD
     if (needVideoDecode) {
         m_videoDecodeThread = new (std::nothrow) CasVideoHDecodeThread(nativeWindow, m_frameType);
         if (m_videoDecodeThread == nullptr) {
+            ERR("Failed to new video decode thread.");
             return false;
         }
         m_videoDecodeThread->SetDecodePktHandle(m_videoPacketStream);
@@ -924,5 +899,12 @@ void CasController::NotifyFirstVideoFrame()
 
 void CasController::OnCmdRecv(int code, string msg)
 {
-    NotifyCommand(code, msg);
+    if (code == CAS_MEDIA_CONFIG) {
+        m_frameType = msg.find("h265") != string::npos ? FrameType::H265 : FrameType::H264;
+        StopDecWorker(false);
+        CreateDecWorker(m_nativeWindow, m_needVideoDecode);
+        StartDecWorker(!m_retainVideoDecode);
+    } else {
+        NotifyCommand(code, msg);
+    }
 }
\ No newline at end of file
diff --git a/cloudphone/src/main/cpp/CasController.h b/cloudphone/src/main/cpp/CasController.h
index 02b111d..94f1858 100644
--- a/cloudphone/src/main/cpp/CasController.h
+++ b/cloudphone/src/main/cpp/CasController.h
@@ -81,11 +81,11 @@ public:
 private:
     bool Release();
 
-    bool CreateWorkers(ANativeWindow *nativeWindow, bool needVideoDecode);
+    bool CreateWorkers();
 
-    bool StartWorkers(bool retainVideoDecode);
+    bool StartWorkers();
 
-    bool DestroyWorkers(bool retainVideoDecode);
+    bool DestroyWorkers();
 
     bool CreateDecWorker(ANativeWindow *nativeWindow, bool needVideoDecode);
 
@@ -153,6 +153,7 @@ private:
     std::string m_clientType;
     std::string m_maxDisconnectDuration;
     FrameType m_frameType;
+    ANativeWindow *m_nativeWindow;
     unsigned int m_ip = 0;
     unsigned short m_port = 0;
     const bool m_retainVideoDecode = true;
-- 
Gitee


From d5b8db91122b0a6cd0aa28590fdd292674294481 Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Fri, 30 Jun 2023 15:27:57 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0H5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=94=AF=E6=8C=81=E8=BF=9E=E6=8E=A5H5SDK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   2 +
 app/src/main/AndroidManifest.xml              |   9 +-
 .../cloudapp/ui/CasCloudMainActivity.java     |  91 +---------
 .../cloudapp/ui/CasCloudPhoneWebActivity.java | 119 ++++++++++++++
 .../res/layout/activity_cas_cloud_main.xml    | 155 ++----------------
 .../layout/activity_cas_cloud_phone_web.xml   |  10 ++
 app/src/main/res/values/strings.xml           |   3 +-
 app/src/main/res/values/styles.xml            |   2 +-
 8 files changed, 162 insertions(+), 229 deletions(-)
 create mode 100644 app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
 create mode 100644 app/src/main/res/layout/activity_cas_cloud_phone_web.xml

diff --git a/app/build.gradle b/app/build.gradle
index 176191d..0146823 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -73,5 +73,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.13.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.14.0'
     implementation 'com.hyman:flowlayout-lib:1.1.2'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.github.Justson.AgentWeb:agentweb-core:v5.0.6-androidx'
     implementation project(':cloudphone')
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 839ab18..80c6ebc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.huawei.cloudapp">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -35,12 +36,18 @@
             android:label="@string/cas_title_activity_fullscreen"
             android:theme="@style/CasCloudAppMainActivityTheme"
             android:windowSoftInputMode="adjustResize" />
+        <activity
+            android:name="com.huawei.cloudapp.ui.CasCloudPhoneWebActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/cas_title_activity_fullscreen"
+            android:theme="@style/CasCloudAppMainActivityTheme"
+            android:windowSoftInputMode="adjustResize"/>
 
         <service
             android:name="com.huawei.cloudphone.service.CASService"
             android:enabled="true"
             android:exported="true"
-            android:process=":remote"></service>
+            android:process=":remote" />
     </application>
 
 </manifest>
\ No newline at end of file
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 2fdeeac..6041d19 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
@@ -57,14 +57,6 @@ public class CasCloudMainActivity extends Activity {
     private static final String TAG = "CasCloudMainActivity";
     private AutoCompleteTextView mCloudPhoneIp;
     private AutoCompleteTextView mCloudPhonePort;
-    private RadioGroup mEncodeTypeGroup;
-    private int mEncodeType = 0;
-    private String mFrameType = "h264";
-    private LinearLayout mRemoteEncodeServerIpLayout;
-    private LinearLayout mRemoteEncodeServerPortLayout;
-    private EditText mRemoteEncodeServerIp;
-    private EditText mRemoteEncodeServerPort;
-    private RadioGroup mFrameTypeGroup;
     private TagFlowLayout mFlowLayout;
     private CasHistory mCasHistory;
 
@@ -90,63 +82,20 @@ public class CasCloudMainActivity extends Activity {
         initAutoCompleteTextView("ip", mCloudPhoneIp);
         mCloudPhonePort = findViewById(R.id.cloud_phone_port);
         initAutoCompleteTextView("port", mCloudPhonePort);
-        mEncodeTypeGroup = findViewById(R.id.encodeTypeRadioButtonGroup);
-        mFrameTypeGroup = findViewById(R.id.frameTypeRadioButtonGroup);
-        mRemoteEncodeServerIpLayout = findViewById(R.id.remote_ip_view_layout);
-        mRemoteEncodeServerPortLayout = findViewById(R.id.remote_port_view_layout);
-        mRemoteEncodeServerIp = findViewById(R.id.edit_text_remote_ip);
-        mRemoteEncodeServerPort = findViewById(R.id.edit_text_remote_port);
         mFlowLayout = findViewById(R.id.flow);
         setAdapter(mFlowLayout);
+    }
 
-        mEncodeTypeGroup.check(R.id.radioButtonCpu);
-        mEncodeTypeGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                switch (i) {
-                    case R.id.radioButtonCpu:
-                        mEncodeType = 1;
-                        mRemoteEncodeServerIpLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerIp.setText("");
-                        mRemoteEncodeServerPort.setText("");
-                        break;
-                    case R.id.radioButtonGpu:
-                        mEncodeType = 2;
-                        mRemoteEncodeServerIpLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerIp.setText("");
-                        mRemoteEncodeServerPort.setText("");
-                        break;
-                    case R.id.radioButtonRemote:
-                        mRemoteEncodeServerIpLayout.setVisibility(View.VISIBLE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.VISIBLE);
-                        break;
-                    default:
-                        mEncodeType = 0;
-                        mRemoteEncodeServerIpLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerPortLayout.setVisibility(View.GONE);
-                        mRemoteEncodeServerIp.setText("");
-                        mRemoteEncodeServerPort.setText("");
-                        break;
-                }
-            }
-        });
+    public void cloudPhoneConnect(View view) {
+        startCloudPhoneActivity(CasCloudPhoneActivity.class);
+    }
 
-        mFrameTypeGroup.check(R.id.radioButtonH264);
-        mFrameTypeGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(RadioGroup radioGroup, int i) {
-                if (i == R.id.radioButtonH265) {
-                    mFrameType = "h265";
-                } else {
-                    mFrameType = "h264";
-                }
-            }
-        });
+
+    public void cloudPhoneConnectWeb(View view) {
+        startCloudPhoneActivity(CasCloudPhoneWebActivity.class);
     }
 
-    public void cloudPhoneConnect(View view) {
+    private void startCloudPhoneActivity(Class<?> cls) {
         String phoneIp = mCloudPhoneIp.getText().toString().trim();
         if (TextUtils.isEmpty(phoneIp)) {
             CASLog.e(TAG, "输入Ip为空");
@@ -157,31 +106,9 @@ public class CasCloudMainActivity extends Activity {
             CASLog.e(TAG, "输入Port为空");
             return;
         }
-        String remoteEncodeServerIp = mRemoteEncodeServerIp.getText().toString().trim();
-        String remoteEncodeServerPort = mRemoteEncodeServerPort.getText().toString().trim();
-        if (mEncodeType == 3) {
-            if (remoteEncodeServerIp.isEmpty() || remoteEncodeServerPort.isEmpty()) {
-                CASLog.e(TAG, "远编服务器信息不全");
-                return;
-            }
-        }
-
-        startCloudPhoneActivity(phoneIp, phonePort, remoteEncodeServerIp, remoteEncodeServerPort);
-    }
-
-    private void startCloudPhoneActivity(String phoneIp, String phonePort, String remoteEncodeServerIp, String remoteEncodeServerPort) {
-
-        Intent intent = new Intent(CasCloudMainActivity.this, CasCloudPhoneActivity.class);
+        Intent intent = new Intent(CasCloudMainActivity.this, cls);
         CasConnectInfo connectorInfo = getCasConnectorInfo(phoneIp, phonePort);
-        Map<String, String> mediaConfig = new HashMap<String, String>();
-        mediaConfig.put(FRAME_TYPE, mFrameType);
-        mediaConfig.put(ENCODE_TYPE, String.valueOf(mEncodeType));
-        if (!remoteEncodeServerIp.isEmpty() && !remoteEncodeServerPort.isEmpty()) {
-            mediaConfig.put(REMOTE_SCHEDULING_ELB_IP, remoteEncodeServerIp);
-            mediaConfig.put(REMOTE_SCHEDULING_ELB_PORT, remoteEncodeServerPort);
-        }
         intent.putExtra(CasConnectInfo.BUNDLE_KEY, connectorInfo);
-        intent.putExtra(MEDIA_CONFIG, (Serializable) mediaConfig);
         startActivity(intent);
     }
 
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
new file mode 100644
index 0000000..4237ab5
--- /dev/null
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
@@ -0,0 +1,119 @@
+package com.huawei.cloudapp.ui;
+
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.os.Bundle;
+import android.view.View;
+import android.webkit.JavascriptInterface;
+import android.webkit.WebSettings;
+import android.widget.LinearLayout;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.huawei.cloudapp.R;
+import com.huawei.cloudapp.common.CASLog;
+import com.huawei.cloudapp.common.CasConnectInfo;
+import com.huawei.cloudapp.common.CasHistory;
+import com.just.agentweb.AgentWeb;
+import com.just.agentweb.DefaultWebClient;
+import com.just.agentweb.WebChromeClient;
+
+public class CasCloudPhoneWebActivity extends AppCompatActivity {
+    private static final String TAG = "CasCloudWebFragment";
+    private AgentWeb mAgentWeb;
+    private LinearLayout mLinearLayout;
+    private CasConnectInfo mConnectInfo;
+    public static String urlStr = "https://110.41.19.175:10086/index?";
+    //public static String urlStr = "https://www.baidu.com/";
+
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_cas_cloud_phone_web);
+        mLinearLayout = findViewById(R.id.web_view);
+
+        mAgentWeb = AgentWeb.with(this)
+                .setAgentWebParent(mLinearLayout, -1, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT))
+                .useDefaultIndicator(-1, 3)
+                .setSecurityType(AgentWeb.SecurityType.STRICT_CHECK)
+                .setWebViewClient(mWebViewClient)
+                .setWebChromeClient(mWebChromeClient)
+                .setMainFrameErrorView(R.layout.agentweb_error_page, -1)
+                .setOpenOtherPageWays(DefaultWebClient.OpenOtherPageWays.DISALLOW)
+                .interceptUnkownUrl()
+                .createAgentWeb()
+                .ready()
+                .go(getConnectUrl());
+        mAgentWeb.getWebCreator().getWebView().setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        mAgentWeb.getJsInterfaceHolder().addJavaObject("CasCallback", new CasCallbackInterface());
+        WebSettings webSettings = mAgentWeb.getWebCreator().getWebView().getSettings();
+        webSettings.setJavaScriptEnabled(true);
+        webSettings.setDomStorageEnabled(true);
+        webSettings.setMediaPlaybackRequiresUserGesture(false);
+    }
+
+    private com.just.agentweb.WebViewClient mWebViewClient = new com.just.agentweb.WebViewClient();
+    private WebChromeClient mWebChromeClient = new WebChromeClient() {
+        @Override
+        public void onShowCustomView(View view, CustomViewCallback customViewCallback) {
+            super.onShowCustomView(view, customViewCallback);
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+    };
+
+    @Override
+    public void onResume() {
+        if (mAgentWeb != null) {
+            mAgentWeb.getWebLifeCycle().onResume();
+        }
+        super.onResume();
+    }
+
+    @Override
+    public void onPause() {
+        if (mAgentWeb != null) {
+            mAgentWeb.getWebLifeCycle().onPause();
+        }
+        super.onPause();
+    }
+
+    @Override
+    public void onDestroy() {
+        if (mAgentWeb != null) {
+            mAgentWeb.getWebLifeCycle().onDestroy();
+        }
+        super.onDestroy();
+    }
+
+
+    /**
+     * get data with intent
+     */
+    private String getConnectUrl() {
+        CASLog.i(TAG, "getIntentData");
+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        if (bundle != null) {
+            mConnectInfo = intent.getParcelableExtra(CasConnectInfo.BUNDLE_KEY);
+            return urlStr + "ip=" + mConnectInfo.getConnectIp() + "&port=" + mConnectInfo.getConnectPort();
+        }
+        return null;
+    }
+
+    class CasCallbackInterface {
+        @JavascriptInterface
+        public void startSuccessCallback() {
+            CasHistory mCasHistory = new CasHistory(getSharedPreferences("input_history", MODE_PRIVATE));
+            mCasHistory.setHistory("ip", mConnectInfo.getConnectIp());
+            mCasHistory.setHistory("port", mConnectInfo.getConnectPort());
+            mCasHistory.setHistory("ip:port", mConnectInfo.getConnectIp() + ":" + mConnectInfo.getConnectPort());
+        }
+
+        @JavascriptInterface
+        public void exit() {
+            CasCloudPhoneWebActivity.this.finish();
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_cas_cloud_main.xml b/app/src/main/res/layout/activity_cas_cloud_main.xml
index 6dcf8df..465e9d1 100644
--- a/app/src/main/res/layout/activity_cas_cloud_main.xml
+++ b/app/src/main/res/layout/activity_cas_cloud_main.xml
@@ -65,150 +65,6 @@
 
     </LinearLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="20dp"
-        android:orientation="vertical"
-        android:visibility="gone">
-
-        <RadioGroup
-            android:id="@+id/encodeTypeRadioButtonGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/cloud_phone_encode_type"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonCpu"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/encode_type_cpu"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonGpu"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/encode_type_gpu"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonRemote"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/encode_type_remote"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-        </RadioGroup>
-
-        <LinearLayout
-            android:id="@+id/remote_ip_view_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/remote_encode_server_ip"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <EditText
-                android:id="@+id/edit_text_remote_ip"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:inputType="text"
-                android:textColor="@android:color/black"
-                android:hint="请输入服务器ip"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/remote_port_view_layout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:visibility="gone" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/remote_encode_server_port"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <EditText
-                android:id="@+id/edit_text_remote_port"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:inputType="text"
-                android:textColor="@android:color/black"
-                android:hint="请输入端口号"
-                android:textSize="18sp" />
-        </LinearLayout>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginRight="20dp"
-        android:orientation="horizontal"
-        android:visibility="gone">
-
-        <RadioGroup
-            android:id="@+id/frameTypeRadioButtonGroup"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/cloud_phone_frame_type"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonH264"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/frame_type_h264"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-
-            <RadioButton
-                android:id="@+id/radioButtonH265"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/frame_type_h265"
-                android:textColor="@android:color/black"
-                android:textSize="18sp" />
-        </RadioGroup>
-    </LinearLayout>
-
     <Button
         android:id="@+id/cloud_phone_connect"
         android:layout_width="match_parent"
@@ -220,6 +76,17 @@
         android:onClick="cloudPhoneConnect"
         android:textSize="20dp" />
 
+    <Button
+        android:id="@+id/cloud_phone_connect_web"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginRight="20dp"
+        android:text="@string/button_connect_web"
+        android:onClick="cloudPhoneConnectWeb"
+        android:textSize="20dp" />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_cas_cloud_phone_web.xml b/app/src/main/res/layout/activity_cas_cloud_phone_web.xml
new file mode 100644
index 0000000..e10de9e
--- /dev/null
+++ b/app/src/main/res/layout/activity_cas_cloud_phone_web.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/web_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="@color/white"
+    tools:context="com.huawei.cloudapp.ui.CasCloudPhoneWebActivity">
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d4fc14e..eeb9e4b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,7 +26,8 @@
     <string name="cas_notouch_timeout_tip_message">由于您长时间未操作游戏，服务断开</string>
     <string name="cas_phone_input_param_invalid">输入的参数不合法</string>
     <string name="cloud_phone_id">云手机ip：</string>
-    <string name="button_connect">连接</string>
+    <string name="button_connect">APP连接</string>
+    <string name="button_connect_web">H5连接</string>
     <string name="cloud_phone_port">云手机port：</string>
     <string name="cas_close_lag_view">关闭时延数据</string>
     <string name="cas_show_lag_view">显示时延数据</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1699f81..cdbbf0f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,7 +8,7 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="CasCloudAppMainActivityTheme" parent="@android:style/Theme">
+    <style name="CasCloudAppMainActivityTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowNoTitle">true</item>
     </style>
 
-- 
Gitee


From 8fc268e7d76d2f85d622ec94b42b9c969de12f5c Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Tue, 4 Jul 2023 09:16:40 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=B8=85=E6=99=B0=E5=BA=A6=E5=8F=82=E6=95=B0=EF=BC=8C=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=88=B0=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=9A=84=E8=A7=A3?=
 =?UTF-8?q?=E7=A0=81=E8=83=BD=E5=8A=9B=E4=BC=A0=E7=BB=99cae?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../common/CasImageQualityManager.java        |   8 +-
 .../com/huawei/cloudapp/common/CasState.java  |   1 +
 .../cloudapp/ui/CasCloudMainActivity.java     |  13 --
 .../cloudapp/ui/CasCloudPhoneActivity.java    | 131 ++++++++++--------
 .../cloudapp/ui/CasCloudPhoneWebActivity.java |   5 +-
 .../huawei/cloudapp/utils/CasQualityUtil.java |  65 +++++++++
 app/src/main/res/layout/cas_ctrl_view.xml     |  41 +++---
 cloudphone/src/main/cpp/CasController.cpp     |   5 +-
 .../cloudphone/utils/CasConstantsUtil.java    |  10 ++
 .../cloudphone/utils/CasMediaUtils.java       |  12 +-
 11 files changed, 183 insertions(+), 110 deletions(-)
 create mode 100644 app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 80c6ebc..5a3955e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,7 +41,7 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/cas_title_activity_fullscreen"
             android:theme="@style/CasCloudAppMainActivityTheme"
-            android:windowSoftInputMode="adjustResize"/>
+            android:hardwareAccelerated="true"/>
 
         <service
             android:name="com.huawei.cloudphone.service.CASService"
diff --git a/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java b/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java
index d4cd222..98d3a5d 100644
--- a/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java
+++ b/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java
@@ -18,11 +18,9 @@ package com.huawei.cloudapp.common;
 
 public class CasImageQualityManager {
 
-    public static final int QUALITY_1080P = 1080;
-    public static final int QUALITY_720P = 720;
-    public static final int QUALITY_540P = 540;
-    public static final int QUALITY_480P = 480;
-    public static final int QUALITY_AUTO = 0;
+    public static final int QUALITY_UHD = 0;
+    public static final int QUALITY_HD = 1;
+    public static final int QUALITY_SD = 2;
     private volatile static CasImageQualityManager manager = null;
     private int imageQualityStatus = 0;
 
diff --git a/app/src/main/java/com/huawei/cloudapp/common/CasState.java b/app/src/main/java/com/huawei/cloudapp/common/CasState.java
index 2503e76..41d89a1 100644
--- a/app/src/main/java/com/huawei/cloudapp/common/CasState.java
+++ b/app/src/main/java/com/huawei/cloudapp/common/CasState.java
@@ -53,5 +53,6 @@ public class CasState {
     static public final int CAS_SWITCH_BACKGROUND_ERROR = 0x1301;
     static public final int CAS_SWITCH_FOREGROUND_SUCCESS = 0x1400;
     static public final int CAS_EXIT = 0x1700;
+    static public final int CAS_MEDIA_CONFIG = 0x2000;
     static public final int CAS_INVALID_CMD = 0xFFFF;
 }
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 6041d19..02cc4b1 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
@@ -16,15 +16,8 @@
 
 package com.huawei.cloudapp.ui;
 
-import static com.huawei.cloudapp.ui.CasCloudPhoneActivity.MEDIA_CONFIG;
-import static com.huawei.cloudapp.utils.CasConstantsUtil.ENCODE_TYPE;
-import static com.huawei.cloudapp.utils.CasConstantsUtil.FRAME_TYPE;
-import static com.huawei.cloudapp.utils.CasConstantsUtil.REMOTE_SCHEDULING_ELB_IP;
-import static com.huawei.cloudapp.utils.CasConstantsUtil.REMOTE_SCHEDULING_ELB_PORT;
-
 import android.app.Activity;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.InputFilter;
 import android.text.Spanned;
@@ -33,9 +26,6 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.huawei.cloudapp.R;
@@ -46,10 +36,7 @@ import com.zhy.view.flowlayout.FlowLayout;
 import com.zhy.view.flowlayout.TagAdapter;
 import com.zhy.view.flowlayout.TagFlowLayout;
 
-import java.io.Serializable;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;
 
 public class CasCloudMainActivity extends Activity {
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
index 68bdafa..1f9201e 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
@@ -16,7 +16,6 @@
 
 package com.huawei.cloudapp.ui;
 
-import android.Manifest;
 import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -29,11 +28,8 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentActivity;
 
-import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
@@ -48,6 +44,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.gson.Gson;
 import com.huawei.cloudapp.BuildConfig;
 import com.huawei.cloudapp.R;
 import com.huawei.cloudapp.common.CASLog;
@@ -58,6 +55,7 @@ import com.huawei.cloudapp.common.CasImageQualityManager;
 import com.huawei.cloudapp.common.CasListener;
 import com.huawei.cloudapp.common.CasState;
 import com.huawei.cloudapp.utils.CasAdaptPhoneUtils;
+import com.huawei.cloudapp.utils.CasQualityUtil;
 import com.huawei.cloudphone.api.CloudAppDataListener;
 import com.huawei.cloudphone.api.CloudPhoneManager;
 import com.huawei.cloudphone.api.CloudPhoneOrientationChangeListener;
@@ -68,14 +66,13 @@ import com.huawei.cloudphone.api.ICloudPhone;
 import com.huawei.cloudphone.virtualdevice.VirtualDeviceSession;
 import com.huawei.cloudphone.virtualdevice.common.RingBufferVirtualDeviceIO;
 
+import java.lang.reflect.Type;
 import java.util.HashMap;
 
-import static android.os.Build.VERSION_CODES.LOLLIPOP_MR1;
 import static android.os.SystemClock.sleep;
-import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_480P;
-import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_540P;
-import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_720P;
-import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_AUTO;
+import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_HD;
+import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_SD;
+import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_UHD;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.AES_KEY;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.AUTH_TS;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.AVAILABLE_PLAYTIME;
@@ -86,9 +83,19 @@ import static com.huawei.cloudapp.utils.CasConstantsUtil.SESSION_ID;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.TICKET;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.TOUCH_TIMEOUT;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.USER_ID;
+import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_HD;
+import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_SD;
+import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_UHD;
+import static com.huawei.cloudapp.utils.CasQualityUtil.FRAME_TYPE_H264;
+import static com.huawei.cloudapp.utils.CasQualityUtil.FRAME_TYPE_H265;
+import static com.huawei.cloudapp.utils.CasQualityUtil.RESOLUTION_1080P;
 import static com.huawei.cloudphone.api.CloudPhoneParas.DevType.DEV_PHONE;
+import static com.huawei.cloudphone.utils.CasConstantsUtil.BITRATE;
+import static com.huawei.cloudphone.utils.CasConstantsUtil.FRAME_TYPE;
 import static com.huawei.cloudphone.utils.CasConstantsUtil.VIRTUAL_HEIGHT;
 import static com.huawei.cloudphone.utils.CasConstantsUtil.VIRTUAL_WIDTH;
+import static com.huawei.cloudphone.utils.CasConstantsUtil.WIDTH;
+import static com.huawei.cloudphone.utils.CasMediaUtils.isSupportH265;
 import static com.huawei.cloudphone.virtualdevice.camera.VirtualCameraManager.GRANT_CAMERA_PERMISSION_SUCCESS_ACTION;
 import static com.huawei.cloudphone.virtualdevice.common.VirtualDeviceManager.DEV_TYPE_CAMERA;
 import static com.huawei.cloudphone.virtualdevice.common.VirtualDeviceManager.DEV_TYPE_MICROPHONE;
@@ -147,13 +154,14 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
     // intent trans value
     private CasConnectInfo connectInfo;
     private RadioGroup qualityRadioViewGroup;
-    private RadioButton radioView720p;
-    private RadioButton radioView540p;
-    private RadioButton radioView480p;
-    private RadioButton radioViewAuto;
+    private RadioButton radioViewUHD;
+    private RadioButton radioViewHD;
+    private RadioButton radioViewSD;
     private boolean bIsStart = false;
     private boolean isGotCameraAndRecordPermission = true;
     private int mOrientation = 0;
+    private String mFrameType = FRAME_TYPE_H265;
+    private String mResolution = RESOLUTION_1080P;
     private int mDisplayMode;
     private FrameLayout mFrameLayout = null;
     private FrameLayout mFloatContainer = null;
@@ -167,27 +175,17 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             if (group.getCheckedRadioButtonId() != checkedId) {
                 CASLog.e("CasMainActivity", "group.getCheckedRadioButtonId() != checkedId");
             } else {
-                int selectType = QUALITY_720P;
-                String virtualWidth = "720";
-                String virtualHeight = "1280";
-                if (radioView720p.getId() == checkedId) {
-                    selectType = QUALITY_720P;
-                    virtualWidth = "720";
-                    virtualHeight = "1280";
-                } else if (radioView540p.getId() == checkedId) {
-                    selectType = QUALITY_540P;
-
-                    // 音视频层规范要求虚拟宽高为8的倍数
-                    virtualWidth = "544";
-                    virtualHeight = "960";
-                } else if (radioView480p.getId() == checkedId) {
-                    selectType = QUALITY_480P;
-                    virtualWidth = "480";
-                    virtualHeight = "640";
-                } else if (radioViewAuto.getId() == checkedId) {
-                    selectType = QUALITY_AUTO;
-                    virtualWidth = "720";
-                    virtualHeight = "1280";
+                int selectType = QUALITY_UHD;
+                String[] quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_UHD);
+                if (radioViewUHD.getId() == checkedId) {
+                    selectType = QUALITY_UHD;
+                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_UHD);
+                } else if (radioViewHD.getId() == checkedId) {
+                    selectType = QUALITY_HD;
+                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_HD);
+                } else if (radioViewSD.getId() == checkedId) {
+                    selectType = QUALITY_SD;
+                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_SD);
                 }
 
                 int oldSelectType = CasImageQualityManager.getInstance().getImageQualityStatus();
@@ -195,8 +193,9 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
                 CasImageQualityManager.getInstance().setImageQualityStatus(selectType);
                 checkImageQualityStatus(selectType);
                 HashMap<String, String> config = new HashMap<>();
-                config.put(VIRTUAL_WIDTH, virtualWidth);
-                config.put(VIRTUAL_HEIGHT, virtualHeight);
+                config.put(BITRATE, quality[0]);
+                config.put(VIRTUAL_WIDTH, quality[1]);
+                config.put(VIRTUAL_HEIGHT, quality[2]);
                 mCloudPhone.setMediaConfig(config);
             }
             if (ctrView != null && ctrView.getVisibility() == View.VISIBLE) {
@@ -220,7 +219,7 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
                     showDialog(getResources().getString(R.string.cas_phone_play_timeout_tip_message));
                     break;
                 case MSG_STATE_CHANGE:
-                    processStateChangeMsg(msg.arg1);
+                    processStateChangeMsg(msg.arg1, (String) msg.obj);
                     break;
                 case MSG_RECONNECT_FAILED:
                     showDialog(getResources().getString(R.string.cas_phone_reconnect_server_fail_tip_message));
@@ -271,10 +270,9 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         mQuitCloudPhone.setOnClickListener(CasCloudPhoneActivity.this);
         // ctrlView
         qualityRadioViewGroup = findViewById(R.id.pic_quality_choose_layout);
-        radioView720p = findViewById(R.id.pic_quality_720p);
-        radioView540p = findViewById(R.id.pic_quality_540p);
-        radioView480p = findViewById(R.id.pic_quality_480p);
-        radioViewAuto = findViewById(R.id.pic_quality_auto);
+        radioViewUHD = findViewById(R.id.pic_quality_uhd);
+        radioViewHD = findViewById(R.id.pic_quality_hd);
+        radioViewSD = findViewById(R.id.pic_quality_sd);
         qualityRadioViewGroup.setOnCheckedChangeListener(qualityCheckedChangeListener);
 
         setRotation(mOrientation);
@@ -306,6 +304,13 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
                 }
             });
 
+            if (!isSupportH265()) {
+                if (mediaConfig == null) {
+                    mediaConfig = new HashMap<String, String>();
+                }
+                mediaConfig.put(FRAME_TYPE, FRAME_TYPE_H264);
+            }
+
             if (mediaConfig != null && mediaConfig.size() != 0) {
                 mCloudPhone.setMediaConfig(mediaConfig);
             }
@@ -431,7 +436,7 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         mVirtualDeviceSession.setVirtualDeviceIoHook(mRingBufferVirtualDeviceIO);
     }
 
-    private void processStateChangeMsg(int code) {
+    private void processStateChangeMsg(int code, String msg) {
         CASLog.i(TAG, "processStateChangeMsg code = " + code);
         switch (code) {
             case CasState.CAS_START_SUCCESS:
@@ -491,11 +496,22 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             case CasState.CAS_NOTOUCH_TIMEOUT:
                 showDialog(getResources().getString(R.string.cas_notouch_timeout_tip_message));
                 break;
+            case CasState.CAS_MEDIA_CONFIG:
+                parseMediaConfig(msg);
+                break;
             default:
                 break;
         }
     }
 
+    private void parseMediaConfig(String msg) {
+        Gson gson = new Gson();
+        HashMap<String, Object> mediaConfig = gson.fromJson(msg, new HashMap<String, Object>().getClass());
+        mResolution = String.valueOf(((Double) mediaConfig.get(WIDTH)).intValue());
+        mFrameType = (String) mediaConfig.get(FRAME_TYPE);
+        CASLog.i(TAG, "mResolution = " + mResolution + ", mFrameType = " + mFrameType);
+    }
+
     /**
      * set full screen display
      */
@@ -572,17 +588,14 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
      */
     private void checkImageQualityStatus(int selectType) {
         switch (selectType) {
-            case QUALITY_AUTO:
-                radioViewAuto.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
+            case QUALITY_SD:
+                radioViewSD.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
                 break;
-            case QUALITY_480P:
-                radioView480p.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
+            case QUALITY_HD:
+                radioViewHD.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
                 break;
-            case QUALITY_540P:
-                radioView540p.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
-                break;
-            case QUALITY_720P:
-                radioView720p.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
+            case QUALITY_UHD:
+                radioViewUHD.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
                 break;
             default:
                 break;
@@ -594,17 +607,14 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
      */
     private void resumeImageQualityStatus(int selectType) {
         switch (selectType) {
-            case QUALITY_AUTO:
-                radioViewAuto.setTextColor(this.getResources().getColor(R.color.cas_white));
-                break;
-            case QUALITY_480P:
-                radioView480p.setTextColor(this.getResources().getColor(R.color.cas_white));
+            case QUALITY_SD:
+                radioViewSD.setTextColor(this.getResources().getColor(R.color.cas_white));
                 break;
-            case QUALITY_540P:
-                radioView540p.setTextColor(this.getResources().getColor(R.color.cas_white));
+            case QUALITY_HD:
+                radioViewHD.setTextColor(this.getResources().getColor(R.color.cas_white));
                 break;
-            case QUALITY_720P:
-                radioView720p.setTextColor(this.getResources().getColor(R.color.cas_white));
+            case QUALITY_UHD:
+                radioViewUHD.setTextColor(this.getResources().getColor(R.color.cas_white));
                 break;
             default:
                 break;
@@ -819,6 +829,7 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             Message message = new Message();
             message.what = MSG_STATE_CHANGE;
             message.arg1 = code;
+            message.obj = msg;
             handler.sendMessage(message);
             if (mCasListener != null) {
                 mCasListener.onStateChange(code, msg);
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
index 4237ab5..ce1cf64 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
@@ -24,8 +24,7 @@ public class CasCloudPhoneWebActivity extends AppCompatActivity {
     private AgentWeb mAgentWeb;
     private LinearLayout mLinearLayout;
     private CasConnectInfo mConnectInfo;
-    public static String urlStr = "https://110.41.19.175:10086/index?";
-    //public static String urlStr = "https://www.baidu.com/";
+    public static String urlStr = "https://110.41.19.175:10086/index?"; //h5 sdk部署地址
 
 
     @Override
@@ -97,7 +96,7 @@ public class CasCloudPhoneWebActivity extends AppCompatActivity {
         Bundle bundle = intent.getExtras();
         if (bundle != null) {
             mConnectInfo = intent.getParcelableExtra(CasConnectInfo.BUNDLE_KEY);
-            return urlStr + "ip=" + mConnectInfo.getConnectIp() + "&port=" + mConnectInfo.getConnectPort();
+            return urlStr + "ip=" + mConnectInfo.getConnectIp() + "&port=" + ((Integer.parseInt(mConnectInfo.getConnectPort()) + 1));
         }
         return null;
     }
diff --git a/app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java b/app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java
new file mode 100644
index 0000000..f80c96f
--- /dev/null
+++ b/app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java
@@ -0,0 +1,65 @@
+package com.huawei.cloudapp.utils;
+
+import java.util.HashMap;
+
+public class CasQualityUtil {
+
+    public static final String FRAME_TYPE_H265 = "h265";
+    public static final String FRAME_TYPE_H264 = "h264";
+
+    public static final String RESOLUTION_720P = "720";
+    public static final String RESOLUTION_1080P = "1080";
+
+    public static final String DEFINITION_UHD = "UHD";
+    public static final String DEFINITION_HD = "HD";
+    public static final String DEFINITION_SD = "SD";
+
+    private static final String H264_720P_UHD = "2000000,720,1280";
+    private static final String H264_720P_HD = "1500000,720,1280";
+    private static final String H264_720P_SD = "1100000,544,960";
+
+    private static final String H264_1080P_UHD = "4000000,1080,1920";
+    private static final String H264_1080P_HD = "3000000,1080,1920";
+    private static final String H264_1080P_SD = "2200000,720,1280";
+
+    private static final String H265_720P_UHD = "1400000,720,1280";
+    private static final String H265_720P_HD = "1000000,720,1280";
+    private static final String H265_720P_SD = "800000,544,960";
+
+    private static final String H265_1080P_UHD = "2700000,1080,1920";
+    private static final String H265_1080P_HD = "2000000,1080,1920";
+    private static final String H265_1080P_SD = "1500000,720,1280";
+
+    private static HashMap<String, HashMap<String, HashMap<String, String>>> quality =
+            new HashMap<String, HashMap<String, HashMap<String, String>>>();
+
+    static {
+        quality.put(FRAME_TYPE_H264, new HashMap<String, HashMap<String, String>>());
+
+        quality.get(FRAME_TYPE_H264).put(RESOLUTION_720P, new HashMap<String, String>());
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_UHD, H264_720P_UHD);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_HD, H264_720P_HD);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_SD, H264_720P_SD);
+
+        quality.get(FRAME_TYPE_H264).put(RESOLUTION_1080P, new HashMap<String, String>());
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_UHD, H264_1080P_UHD);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_HD, H264_1080P_HD);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_SD, H264_1080P_SD);
+
+        quality.put(FRAME_TYPE_H265, new HashMap<String, HashMap<String, String>>());
+
+        quality.get(FRAME_TYPE_H265).put(RESOLUTION_720P, new HashMap<String, String>());
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_UHD, H265_720P_UHD);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_HD, H265_720P_HD);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_SD, H265_720P_SD);
+
+        quality.get(FRAME_TYPE_H265).put(RESOLUTION_1080P, new HashMap<String, String>());
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_UHD, H265_1080P_UHD);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_HD, H265_1080P_HD);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_SD, H265_1080P_SD);
+    }
+
+    public static String[] GetQuality(String frameType, String resolution, String definition) {
+        return quality.get(frameType).get(resolution).get(definition).split(",");
+    }
+}
diff --git a/app/src/main/res/layout/cas_ctrl_view.xml b/app/src/main/res/layout/cas_ctrl_view.xml
index 94064a8..45936be 100644
--- a/app/src/main/res/layout/cas_ctrl_view.xml
+++ b/app/src/main/res/layout/cas_ctrl_view.xml
@@ -20,48 +20,41 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:orientation="vertical"
-            android:paddingLeft="50dp"
-            android:paddingRight="50dp">
+            android:orientation="horizontal"
+            android:paddingLeft="10dp"
+            android:paddingRight="10dp"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp">
 
             <RadioButton
-                android:id="@+id/pic_quality_720p"
-                android:layout_width="match_parent"
+                android:id="@+id/pic_quality_uhd"
+                android:layout_width="0dp"
                 android:layout_height="50dp"
+                android:layout_weight="1"
                 android:gravity="center"
-                android:minHeight="60dp"
-                android:text="高清 720p"
-                android:textColor="@color/cas_white"
-                android:textSize="16sp" />
-
-            <RadioButton
-                android:id="@+id/pic_quality_540p"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:gravity="center"
-                android:minHeight="60dp"
-                android:text="清晰 540p"
+                android:text="超清"
                 android:textColor="@color/cas_white"
                 android:textSize="16sp" />
 
             <RadioButton
-                android:id="@+id/pic_quality_480p"
-                android:layout_width="match_parent"
+                android:id="@+id/pic_quality_hd"
+                android:layout_width="0dp"
                 android:layout_height="50dp"
+                android:layout_weight="1"
                 android:gravity="center"
                 android:minHeight="60dp"
-                android:text="流畅 480p"
+                android:text="高清"
                 android:textColor="@color/cas_white"
                 android:textSize="16sp" />
 
             <RadioButton
-                android:id="@+id/pic_quality_auto"
-                android:layout_width="match_parent"
+                android:id="@+id/pic_quality_sd"
+                android:layout_width="0dp"
                 android:layout_height="50dp"
-                android:checked="true"
+                android:layout_weight="1"
                 android:gravity="center"
                 android:minHeight="60dp"
-                android:text="自动 720p"
+                android:text="流畅"
                 android:textColor="@color/cas_white"
                 android:textSize="16sp" />
 
diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp
index d746c53..add5419 100644
--- a/cloudphone/src/main/cpp/CasController.cpp
+++ b/cloudphone/src/main/cpp/CasController.cpp
@@ -25,7 +25,7 @@
 using namespace std;
 
 const int BITRATE_MAX = 10000000;
-const int BITRATE_MIN = 1000000;
+const int BITRATE_MIN = 100000;
 const int WIDTH_MAX = 4096;
 const int WIDTH_MIN = 240;
 const int HEIGHT_MAX = 4096;
@@ -904,7 +904,6 @@ void CasController::OnCmdRecv(int code, string msg)
         StopDecWorker(false);
         CreateDecWorker(m_nativeWindow, m_needVideoDecode);
         StartDecWorker(!m_retainVideoDecode);
-    } else {
-        NotifyCommand(code, msg);
     }
+    NotifyCommand(code, msg);
 }
\ No newline at end of file
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasConstantsUtil.java b/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasConstantsUtil.java
index f31b49f..2c0b7dd 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasConstantsUtil.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasConstantsUtil.java
@@ -123,6 +123,16 @@ public class CasConstantsUtil {
      */
     public static final String VIRTUAL_HEIGHT = "virtual_height";
 
+    /**
+     * Physical_width
+     */
+    public static final String WIDTH = "width";
+
+    /**
+     * Physical_height
+     */
+    public static final String HEIGHT = "height";
+
     /**
      * rgb2yuv rgb转yuv 0：编码时转换 1：抓图时转换
      */
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasMediaUtils.java b/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasMediaUtils.java
index bae3a27..256efc5 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasMediaUtils.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/utils/CasMediaUtils.java
@@ -24,10 +24,13 @@ import static com.huawei.cloudphone.utils.CasConstantsUtil.BITRATE;
 import static com.huawei.cloudphone.utils.CasConstantsUtil.VIRTUAL_HEIGHT;
 import static com.huawei.cloudphone.utils.CasConstantsUtil.VIRTUAL_WIDTH;
 
+import android.media.MediaCodecList;
+import android.media.MediaFormat;
+
 public class CasMediaUtils {
 
     public static final String TAG = "CasMediaUtils";
-    public static final int BITRATE_MIN = 1000000;
+    public static final int BITRATE_MIN = 100000;
     public static final int BITRATE_MAX = 10000000;
     public static final int MIN = 240;
     public static final int MAX = 4096;
@@ -67,4 +70,11 @@ public class CasMediaUtils {
         }
         return true;
     }
+
+    public static boolean isSupportH265() {
+        MediaCodecList mediaCodecList = new MediaCodecList(MediaCodecList.ALL_CODECS);
+        String mimeType = "video/hevc";
+        return mediaCodecList.findDecoderForFormat(
+                MediaFormat.createVideoFormat(mimeType, 1920, 1080)) != null;
+    }
 }
\ No newline at end of file
-- 
Gitee


From 63300943a66b834fd6f3ab0044489f1f3653bdd9 Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Tue, 4 Jul 2023 17:08:15 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=8D=E8=BF=9E?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E8=A7=A3=E7=A0=81=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E6=B2=A1=E5=BC=80=E5=A7=8B=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cloudphone/src/main/cpp/CasController.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp
index add5419..f8fa942 100644
--- a/cloudphone/src/main/cpp/CasController.cpp
+++ b/cloudphone/src/main/cpp/CasController.cpp
@@ -347,6 +347,7 @@ bool CasController::Reconnect()
     }
 
     StartWorkers();
+    StartDecWorker(m_retainVideoDecode);
     return true;
 }
 
-- 
Gitee


From ceb93fbe91ed1a3bd3a033689838f609afbed469 Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Thu, 6 Jul 2023 11:21:06 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=E6=B6=88=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AA=92=E4=BD=93=E9=85=8D=E7=BD=AE=E5=8D=8F?=
 =?UTF-8?q?=E5=95=86=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huawei/cloudapp/common/CasState.java  |   1 -
 .../cloudapp/ui/CasCloudPhoneActivity.java    |  57 +++++----
 .../huawei/cloudphone/ICASAidlInterface.aidl  |   2 +
 cloudphone/src/main/cpp/CasCommon.h           |   3 +-
 cloudphone/src/main/cpp/CasController.cpp     | 111 ++++++++++--------
 cloudphone/src/main/cpp/CasController.h       |   2 +
 cloudphone/src/main/cpp/CasJniBridge.cpp      |   5 +
 cloudphone/src/main/cpp/CasJniBridge.h        |   2 +
 .../main/cpp/cas_service/CasAppCtrlCmdUtils.h |   1 +
 .../huawei/cloudphone/api/ICloudPhone.java    |   8 +-
 .../cloudphone/apiimpl/CloudPhoneImpl.java    |  41 +++++--
 .../cloudphone/jniwrapper/JNIWrapper.java     |   2 +
 .../huawei/cloudphone/service/CASClient.java  |  51 ++++----
 .../cloudphone/service/CasProcessor.java      |   6 +
 14 files changed, 182 insertions(+), 110 deletions(-)

diff --git a/app/src/main/java/com/huawei/cloudapp/common/CasState.java b/app/src/main/java/com/huawei/cloudapp/common/CasState.java
index 41d89a1..2503e76 100644
--- a/app/src/main/java/com/huawei/cloudapp/common/CasState.java
+++ b/app/src/main/java/com/huawei/cloudapp/common/CasState.java
@@ -53,6 +53,5 @@ public class CasState {
     static public final int CAS_SWITCH_BACKGROUND_ERROR = 0x1301;
     static public final int CAS_SWITCH_FOREGROUND_SUCCESS = 0x1400;
     static public final int CAS_EXIT = 0x1700;
-    static public final int CAS_MEDIA_CONFIG = 0x2000;
     static public final int CAS_INVALID_CMD = 0xFFFF;
 }
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
index 1f9201e..64015b0 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
@@ -66,7 +66,6 @@ import com.huawei.cloudphone.api.ICloudPhone;
 import com.huawei.cloudphone.virtualdevice.VirtualDeviceSession;
 import com.huawei.cloudphone.virtualdevice.common.RingBufferVirtualDeviceIO;
 
-import java.lang.reflect.Type;
 import java.util.HashMap;
 
 import static android.os.SystemClock.sleep;
@@ -132,7 +131,7 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
     public volatile boolean rebuildDone = false;
     public boolean doCheckConnection = false;
     private int mDevType;
-    private HashMap<String, String> mediaConfig = null;
+    private HashMap<String, String> mMediaConfig = null;
     private ImageView loadingView = null;
     private int currentRotation = -1;
     private CasCommonDialog quitDialog;
@@ -273,6 +272,7 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         radioViewUHD = findViewById(R.id.pic_quality_uhd);
         radioViewHD = findViewById(R.id.pic_quality_hd);
         radioViewSD = findViewById(R.id.pic_quality_sd);
+        qualityRadioViewGroup.check(radioViewHD.getId());
         qualityRadioViewGroup.setOnCheckedChangeListener(qualityCheckedChangeListener);
 
         setRotation(mOrientation);
@@ -281,7 +281,6 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         try {
             mCloudPhone = CloudPhoneManager.createCloudPhoneInstance();
             mCloudPhone.setDisplayMode(CloudPhoneParas.DisplayMode.DISPLAY_MODE_FILL);
-            mCloudPhone.init(this, DEV_PHONE);
 
             HashMap<String, String> parasMap = new HashMap<String, String>();
             parasMap.put(IP, connectInfo.getConnectIp());
@@ -294,6 +293,8 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             parasMap.put(AVAILABLE_PLAYTIME, connectInfo.getAvailablePlayTime());
             parasMap.put(USER_ID, connectInfo.getUserId());
             parasMap.put(TOUCH_TIMEOUT, connectInfo.getTouchTimeout());
+
+            mCloudPhone.init(this, DEV_PHONE, parasMap);
             mCloudPhone.registerCloudPhoneStateListener(new CloudPhoneStateListenerImpl());
             mCloudPhone.registerOnOrientationChangeListener(new CloudPhoneOrientationListener());
             mCloudPhone.registerOnVirtualDevDataListener(new CloudPhoneVirtualDevDataListenerImpl());
@@ -303,23 +304,10 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
                     CASLog.i(TAG, "onRecvCloudAppData, data size: %d", data.length);
                 }
             });
-
-            if (!isSupportH265()) {
-                if (mediaConfig == null) {
-                    mediaConfig = new HashMap<String, String>();
-                }
-                mediaConfig.put(FRAME_TYPE, FRAME_TYPE_H264);
-            }
-
-            if (mediaConfig != null && mediaConfig.size() != 0) {
-                mCloudPhone.setMediaConfig(mediaConfig);
-            }
-
-            mCloudPhone.startCloudPhone(this, mFrameLayout, parasMap);
         } catch (IllegalArgumentException e) {
             showDialog(getResources().getString(R.string.cas_phone_input_param_invalid));
         } catch (Exception e) {
-            CASLog.e(TAG, "startCloudApp start failed." + e.getMessage());
+            CASLog.e(TAG, "startCloudApp verify failed." + e.getMessage());
             showDialog(getResources().getString(R.string.cas_phone_start_fail_tip_message));
         }
     }
@@ -425,7 +413,7 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             mOrientation = bundle.getInt(ORIENTATION);
             mDisplayMode = bundle.getInt(DISPLAY_MODE);
             mDevType = bundle.getInt(DEV_TYPE);
-            mediaConfig = (HashMap<String, String>) bundle.getSerializable(MEDIA_CONFIG);
+            mMediaConfig = (HashMap<String, String>) bundle.getSerializable(MEDIA_CONFIG);
         }
     }
 
@@ -496,20 +484,41 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             case CasState.CAS_NOTOUCH_TIMEOUT:
                 showDialog(getResources().getString(R.string.cas_notouch_timeout_tip_message));
                 break;
-            case CasState.CAS_MEDIA_CONFIG:
-                parseMediaConfig(msg);
+            case CasState.CAS_VERIFY_SUCCESS:
+                startCloudPhone(msg);
                 break;
             default:
                 break;
         }
     }
 
-    private void parseMediaConfig(String msg) {
+    private void startCloudPhone(String msg) {
+        if (mMediaConfig == null) {
+            mMediaConfig = new HashMap<String, String>();
+        }
+
         Gson gson = new Gson();
-        HashMap<String, Object> mediaConfig = gson.fromJson(msg, new HashMap<String, Object>().getClass());
-        mResolution = String.valueOf(((Double) mediaConfig.get(WIDTH)).intValue());
-        mFrameType = (String) mediaConfig.get(FRAME_TYPE);
+        HashMap<String, Object> cloudMediaConfig = gson.fromJson(msg, new HashMap<String, Object>().getClass());
+        mResolution = String.valueOf(((Double) cloudMediaConfig.get(WIDTH)).intValue());
+        mFrameType = (String) cloudMediaConfig.get(FRAME_TYPE);
         CASLog.i(TAG, "mResolution = " + mResolution + ", mFrameType = " + mFrameType);
+        String[] qualityStr = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_HD);
+
+        mMediaConfig.put(BITRATE, qualityStr[0]);
+        mMediaConfig.put(VIRTUAL_WIDTH, qualityStr[1]);
+        mMediaConfig.put(VIRTUAL_HEIGHT, qualityStr[2]);
+        if (!isSupportH265()) {
+            mFrameType = FRAME_TYPE_H264;
+        }
+        mMediaConfig.put(FRAME_TYPE, mFrameType);
+        mCloudPhone.setMediaConfig(mMediaConfig);
+
+        try {
+            mCloudPhone.startCloudPhone(this, mFrameLayout);
+        } catch (Exception e) {
+            CASLog.e(TAG, "startCloudApp start failed." + e.getMessage());
+            showDialog(getResources().getString(R.string.cas_phone_start_fail_tip_message));
+        }
     }
 
     /**
diff --git a/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl b/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl
index 21b9d45..2be132f 100644
--- a/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl
+++ b/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl
@@ -34,6 +34,8 @@ interface ICASAidlInterface {
 
     void setSurface(in Surface suf);
 
+    void verify();
+
     boolean start(in boolean isHome);
 
     void stop(in boolean isHome);
diff --git a/cloudphone/src/main/cpp/CasCommon.h b/cloudphone/src/main/cpp/CasCommon.h
index 4e97cf0..3b75466 100644
--- a/cloudphone/src/main/cpp/CasCommon.h
+++ b/cloudphone/src/main/cpp/CasCommon.h
@@ -82,8 +82,7 @@ enum {
     CAS_SWITCH_FOREGROUND_ERROR         = 0x1501,
 
     CAS_ORIENTATION                     = 0x1600,
-    CAS_EXIT                       = 0x1700,
-    CAS_MEDIA_CONFIG                    = 0x2000
+    CAS_EXIT                       = 0x1700
 };
 
 const int CAS_THREAD_RUNNING = 1;
diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp
index f8fa942..2894178 100644
--- a/cloudphone/src/main/cpp/CasController.cpp
+++ b/cloudphone/src/main/cpp/CasController.cpp
@@ -118,24 +118,11 @@ void CasController::SetState(JNIState state)
     this->m_state = state;
 }
 
-bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
-{
-    m_nativeWindow = nativeWindow;
-    bool res = false;
-    if (isHome && this->GetState() != STOPPED && m_casClientSocket->GetStatus() != SOCKET_STATUS_RUNNING) {
-        res = Reconnect();
-        if (res) {
-            CreateDecWorker(m_nativeWindow, m_needVideoDecode);
-            StartDecWorker(!m_retainVideoDecode);
-            return true;
-        } else {
-            NotifyCommand(CAS_CONNECT_LOST, CasMsgCode::GetMsg(CAS_CONNECT_LOST));
-            return false;
-        }
-    }
+void CasController::verify() {
     std::lock_guard<std::mutex> lockGuard(this->m_lock);
-    if (isHome) {
-        return ProcessEnterForeground(m_nativeWindow);
+    if (this->GetState() == CONNECTED) {
+        INFO("Current state is CONNECTED. ");
+        return;
     }
 
     if (this->GetState() == STOPPED) {
@@ -154,47 +141,83 @@ bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
     m_clientType = CLIENT_TYPE;
     m_maxDisconnectDuration = CalcMaxDisconnectDuration(m_conf.backgroundTimeout);
 
-    std::string mediaConfigStr = "";
-    if (IsValidMediaConfig(m_mediaConfig)) {
-        mediaConfigStr = CasAppCtrlCmdUtils::MakeCommand(m_mediaConfig, SUB_COMMAND_SEPARATOR);
-    }
-    if (m_mediaConfig.find(KEY_FRAME_TYPE) != m_mediaConfig.end()) {
-        m_frameType = m_mediaConfig[KEY_FRAME_TYPE] == "h264" ? FrameType::H264 : FrameType::H265;
-    }
-
-    res = InitDataStream();
+    bool res = InitDataStream();
     if (!res) {
         CloseDataStream();
-        return false;
+        return;
     }
 
     res = CreateWorkers();
     if (!res) {
         DestroyWorkers();
         StopDecWorker(false);
-        return false;
+        return;
     }
 
     res = BuildConnection();
     if (!res) {
-        return false;
+        ERR("Failed to build connection");
+        return;
     }
 
     StartWorkers();
 
+    std::string verifyCmd = CMD_VERIFY;
+    map<string, string> parameters = { { KEY_COMMAND, verifyCmd },
+                                       { KEY_TICKET, m_ticket },
+                                       { KEY_AUTH_TS, m_authTs },
+                                       { KEY_VERIFY_DATA, m_verifyData },
+                                       { KEY_ENCRYPTED_DATA, m_encryptedData },
+                                       { KEY_SESSION_ID, m_sessionId },
+                                       { KEY_AES_IV, m_aesIv },
+                                       { KEY_SDK_VERSION, m_conf.sdkVersion },
+                                       { KEY_PROTOCOL_VERSION, m_conf.protocolVersion },
+                                       { KEY_CLIENT_TYPE, m_clientType },
+                                       { KEY_MAX_DISCONNECT_DURATION, m_maxDisconnectDuration } };
+
+    res = SendCommand(parameters);
+    if (!res) {
+        ERR("Failed to send verify command");
+    }
+}
+
+bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
+{
+    m_nativeWindow = nativeWindow;
+    bool res = false;
+    if (isHome && this->GetState() != STOPPED && m_casClientSocket->GetStatus() != SOCKET_STATUS_RUNNING) {
+        res = Reconnect();
+        if (res) {
+            CreateDecWorker(m_nativeWindow, m_needVideoDecode);
+            StartDecWorker(!m_retainVideoDecode);
+            return true;
+        } else {
+            NotifyCommand(CAS_CONNECT_LOST, CasMsgCode::GetMsg(CAS_CONNECT_LOST));
+            return false;
+        }
+    }
+    std::lock_guard<std::mutex> lockGuard(this->m_lock);
+    if (isHome) {
+        return ProcessEnterForeground(m_nativeWindow);
+    }
+
+    std::string mediaConfigStr = "";
+    if (IsValidMediaConfig(m_mediaConfig)) {
+        mediaConfigStr = CasAppCtrlCmdUtils::MakeCommand(m_mediaConfig, SUB_COMMAND_SEPARATOR);
+    }
+    if (m_mediaConfig.find(KEY_FRAME_TYPE) != m_mediaConfig.end()) {
+        m_frameType = m_mediaConfig[KEY_FRAME_TYPE] == "h264" ? FrameType::H264 : FrameType::H265;
+    }
+
+    NotifyCommand(CAS_CONNECT_SUCCESS, CasMsgCode::GetMsg(CAS_CONNECT_SUCCESS));
+    this->SetState(CONNECTED);
+
+    CreateDecWorker(m_nativeWindow, m_needVideoDecode);
+    StartDecWorker(!m_retainVideoDecode);
+
     std::string startCmd = CMD_START_APP;
     map<string, string> parameters = { { KEY_COMMAND, startCmd },
-        { KEY_TICKET, m_ticket },
-        { KEY_AUTH_TS, m_authTs },
-        { KEY_VERIFY_DATA, m_verifyData },
-        { KEY_ENCRYPTED_DATA, m_encryptedData },
-        { KEY_SESSION_ID, m_sessionId },
-        { KEY_AES_IV, m_aesIv },
-        { KEY_SDK_VERSION, m_conf.sdkVersion },
-        { KEY_PROTOCOL_VERSION, m_conf.protocolVersion },
-        { KEY_CLIENT_TYPE, m_clientType },
-        { KEY_MEDIA_CONFIG, mediaConfigStr },
-        { KEY_MAX_DISCONNECT_DURATION, m_maxDisconnectDuration } };
+        { KEY_MEDIA_CONFIG, mediaConfigStr }};
 
     res = SendCommand(parameters);
     if (!res) {
@@ -497,8 +520,6 @@ bool CasController::BuildConnection()
         NotifyCommand(CAS_RESOURCE_IN_USING, CasMsgCode::GetMsg(CAS_RESOURCE_IN_USING));
         return false;
     }
-    NotifyCommand(CAS_CONNECT_SUCCESS, CasMsgCode::GetMsg(CAS_CONNECT_SUCCESS));
-    this->SetState(CONNECTED);
     return true;
 }
 
@@ -900,11 +921,5 @@ void CasController::NotifyFirstVideoFrame()
 
 void CasController::OnCmdRecv(int code, string msg)
 {
-    if (code == CAS_MEDIA_CONFIG) {
-        m_frameType = msg.find("h265") != string::npos ? FrameType::H265 : FrameType::H264;
-        StopDecWorker(false);
-        CreateDecWorker(m_nativeWindow, m_needVideoDecode);
-        StartDecWorker(!m_retainVideoDecode);
-    }
     NotifyCommand(code, msg);
 }
\ No newline at end of file
diff --git a/cloudphone/src/main/cpp/CasController.h b/cloudphone/src/main/cpp/CasController.h
index 94f1858..915657e 100644
--- a/cloudphone/src/main/cpp/CasController.h
+++ b/cloudphone/src/main/cpp/CasController.h
@@ -43,6 +43,8 @@ public:
 
     ~CasController();
 
+    void verify();
+
     bool Start(ANativeWindow *nativeWindow, bool isHome);
 
     bool Stop(bool isHome);
diff --git a/cloudphone/src/main/cpp/CasJniBridge.cpp b/cloudphone/src/main/cpp/CasJniBridge.cpp
index 8c4afd1..91be995 100644
--- a/cloudphone/src/main/cpp/CasJniBridge.cpp
+++ b/cloudphone/src/main/cpp/CasJniBridge.cpp
@@ -52,6 +52,11 @@ static std::string jstring2string(JNIEnv *env, jstring jStr)
     return ret;
 }
 
+JNIEXPORT void JNICALL JNI(verify)(JNIEnv *, jclass)
+{
+    gJniApiCtrl->verify();
+}
+
 JNIEXPORT jboolean JNICALL JNI(start)(JNIEnv *env, jclass, jobject surface, jboolean isHome)
 {
     if (surface == nullptr) {
diff --git a/cloudphone/src/main/cpp/CasJniBridge.h b/cloudphone/src/main/cpp/CasJniBridge.h
index 47a4c8d..03d9d17 100644
--- a/cloudphone/src/main/cpp/CasJniBridge.h
+++ b/cloudphone/src/main/cpp/CasJniBridge.h
@@ -26,6 +26,8 @@ JNIEXPORT jboolean JNICALL JNI(start)(JNIEnv *env, jclass, jobject surface, jboo
 
 JNIEXPORT jboolean JNICALL JNI(reconnect)(JNIEnv *env, jclass);
 
+JNIEXPORT void JNICALL JNI(verify)(JNIEnv *env, jclass);
+
 JNIEXPORT void JNICALL JNI(stop)(JNIEnv *env, jclass, jboolean isHome);
 
 JNIEXPORT jobject JNICALL JNI(getBitmap)(JNIEnv *env, jclass);
diff --git a/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h b/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h
index 3495f6a..9408535 100644
--- a/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h
+++ b/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h
@@ -32,6 +32,7 @@ const std::string CMD_PAUSE = "4";
 const std::string CMD_RESUME = "5";
 const std::string CMD_REQ_IFRAME = "6";
 const std::string CMD_SET_MEDIA_CONFIG = "7";
+const std::string CMD_VERIFY = "8";
 const std::string CMD_HEARTBEAT_RESPONSE = "1000";
 
 class CasAppCtrlCmdUtils {
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/api/ICloudPhone.java b/cloudphone/src/main/java/com/huawei/cloudphone/api/ICloudPhone.java
index 5cf371a..394117e 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/api/ICloudPhone.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/api/ICloudPhone.java
@@ -40,8 +40,9 @@ public interface ICloudPhone {
      *
      * @param context 应用的上下文
      * @param type    TV/PHONE
+     * @param params   启动参数
      */
-    void init(Context context, DevType type) throws Exception;
+    void init(Context context, DevType type, final Map<String, String> params) throws Exception;
 
     /**
      * 反初始化SDK
@@ -52,10 +53,9 @@ public interface ICloudPhone {
      * 启动云手机
      *
      * @param activity activity
-     * @param view     手机画面渲染ViewGoup
-     * @param params   启动参数
+     * @param view     手机画面渲染ViewGroup
      */
-    void startCloudPhone(final Activity activity, final ViewGroup view, final Map<String, String> params) throws Exception;
+    void startCloudPhone(final Activity activity, final ViewGroup view) throws Exception;
 
     /**
      * 停止云手机
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java b/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
index c83f83f..ad0acad 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
@@ -65,7 +65,6 @@ import java.util.TimerTask;
 import static android.view.KeyEvent.KEYCODE_BACK;
 import static android.view.KeyEvent.KEYCODE_VOLUME_DOWN;
 import static android.view.KeyEvent.KEYCODE_VOLUME_UP;
-import static android.view.KeyEvent.META_ALT_ON;
 import static com.huawei.cloudphone.api.CloudPhoneParas.DisplayMode.DISPLAY_MODE_FILL;
 import static com.huawei.cloudphone.common.CasState.CAS_CONNECT_EXCEPTION;
 import static com.huawei.cloudphone.utils.CasMediaUtils.isValidMediaConfig;
@@ -83,6 +82,7 @@ public class CloudPhoneImpl implements ICloudPhone {
     private static final int CMD_STOP = 1;
     private static final int CMD_PAUSE = 2;
     private static final int CMD_RESUME = 3;
+    private static final int CMD_VERIFY = 4;
     private static final int CMD_SURFACE_CREATE = 11;
     private static final int CMD_SURFACE_DESTROY = 12;
     private static final int CMD_STATE_CHANGE = 14;
@@ -142,7 +142,7 @@ public class CloudPhoneImpl implements ICloudPhone {
     }
 
     @Override
-    public void init(Context context, CloudPhoneParas.DevType type) {
+    public void init(Context context, CloudPhoneParas.DevType type, Map<String, String> params) {
         CASLog.i(TAG, "init called mCurrentState = " + mCurrentState);
         if (mCurrentState != STATE_DEINIT) {
             return;
@@ -167,6 +167,20 @@ public class CloudPhoneImpl implements ICloudPhone {
         mCmdHandler = new CmdHandler(mCmdHandlerThread.getLooper());
         mDevType = type;
         mCurrentState = STATE_INIT;
+
+        mStartParas = params;
+        mConnectorInfo = new CasConnectorInfo();
+        if (!mConnectorInfo.initConnectorParams(mStartParas)) {
+            CASLog.e(TAG, "Init connector params failed.");
+            throw new IllegalArgumentException("Init connector params failed.");
+        }
+
+        CASLog.e(TAG, "ip = " + mConnectorInfo.getConnectIp() + ", port = " + mConnectorInfo.getConnectPort());
+        mBgTimeout = Integer.parseInt(mConnectorInfo.getBackgroundTimeout()) * 1000;
+
+        Message msg = new Message();
+        msg.what = CMD_VERIFY;
+        mCmdHandler.sendMessage(msg);
     }
 
     @Override
@@ -191,7 +205,7 @@ public class CloudPhoneImpl implements ICloudPhone {
     }
 
     @Override
-    public void startCloudPhone(Activity activity, ViewGroup view, Map<String, String> params) {
+    public void startCloudPhone(Activity activity, ViewGroup view) {
         if (mCurrentState == STATE_DEINIT) {
             CASLog.e(TAG, "Call init first.");
             throw new IllegalStateException("Call init first.");
@@ -199,13 +213,6 @@ public class CloudPhoneImpl implements ICloudPhone {
         CASLog.i(TAG, "startCloudPhone called");
         mActivity = activity;
         mViewGroup = view;
-        mStartParas = params;
-        mConnectorInfo = new CasConnectorInfo();
-        if (!mConnectorInfo.initConnectorParams(mStartParas)) {
-            CASLog.e(TAG, "Init connector params failed.");
-            throw new IllegalArgumentException("Init connector params failed.");
-        }
-        mBgTimeout = Integer.parseInt(mConnectorInfo.getBackgroundTimeout()) * 1000;
         mIsStartSuccess = false;
         Message msg = new Message();
         msg.what = CMD_START;
@@ -324,6 +331,15 @@ public class CloudPhoneImpl implements ICloudPhone {
         }
     }
 
+    public void handleVerifyCmd() {
+        if (mCurrentState != STATE_INIT) {
+            CASLog.e(TAG, "mCurrentState = " + mCurrentState);
+            return;
+        }
+        mCASClient.setCasConnectorInfo(mConnectorInfo);
+        mCASClient.verify();
+    }
+
     public void handleStartCmd(final Activity activity, final ViewGroup views) {
         if (null == activity) {
             CASLog.e(TAG, "handle start cmd fail, activity is null.");
@@ -494,7 +510,6 @@ public class CloudPhoneImpl implements ICloudPhone {
 
     private void handleSurfaceCreateCmd(Message msg) {
         synchronized (mCloudPhoneLock) {
-            mCASClient.setCasConnectorInfo(mConnectorInfo);
             CASLog.i(TAG, "handleSurfaceCreateCmd mCurrentState = " + mCurrentState);
             if (mCurrentState == STATE_STARTING) {
                 mCASClient.setSurface(mSurfaceView.getHolder().getSurface());
@@ -715,6 +730,10 @@ public class CloudPhoneImpl implements ICloudPhone {
                 }
             }
             switch (msg.what) {
+                case CMD_VERIFY:
+                    CASLog.i(TAG, "CMD_VERIFY");
+                    handleVerifyCmd();
+                    break;
                 case CMD_START:
                     CASLog.i(TAG, "CMD_START");
                     handleStartCmd(mActivity, mViewGroup);
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 ccf80ac..341cce0 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java
@@ -72,6 +72,8 @@ public class JNIWrapper {
 
     public static native void setJniConf(String key, String value);
 
+    public static native void verify();
+
     public static native boolean start(Surface surface, boolean isHome);
 
     public static native void stop(boolean isHome);
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java b/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java
index 1bef8cd..c625c7d 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java
@@ -67,7 +67,7 @@ public class CASClient {
         try {
             mCasInterface.init();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call init");
+            CASLog.e(TAG, "failed to call init");
         }
     }
 
@@ -78,7 +78,7 @@ public class CASClient {
         try {
             mCasInterface.setEncryptData(encryptData);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call setEncryptData");
+            CASLog.e(TAG, "failed to call setEncryptData");
         }
     }
 
@@ -89,7 +89,18 @@ public class CASClient {
         try {
             mCasInterface.setSurface(suf);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call setSurface");
+            CASLog.e(TAG, "failed to call setSurface");
+        }
+    }
+
+    public void verify() {
+        if (mCasInterface == null) {
+            return;
+        }
+        try {
+            mCasInterface.verify();
+        } catch (RemoteException e) {
+            CASLog.e(TAG, "failed to call verify");
         }
     }
 
@@ -101,7 +112,7 @@ public class CASClient {
         try {
             ret = mCasInterface.start(isHome);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call start");
+            CASLog.e(TAG, "failed to call start");
             ret = false;
         }
         return ret;
@@ -114,7 +125,7 @@ public class CASClient {
         try {
             mCasInterface.stop(isHome);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call stop");
+            CASLog.e(TAG, "failed to call stop");
         }
     }
 
@@ -125,7 +136,7 @@ public class CASClient {
         try {
             mCasInterface.pause();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call pause");
+            CASLog.e(TAG, "failed to call pause");
         }
     }
 
@@ -136,7 +147,7 @@ public class CASClient {
         try {
             mCasInterface.resume();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call resume");
+            CASLog.e(TAG, "failed to call resume");
         }
     }
 
@@ -148,7 +159,7 @@ public class CASClient {
         try {
             ret = mCasInterface.isConnect();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call isConnect");
+            CASLog.e(TAG, "failed to call isConnect");
             ret = false;
         }
         return ret;
@@ -162,7 +173,7 @@ public class CASClient {
         try {
             ret = mCasInterface.reconnect();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call reconnect");
+            CASLog.e(TAG, "failed to call reconnect");
             ret = false;
         }
         return ret;
@@ -175,7 +186,7 @@ public class CASClient {
         try {
             mCasInterface.registerListener(listener);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call registerListener");
+            CASLog.e(TAG, "failed to call registerListener");
         }
     }
 
@@ -186,7 +197,7 @@ public class CASClient {
         try {
             mCasInterface.unregisterListener();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call unregisterListener");
+            CASLog.e(TAG, "failed to call unregisterListener");
         }
     }
 
@@ -198,7 +209,7 @@ public class CASClient {
         try {
             ret = mCasInterface.sendTouchEvent(id, action, x, y, pressure, time, orientation, height, width);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call sendTouchEvent");
+            CASLog.e(TAG, "failed to call sendTouchEvent");
             ret = false;
         }
         return ret;
@@ -212,7 +223,7 @@ public class CASClient {
         try {
             ret = mCasInterface.sendKeyEvent(keycode, action);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call sendKeyEvent");
+            CASLog.e(TAG, "failed to call sendKeyEvent");
             ret = false;
         }
         return ret;
@@ -226,7 +237,7 @@ public class CASClient {
         try {
             ret = mCasInterface.sendMotionEvent(materAxis, materValue, secondaryAxis, secondaryValue);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call sendMotionEvent");
+            CASLog.e(TAG, "failed to call sendMotionEvent");
             ret = false;
         }
         return ret;
@@ -239,7 +250,7 @@ public class CASClient {
         try {
             mCasInterface.setCasConnectorInfo(info);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call setCasConnectorInfo");
+            CASLog.e(TAG, "failed to call setCasConnectorInfo");
         }
     }
 
@@ -250,7 +261,7 @@ public class CASClient {
         try {
             mCasInterface.setMediaConfig(mediaConfigMap);
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call setMediaConfig");
+            CASLog.e(TAG, "failed to call setMediaConfig");
         }
     }
 
@@ -262,7 +273,7 @@ public class CASClient {
         try {
             ret = mCasInterface.getState();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call getState");
+            CASLog.e(TAG, "failed to call getState");
             ret = 0;
         }
         return ret;
@@ -276,7 +287,7 @@ public class CASClient {
         try {
             lag = mCasInterface.getLag();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call getLag");
+            CASLog.e(TAG, "failed to call getLag");
             lag = 0;
         }
         return lag;
@@ -290,7 +301,7 @@ public class CASClient {
         try {
             ret = mCasInterface.startJniRecv();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call startJniRecv");
+            CASLog.e(TAG, "failed to call startJniRecv");
             ret = false;
         }
         return ret;
@@ -303,7 +314,7 @@ public class CASClient {
         try {
             mCasInterface.stopJniRecv();
         } catch (RemoteException e) {
-            CASLog.e(TAG, "filed to call stopJniRecv");
+            CASLog.e(TAG, "failed to call stopJniRecv");
         }
     }
 
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 a189ad4..78d457b 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java
@@ -119,6 +119,12 @@ public class CasProcessor extends ICASAidlInterface.Stub {
         mSurface = suf;
     }
 
+    @Override
+    public void verify() throws RemoteException {
+        CASLog.i(TAG, "verify....");
+        JNIWrapper.verify();
+    }
+
     @Override
     public boolean start(boolean isHome) throws RemoteException {
         CASLog.i(TAG, "start....");
-- 
Gitee


From 9038a4257cf98b9858f5daffe264fa24fa6c0aed Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Thu, 6 Jul 2023 15:37:11 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3activity=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=97=AA=E5=B1=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=80=80?=
 =?UTF-8?q?=E5=87=BA=E5=90=8E=E5=BF=AB=E9=80=9F=E9=87=8D=E8=BF=9E=E9=BB=91?=
 =?UTF-8?q?=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloudapp/ui/CasCloudMainActivity.java     | 29 +++++++++++++++++++
 .../cloudapp/ui/CasCloudPhoneActivity.java    |  8 ++++-
 app/src/main/res/values/strings.xml           |  2 ++
 .../main/cpp/cas_service/CasAppCtrlCmdUtils.h |  4 +--
 .../cas_service/CasHeartbeatController.cpp    |  4 +--
 .../cloudphone/apiimpl/CloudPhoneImpl.java    | 10 ++++---
 6 files changed, 47 insertions(+), 10 deletions(-)

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 02cc4b1..c514e31 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
@@ -17,7 +17,10 @@
 package com.huawei.cloudapp.ui;
 
 import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Bundle;
 import android.text.InputFilter;
 import android.text.Spanned;
@@ -26,6 +29,7 @@ import android.util.Log;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.huawei.cloudapp.R;
@@ -46,6 +50,17 @@ public class CasCloudMainActivity extends Activity {
     private AutoCompleteTextView mCloudPhonePort;
     private TagFlowLayout mFlowLayout;
     private CasHistory mCasHistory;
+    private Button appConnect;
+    private Button webConnect;
+    private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals("com.huawei.cloudapp.ui.CasCloudPhoneActivity.destroyed")) {
+                appConnect.setEnabled(true);
+                webConnect.setEnabled(true);
+            }
+        }
+    };
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,6 +77,14 @@ public class CasCloudMainActivity extends Activity {
         initAutoCompleteTextView("ip", mCloudPhoneIp);
         initAutoCompleteTextView("port", mCloudPhonePort);
         setAdapter(mFlowLayout);
+        registerReceiver(mBroadcastReceiver,
+                new IntentFilter("com.huawei.cloudapp.ui.CasCloudPhoneActivity.destroyed"));
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        unregisterReceiver(mBroadcastReceiver);
     }
 
     private void initView() {
@@ -71,6 +94,9 @@ public class CasCloudMainActivity extends Activity {
         initAutoCompleteTextView("port", mCloudPhonePort);
         mFlowLayout = findViewById(R.id.flow);
         setAdapter(mFlowLayout);
+        appConnect = findViewById(R.id.cloud_phone_connect);
+        webConnect = findViewById(R.id.cloud_phone_connect_web);
+
     }
 
     public void cloudPhoneConnect(View view) {
@@ -97,6 +123,9 @@ public class CasCloudMainActivity extends Activity {
         CasConnectInfo connectorInfo = getCasConnectorInfo(phoneIp, phonePort);
         intent.putExtra(CasConnectInfo.BUNDLE_KEY, connectorInfo);
         startActivity(intent);
+        overridePendingTransition(0, 0);
+        appConnect.setEnabled(false);
+        webConnect.setEnabled(false);
     }
 
     private CasConnectInfo getCasConnectorInfo(String phoneIp, String phonePort) {
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
index 64015b0..1dabfe8 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
@@ -66,6 +66,7 @@ import com.huawei.cloudphone.api.ICloudPhone;
 import com.huawei.cloudphone.virtualdevice.VirtualDeviceSession;
 import com.huawei.cloudphone.virtualdevice.common.RingBufferVirtualDeviceIO;
 
+import java.net.BindException;
 import java.util.HashMap;
 
 import static android.os.SystemClock.sleep;
@@ -306,6 +307,10 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             });
         } catch (IllegalArgumentException e) {
             showDialog(getResources().getString(R.string.cas_phone_input_param_invalid));
+        } catch (IllegalStateException e) {
+            showDialog(getResources().getString(R.string.cas_phone_init_state_error_tip_message));
+        } catch (BindException | RuntimeException e) {
+            showDialog(getResources().getString(R.string.cas_phone_init_failed_tip_message));
         } catch (Exception e) {
             CASLog.e(TAG, "startCloudApp verify failed." + e.getMessage());
             showDialog(getResources().getString(R.string.cas_phone_start_fail_tip_message));
@@ -385,6 +390,8 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         } catch (Exception e) {
             CASLog.e(TAG, "destroy failed. " + e.getMessage());
         }
+        Intent intent = new Intent("com.huawei.cloudapp.ui.CasCloudPhoneActivity.destroyed");
+        sendBroadcast(intent);
     }
 
     @Override
@@ -667,7 +674,6 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         CASLog.d(TAG, "stop cloud phone");
         doCheckConnection = false; //
         dismissAllDialogs();
-        setResult(RESULT_OK);
         finish();
         gAcitivity = null;
         if (mVirtualDeviceSession != null) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eeb9e4b..c72b489 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,8 @@
     <string name="cas_phone_play_timeout_tip_message">试玩时间已到</string>
     <string name="cas_notouch_timeout_tip_message">由于您长时间未操作游戏，服务断开</string>
     <string name="cas_phone_input_param_invalid">输入的参数不合法</string>
+    <string name="cas_phone_init_state_error_tip_message">初始化状态错误，请重试</string>
+    <string name="cas_phone_init_failed_tip_message">初始化失败，请重试</string>
     <string name="cloud_phone_id">云手机ip：</string>
     <string name="button_connect">APP连接</string>
     <string name="button_connect_web">H5连接</string>
diff --git a/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h b/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h
index 9408535..62f910d 100644
--- a/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h
+++ b/cloudphone/src/main/cpp/cas_service/CasAppCtrlCmdUtils.h
@@ -24,7 +24,8 @@ const std::string KEY_COMMAND = "command";
 const std::string KEY_RESULT = "result";
 const std::string KEY_CODE = "code";
 const std::string KEY_MSG = "msg";
-const std::string CMD_HEARTBEAT_REQUEST = "0";
+const std::string KEY_HEARTBEAT = "heartbeat";
+const std::string CMD_VERIFY = "0";
 const std::string CMD_START_APP = "1";
 const std::string CMD_STOP_APP = "2";
 const std::string CMD_RECONNECT = "3";
@@ -32,7 +33,6 @@ const std::string CMD_PAUSE = "4";
 const std::string CMD_RESUME = "5";
 const std::string CMD_REQ_IFRAME = "6";
 const std::string CMD_SET_MEDIA_CONFIG = "7";
-const std::string CMD_VERIFY = "8";
 const std::string CMD_HEARTBEAT_RESPONSE = "1000";
 
 class CasAppCtrlCmdUtils {
diff --git a/cloudphone/src/main/cpp/cas_service/CasHeartbeatController.cpp b/cloudphone/src/main/cpp/cas_service/CasHeartbeatController.cpp
index 45dcaa9..7bbb110 100644
--- a/cloudphone/src/main/cpp/cas_service/CasHeartbeatController.cpp
+++ b/cloudphone/src/main/cpp/cas_service/CasHeartbeatController.cpp
@@ -60,9 +60,7 @@ bool CasHeartbeatController::HeartBeatRequest(int timeout)
 {
     std::lock_guard<std::mutex> lockGuard(this->m_lock);
     this->m_recvStream->Clear();
-    map<string, string> parameters = { { KEY_COMMAND, CMD_HEARTBEAT_REQUEST } };
-    string msg = CasAppCtrlCmdUtils::MakeCommand(parameters);
-    return Send(msg) && WaitResponse(CMD_HEARTBEAT_RESPONSE, timeout);
+    return Send(KEY_HEARTBEAT) && WaitResponse(CMD_HEARTBEAT_RESPONSE, timeout);
 }
 
 bool CasHeartbeatController::Send(string msg)
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java b/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
index ad0acad..a69930b 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
@@ -57,6 +57,7 @@ import com.huawei.cloudphone.common.CasState;
 import com.huawei.cloudphone.service.CASClient;
 import com.huawei.cloudphone.service.CASService;
 
+import java.net.BindException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Timer;
@@ -142,10 +143,11 @@ public class CloudPhoneImpl implements ICloudPhone {
     }
 
     @Override
-    public void init(Context context, CloudPhoneParas.DevType type, Map<String, String> params) {
+    public void init(Context context, CloudPhoneParas.DevType type, Map<String, String> params) throws Exception {
         CASLog.i(TAG, "init called mCurrentState = " + mCurrentState);
         if (mCurrentState != STATE_DEINIT) {
-            return;
+            CASLog.e(TAG, "Not ready for init. current state is " + mCurrentState);
+            throw new IllegalStateException("Not ready for init.");
         }
         mConnection = new CloudPhoneServiceConnection();
         mCASClient = new CASClient();
@@ -156,12 +158,12 @@ public class CloudPhoneImpl implements ICloudPhone {
         boolean ret = mContext.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
         if (!ret) {
             CASLog.e(TAG, "Bind service failed.");
-            return;
+            throw new BindException("Bind service failed.");
         }
         mCmdHandlerThread = new HandlerThread("cmd process");
         if (mCmdHandlerThread == null) {
             CASLog.e(TAG,"Create handler thread failed.");
-            return;
+            throw new RuntimeException("Bind service failed.");
         }
         mCmdHandlerThread.start();
         mCmdHandler = new CmdHandler(mCmdHandlerThread.getLooper());
-- 
Gitee


From c5de1d0d4cb4278ec6753b13517bc6728c53d662 Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Thu, 6 Jul 2023 19:32:49 +0800
Subject: [PATCH 7/9] =?UTF-8?q?H5=E9=A1=B5=E9=9D=A2=E5=85=A8=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                           | 2 +-
 .../java/com/huawei/cloudapp/ui/CasCloudMainActivity.java  | 6 +-----
 .../com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java   | 2 ++
 app/src/main/res/values/styles.xml                         | 7 ++++++-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a3955e..2421b1b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,7 +40,7 @@
             android:name="com.huawei.cloudapp.ui.CasCloudPhoneWebActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/cas_title_activity_fullscreen"
-            android:theme="@style/CasCloudAppMainActivityTheme"
+            android:theme="@style/CasCloudAppWebActivityTheme"
             android:hardwareAccelerated="true"/>
 
         <service
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 c514e31..30392fa 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudMainActivity.java
@@ -51,13 +51,11 @@ public class CasCloudMainActivity extends Activity {
     private TagFlowLayout mFlowLayout;
     private CasHistory mCasHistory;
     private Button appConnect;
-    private Button webConnect;
     private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals("com.huawei.cloudapp.ui.CasCloudPhoneActivity.destroyed")) {
                 appConnect.setEnabled(true);
-                webConnect.setEnabled(true);
             }
         }
     };
@@ -95,12 +93,12 @@ public class CasCloudMainActivity extends Activity {
         mFlowLayout = findViewById(R.id.flow);
         setAdapter(mFlowLayout);
         appConnect = findViewById(R.id.cloud_phone_connect);
-        webConnect = findViewById(R.id.cloud_phone_connect_web);
 
     }
 
     public void cloudPhoneConnect(View view) {
         startCloudPhoneActivity(CasCloudPhoneActivity.class);
+        appConnect.setEnabled(false);
     }
 
 
@@ -124,8 +122,6 @@ public class CasCloudMainActivity extends Activity {
         intent.putExtra(CasConnectInfo.BUNDLE_KEY, connectorInfo);
         startActivity(intent);
         overridePendingTransition(0, 0);
-        appConnect.setEnabled(false);
-        webConnect.setEnabled(false);
     }
 
     private CasConnectInfo getCasConnectorInfo(String phoneIp, String phonePort) {
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
index ce1cf64..301d3c7 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneWebActivity.java
@@ -31,6 +31,8 @@ public class CasCloudPhoneWebActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_cas_cloud_phone_web);
+        getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                View.SYSTEM_UI_FLAG_FULLSCREEN);
         mLinearLayout = findViewById(R.id.web_view);
 
         mAgentWeb = AgentWeb.with(this)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index cdbbf0f..137f663 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -8,10 +8,15 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
-    <style name="CasCloudAppMainActivityTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <style name="CasCloudAppMainActivityTheme" parent="@android:style/Theme">
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="CasCloudAppWebActivityTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowFullscreen">true</item>
+    </style>
+
     <style name="FullscreenActionBarStyle" parent="android:Widget.Holo.ActionBar">
         <item name="android:background">@color/cas_black_overlay</item>
     </style>
-- 
Gitee


From afdae82824e3d1debf1caf6e3e59293111a3daeb Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Thu, 6 Jul 2023 19:55:46 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E6=B8=85=E6=99=B0=E5=BA=A6=E6=8C=A1?=
 =?UTF-8?q?=E4=BD=8D=E6=A0=B9=E6=8D=AE=E5=88=86=E8=BE=A8=E7=8E=87=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/CasImageQualityManager.java        |  6 +-
 .../cloudapp/ui/CasCloudPhoneActivity.java    | 79 ++++++++++---------
 .../huawei/cloudapp/utils/CasQualityUtil.java | 54 ++++++-------
 app/src/main/res/layout/cas_ctrl_view.xml     | 12 +--
 app/src/main/res/values/strings.xml           |  4 +
 5 files changed, 82 insertions(+), 73 deletions(-)

diff --git a/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java b/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java
index 98d3a5d..30746f2 100644
--- a/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java
+++ b/app/src/main/java/com/huawei/cloudapp/common/CasImageQualityManager.java
@@ -18,9 +18,9 @@ package com.huawei.cloudapp.common;
 
 public class CasImageQualityManager {
 
-    public static final int QUALITY_UHD = 0;
-    public static final int QUALITY_HD = 1;
-    public static final int QUALITY_SD = 2;
+    public static final int QUALITY_BEST = 0;
+    public static final int QUALITY_MAIN = 1;
+    public static final int QUALITY_BASIC = 2;
     private volatile static CasImageQualityManager manager = null;
     private int imageQualityStatus = 0;
 
diff --git a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
index 1dabfe8..366cd2a 100644
--- a/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
+++ b/app/src/main/java/com/huawei/cloudapp/ui/CasCloudPhoneActivity.java
@@ -70,9 +70,9 @@ import java.net.BindException;
 import java.util.HashMap;
 
 import static android.os.SystemClock.sleep;
-import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_HD;
-import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_SD;
-import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_UHD;
+import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_MAIN;
+import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_BASIC;
+import static com.huawei.cloudapp.common.CasImageQualityManager.QUALITY_BEST;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.AES_KEY;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.AUTH_TS;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.AVAILABLE_PLAYTIME;
@@ -83,9 +83,9 @@ import static com.huawei.cloudapp.utils.CasConstantsUtil.SESSION_ID;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.TICKET;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.TOUCH_TIMEOUT;
 import static com.huawei.cloudapp.utils.CasConstantsUtil.USER_ID;
-import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_HD;
-import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_SD;
-import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_UHD;
+import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_BEST;
+import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_MAIN;
+import static com.huawei.cloudapp.utils.CasQualityUtil.DEFINITION_BASIC;
 import static com.huawei.cloudapp.utils.CasQualityUtil.FRAME_TYPE_H264;
 import static com.huawei.cloudapp.utils.CasQualityUtil.FRAME_TYPE_H265;
 import static com.huawei.cloudapp.utils.CasQualityUtil.RESOLUTION_1080P;
@@ -154,9 +154,9 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
     // intent trans value
     private CasConnectInfo connectInfo;
     private RadioGroup qualityRadioViewGroup;
-    private RadioButton radioViewUHD;
-    private RadioButton radioViewHD;
-    private RadioButton radioViewSD;
+    private RadioButton radioViewBest;
+    private RadioButton radioViewMain;
+    private RadioButton radioViewBasic;
     private boolean bIsStart = false;
     private boolean isGotCameraAndRecordPermission = true;
     private int mOrientation = 0;
@@ -175,17 +175,17 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
             if (group.getCheckedRadioButtonId() != checkedId) {
                 CASLog.e("CasMainActivity", "group.getCheckedRadioButtonId() != checkedId");
             } else {
-                int selectType = QUALITY_UHD;
-                String[] quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_UHD);
-                if (radioViewUHD.getId() == checkedId) {
-                    selectType = QUALITY_UHD;
-                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_UHD);
-                } else if (radioViewHD.getId() == checkedId) {
-                    selectType = QUALITY_HD;
-                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_HD);
-                } else if (radioViewSD.getId() == checkedId) {
-                    selectType = QUALITY_SD;
-                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_SD);
+                int selectType = QUALITY_BEST;
+                String[] quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_BEST);
+                if (radioViewBest.getId() == checkedId) {
+                    selectType = QUALITY_BEST;
+                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_BEST);
+                } else if (radioViewMain.getId() == checkedId) {
+                    selectType = QUALITY_MAIN;
+                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_MAIN);
+                } else if (radioViewBasic.getId() == checkedId) {
+                    selectType = QUALITY_BASIC;
+                    quality = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_BASIC);
                 }
 
                 int oldSelectType = CasImageQualityManager.getInstance().getImageQualityStatus();
@@ -270,10 +270,10 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         mQuitCloudPhone.setOnClickListener(CasCloudPhoneActivity.this);
         // ctrlView
         qualityRadioViewGroup = findViewById(R.id.pic_quality_choose_layout);
-        radioViewUHD = findViewById(R.id.pic_quality_uhd);
-        radioViewHD = findViewById(R.id.pic_quality_hd);
-        radioViewSD = findViewById(R.id.pic_quality_sd);
-        qualityRadioViewGroup.check(radioViewHD.getId());
+        radioViewBest = findViewById(R.id.pic_quality_best);
+        radioViewMain = findViewById(R.id.pic_quality_main);
+        radioViewBasic = findViewById(R.id.pic_quality_basic);
+        qualityRadioViewGroup.check(radioViewMain.getId());
         qualityRadioViewGroup.setOnCheckedChangeListener(qualityCheckedChangeListener);
 
         setRotation(mOrientation);
@@ -509,7 +509,12 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
         mResolution = String.valueOf(((Double) cloudMediaConfig.get(WIDTH)).intValue());
         mFrameType = (String) cloudMediaConfig.get(FRAME_TYPE);
         CASLog.i(TAG, "mResolution = " + mResolution + ", mFrameType = " + mFrameType);
-        String[] qualityStr = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_HD);
+        if (mResolution.equals(RESOLUTION_1080P)) {
+            radioViewBest.setText(R.string.quality_UHD);
+            radioViewMain.setText(R.string.quality_HD);
+            radioViewBasic.setText(R.string.quality_SD);
+        }
+        String[] qualityStr = CasQualityUtil.GetQuality(mFrameType, mResolution, DEFINITION_MAIN);
 
         mMediaConfig.put(BITRATE, qualityStr[0]);
         mMediaConfig.put(VIRTUAL_WIDTH, qualityStr[1]);
@@ -604,14 +609,14 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
      */
     private void checkImageQualityStatus(int selectType) {
         switch (selectType) {
-            case QUALITY_SD:
-                radioViewSD.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
+            case QUALITY_BASIC:
+                radioViewBasic.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
                 break;
-            case QUALITY_HD:
-                radioViewHD.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
+            case QUALITY_MAIN:
+                radioViewMain.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
                 break;
-            case QUALITY_UHD:
-                radioViewUHD.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
+            case QUALITY_BEST:
+                radioViewBest.setTextColor(this.getResources().getColor(R.color.cas_colorAccent));
                 break;
             default:
                 break;
@@ -623,14 +628,14 @@ public class CasCloudPhoneActivity extends FragmentActivity implements View.OnCl
      */
     private void resumeImageQualityStatus(int selectType) {
         switch (selectType) {
-            case QUALITY_SD:
-                radioViewSD.setTextColor(this.getResources().getColor(R.color.cas_white));
+            case QUALITY_BASIC:
+                radioViewBasic.setTextColor(this.getResources().getColor(R.color.cas_white));
                 break;
-            case QUALITY_HD:
-                radioViewHD.setTextColor(this.getResources().getColor(R.color.cas_white));
+            case QUALITY_MAIN:
+                radioViewMain.setTextColor(this.getResources().getColor(R.color.cas_white));
                 break;
-            case QUALITY_UHD:
-                radioViewUHD.setTextColor(this.getResources().getColor(R.color.cas_white));
+            case QUALITY_BEST:
+                radioViewBest.setTextColor(this.getResources().getColor(R.color.cas_white));
                 break;
             default:
                 break;
diff --git a/app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java b/app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java
index f80c96f..78a72ff 100644
--- a/app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java
+++ b/app/src/main/java/com/huawei/cloudapp/utils/CasQualityUtil.java
@@ -10,25 +10,25 @@ public class CasQualityUtil {
     public static final String RESOLUTION_720P = "720";
     public static final String RESOLUTION_1080P = "1080";
 
-    public static final String DEFINITION_UHD = "UHD";
-    public static final String DEFINITION_HD = "HD";
-    public static final String DEFINITION_SD = "SD";
+    public static final String DEFINITION_BEST = "best";
+    public static final String DEFINITION_MAIN = "main";
+    public static final String DEFINITION_BASIC = "basic";
 
-    private static final String H264_720P_UHD = "2000000,720,1280";
-    private static final String H264_720P_HD = "1500000,720,1280";
-    private static final String H264_720P_SD = "1100000,544,960";
+    private static final String H264_720P_BEST = "2000000,720,1280";
+    private static final String H264_720P_MAIN = "1500000,720,1280";
+    private static final String H264_720P_BASIC = "1100000,544,960";
 
-    private static final String H264_1080P_UHD = "4000000,1080,1920";
-    private static final String H264_1080P_HD = "3000000,1080,1920";
-    private static final String H264_1080P_SD = "2200000,720,1280";
+    private static final String H264_1080P_BEST = "4000000,1080,1920";
+    private static final String H264_1080P_MAIN = "3000000,1080,1920";
+    private static final String H264_1080P_BASIC = "2200000,720,1280";
 
-    private static final String H265_720P_UHD = "1400000,720,1280";
-    private static final String H265_720P_HD = "1000000,720,1280";
-    private static final String H265_720P_SD = "800000,544,960";
+    private static final String H265_720P_BEST = "1400000,720,1280";
+    private static final String H265_720P_MAIN = "1000000,720,1280";
+    private static final String H265_720P_BASIC = "800000,544,960";
 
-    private static final String H265_1080P_UHD = "2700000,1080,1920";
-    private static final String H265_1080P_HD = "2000000,1080,1920";
-    private static final String H265_1080P_SD = "1500000,720,1280";
+    private static final String H265_1080P_BEST = "2700000,1080,1920";
+    private static final String H265_1080P_MAIN = "2000000,1080,1920";
+    private static final String H265_1080P_BASIC = "1500000,720,1280";
 
     private static HashMap<String, HashMap<String, HashMap<String, String>>> quality =
             new HashMap<String, HashMap<String, HashMap<String, String>>>();
@@ -37,26 +37,26 @@ public class CasQualityUtil {
         quality.put(FRAME_TYPE_H264, new HashMap<String, HashMap<String, String>>());
 
         quality.get(FRAME_TYPE_H264).put(RESOLUTION_720P, new HashMap<String, String>());
-        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_UHD, H264_720P_UHD);
-        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_HD, H264_720P_HD);
-        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_SD, H264_720P_SD);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_BEST, H264_720P_BEST);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_MAIN, H264_720P_MAIN);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_720P).put(DEFINITION_BASIC, H264_720P_BASIC);
 
         quality.get(FRAME_TYPE_H264).put(RESOLUTION_1080P, new HashMap<String, String>());
-        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_UHD, H264_1080P_UHD);
-        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_HD, H264_1080P_HD);
-        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_SD, H264_1080P_SD);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_BEST, H264_1080P_BEST);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_MAIN, H264_1080P_MAIN);
+        quality.get(FRAME_TYPE_H264).get(RESOLUTION_1080P).put(DEFINITION_BASIC, H264_1080P_BASIC);
 
         quality.put(FRAME_TYPE_H265, new HashMap<String, HashMap<String, String>>());
 
         quality.get(FRAME_TYPE_H265).put(RESOLUTION_720P, new HashMap<String, String>());
-        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_UHD, H265_720P_UHD);
-        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_HD, H265_720P_HD);
-        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_SD, H265_720P_SD);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_BEST, H265_720P_BEST);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_MAIN, H265_720P_MAIN);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_720P).put(DEFINITION_BASIC, H265_720P_BASIC);
 
         quality.get(FRAME_TYPE_H265).put(RESOLUTION_1080P, new HashMap<String, String>());
-        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_UHD, H265_1080P_UHD);
-        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_HD, H265_1080P_HD);
-        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_SD, H265_1080P_SD);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_BEST, H265_1080P_BEST);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_MAIN, H265_1080P_MAIN);
+        quality.get(FRAME_TYPE_H265).get(RESOLUTION_1080P).put(DEFINITION_BASIC, H265_1080P_BASIC);
     }
 
     public static String[] GetQuality(String frameType, String resolution, String definition) {
diff --git a/app/src/main/res/layout/cas_ctrl_view.xml b/app/src/main/res/layout/cas_ctrl_view.xml
index 45936be..82531f7 100644
--- a/app/src/main/res/layout/cas_ctrl_view.xml
+++ b/app/src/main/res/layout/cas_ctrl_view.xml
@@ -27,34 +27,34 @@
             android:paddingBottom="10dp">
 
             <RadioButton
-                android:id="@+id/pic_quality_uhd"
+                android:id="@+id/pic_quality_best"
                 android:layout_width="0dp"
                 android:layout_height="50dp"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="超清"
+                android:text="@string/quality_HD"
                 android:textColor="@color/cas_white"
                 android:textSize="16sp" />
 
             <RadioButton
-                android:id="@+id/pic_quality_hd"
+                android:id="@+id/pic_quality_main"
                 android:layout_width="0dp"
                 android:layout_height="50dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:minHeight="60dp"
-                android:text="高清"
+                android:text="@string/quality_SD"
                 android:textColor="@color/cas_white"
                 android:textSize="16sp" />
 
             <RadioButton
-                android:id="@+id/pic_quality_sd"
+                android:id="@+id/pic_quality_basic"
                 android:layout_width="0dp"
                 android:layout_height="50dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:minHeight="60dp"
-                android:text="流畅"
+                android:text="@string/quality_FD"
                 android:textColor="@color/cas_white"
                 android:textSize="16sp" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c72b489..2a051e4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,6 +37,10 @@
     <string name="encode_type_cpu">软编</string>
     <string name="encode_type_gpu">硬编</string>
     <string name="encode_type_remote">远编</string>
+    <string name="quality_UHD">超清</string>
+    <string name="quality_HD">高清</string>
+    <string name="quality_SD">标清</string>
+    <string name="quality_FD">流畅</string>
     <string name="remote_encode_server_ip">编码服务器ip：</string>
     <string name="remote_encode_server_port">编码服务器port：</string>
     <string name="cloud_phone_frame_type">视频格式：</string>
-- 
Gitee


From 37446c15d127820ec8830adf6745c0c3169a4c66 Mon Sep 17 00:00:00 2001
From: wangshuo <584363327@qq.com>
Date: Thu, 6 Jul 2023 22:51:32 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=8F=91=E9=80=81verify?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=94=A8=E6=88=B7=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huawei/cloudphone/ICASAidlInterface.aidl  |  2 +-
 cloudphone/src/main/cpp/CasController.cpp     | 19 ++++++++++++++-----
 cloudphone/src/main/cpp/CasController.h       |  2 +-
 cloudphone/src/main/cpp/CasJniBridge.cpp      |  7 +++++--
 cloudphone/src/main/cpp/CasJniBridge.h        |  2 +-
 .../cloudphone/apiimpl/CloudPhoneImpl.java    |  8 ++++++--
 .../cloudphone/jniwrapper/JNIWrapper.java     |  2 +-
 .../huawei/cloudphone/service/CASClient.java  |  9 ++++++---
 .../cloudphone/service/CasProcessor.java      |  4 ++--
 9 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl b/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl
index 2be132f..261e919 100644
--- a/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl
+++ b/cloudphone/src/main/aidl/com/huawei/cloudphone/ICASAidlInterface.aidl
@@ -34,7 +34,7 @@ interface ICASAidlInterface {
 
     void setSurface(in Surface suf);
 
-    void verify();
+    boolean verify();
 
     boolean start(in boolean isHome);
 
diff --git a/cloudphone/src/main/cpp/CasController.cpp b/cloudphone/src/main/cpp/CasController.cpp
index 2894178..0fd0a3f 100644
--- a/cloudphone/src/main/cpp/CasController.cpp
+++ b/cloudphone/src/main/cpp/CasController.cpp
@@ -118,11 +118,11 @@ void CasController::SetState(JNIState state)
     this->m_state = state;
 }
 
-void CasController::verify() {
+bool CasController::verify() {
     std::lock_guard<std::mutex> lockGuard(this->m_lock);
     if (this->GetState() == CONNECTED) {
         INFO("Current state is CONNECTED. ");
-        return;
+        return false;
     }
 
     if (this->GetState() == STOPPED) {
@@ -144,20 +144,24 @@ void CasController::verify() {
     bool res = InitDataStream();
     if (!res) {
         CloseDataStream();
-        return;
+        return false;
     }
 
     res = CreateWorkers();
     if (!res) {
         DestroyWorkers();
         StopDecWorker(false);
-        return;
+        CloseDataStream();
+        return false;
     }
 
     res = BuildConnection();
     if (!res) {
         ERR("Failed to build connection");
-        return;
+        DestroyWorkers();
+        StopDecWorker(false);
+        CloseDataStream();
+        return false;
     }
 
     StartWorkers();
@@ -178,7 +182,12 @@ void CasController::verify() {
     res = SendCommand(parameters);
     if (!res) {
         ERR("Failed to send verify command");
+        DestroyWorkers();
+        StopDecWorker(false);
+        CloseDataStream();
+        return false;
     }
+    return true;
 }
 
 bool CasController::Start(ANativeWindow *nativeWindow, bool isHome)
diff --git a/cloudphone/src/main/cpp/CasController.h b/cloudphone/src/main/cpp/CasController.h
index 915657e..0b2ad6c 100644
--- a/cloudphone/src/main/cpp/CasController.h
+++ b/cloudphone/src/main/cpp/CasController.h
@@ -43,7 +43,7 @@ public:
 
     ~CasController();
 
-    void verify();
+    bool verify();
 
     bool Start(ANativeWindow *nativeWindow, bool isHome);
 
diff --git a/cloudphone/src/main/cpp/CasJniBridge.cpp b/cloudphone/src/main/cpp/CasJniBridge.cpp
index 91be995..6a3f4d5 100644
--- a/cloudphone/src/main/cpp/CasJniBridge.cpp
+++ b/cloudphone/src/main/cpp/CasJniBridge.cpp
@@ -52,9 +52,12 @@ static std::string jstring2string(JNIEnv *env, jstring jStr)
     return ret;
 }
 
-JNIEXPORT void JNICALL JNI(verify)(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL JNI(verify)(JNIEnv *, jclass)
 {
-    gJniApiCtrl->verify();
+    if (gJniApiCtrl->verify()) {
+        return JNI_TRUE;
+    }
+    return JNI_FALSE;
 }
 
 JNIEXPORT jboolean JNICALL JNI(start)(JNIEnv *env, jclass, jobject surface, jboolean isHome)
diff --git a/cloudphone/src/main/cpp/CasJniBridge.h b/cloudphone/src/main/cpp/CasJniBridge.h
index 03d9d17..14bbc07 100644
--- a/cloudphone/src/main/cpp/CasJniBridge.h
+++ b/cloudphone/src/main/cpp/CasJniBridge.h
@@ -26,7 +26,7 @@ JNIEXPORT jboolean JNICALL JNI(start)(JNIEnv *env, jclass, jobject surface, jboo
 
 JNIEXPORT jboolean JNICALL JNI(reconnect)(JNIEnv *env, jclass);
 
-JNIEXPORT void JNICALL JNI(verify)(JNIEnv *env, jclass);
+JNIEXPORT jboolean JNICALL JNI(verify)(JNIEnv *env, jclass);
 
 JNIEXPORT void JNICALL JNI(stop)(JNIEnv *env, jclass, jboolean isHome);
 
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java b/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
index a69930b..9e32c07 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/apiimpl/CloudPhoneImpl.java
@@ -333,13 +333,17 @@ public class CloudPhoneImpl implements ICloudPhone {
         }
     }
 
-    public void handleVerifyCmd() {
+    private void handleVerifyCmd() {
         if (mCurrentState != STATE_INIT) {
             CASLog.e(TAG, "mCurrentState = " + mCurrentState);
             return;
         }
         mCASClient.setCasConnectorInfo(mConnectorInfo);
-        mCASClient.verify();
+        if (!mCASClient.verify()) {
+            if (mStateListener != null) {
+                mStateListener.onNotify(CasState.CAS_VERIFY_FAILED, "Connect lost");
+            }
+        }
     }
 
     public void handleStartCmd(final Activity activity, final ViewGroup views) {
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 341cce0..f69568d 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/jniwrapper/JNIWrapper.java
@@ -72,7 +72,7 @@ public class JNIWrapper {
 
     public static native void setJniConf(String key, String value);
 
-    public static native void verify();
+    public static native boolean verify();
 
     public static native boolean start(Surface surface, boolean isHome);
 
diff --git a/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java b/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java
index c625c7d..282e0f5 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/service/CASClient.java
@@ -93,15 +93,18 @@ public class CASClient {
         }
     }
 
-    public void verify() {
+    public boolean verify() {
         if (mCasInterface == null) {
-            return;
+            return false;
         }
+        boolean ret;
         try {
-            mCasInterface.verify();
+            ret = mCasInterface.verify();
         } catch (RemoteException e) {
             CASLog.e(TAG, "failed to call verify");
+            ret = false;
         }
+        return ret;
     }
 
     public boolean start(boolean isHome) {
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 78d457b..d541b73 100644
--- a/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java
+++ b/cloudphone/src/main/java/com/huawei/cloudphone/service/CasProcessor.java
@@ -120,9 +120,9 @@ public class CasProcessor extends ICASAidlInterface.Stub {
     }
 
     @Override
-    public void verify() throws RemoteException {
+    public boolean verify() throws RemoteException {
         CASLog.i(TAG, "verify....");
-        JNIWrapper.verify();
+        return JNIWrapper.verify();
     }
 
     @Override
-- 
Gitee