From edb3b5b41f00df77e721ef0003064c6f6dca20fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BF=8A=E6=89=8D?= <61060866@qq.com>
Date: Tue, 23 Apr 2024 18:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=B9=E8=BD=AF=E8=AF=B7=E6=B1=82=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/aispeech/nativedemo/BaseMainActivity.java    |  2 +-
 .../nativedemo/arcsoft/ArcSoftFaceCheckManager.java  | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/aispeech/nativedemo/BaseMainActivity.java b/app/src/main/java/com/aispeech/nativedemo/BaseMainActivity.java
index cf7ee4e..a3fdc6e 100644
--- a/app/src/main/java/com/aispeech/nativedemo/BaseMainActivity.java
+++ b/app/src/main/java/com/aispeech/nativedemo/BaseMainActivity.java
@@ -715,7 +715,7 @@ public class BaseMainActivity extends Activity implements DuiUpdateObserver.Upda
         PAGE_READY = false;
         mWebView2.loadUrl(getH5Url());
         mWebView2.addJavascriptObject(new JSMessage(), null);
-        if (!AppContext.getInstance().isDebugMode() || AppContext.getInstance().isDebugMode()) {
+        if (!AppContext.getInstance().isDebugMode()) {
             mWebCore.setVisibility(View.GONE);
             findViewById(R.id.setting_app).setVisibility(View.GONE);
             stopApp.setVisibility(View.GONE);
diff --git a/app/src/main/java/com/aispeech/nativedemo/arcsoft/ArcSoftFaceCheckManager.java b/app/src/main/java/com/aispeech/nativedemo/arcsoft/ArcSoftFaceCheckManager.java
index 87dce59..bf16447 100644
--- a/app/src/main/java/com/aispeech/nativedemo/arcsoft/ArcSoftFaceCheckManager.java
+++ b/app/src/main/java/com/aispeech/nativedemo/arcsoft/ArcSoftFaceCheckManager.java
@@ -157,12 +157,16 @@ public class ArcSoftFaceCheckManager implements FaceCheckInterface {
                     if (code != 200) {
                         onFail(obj.getString("msg"));
                     } else {
-                        String activeKey = obj.optString("data");
-                        if (StringUtils.isEmpty(activeKey)) {
-                            onFail("激活码为空");
-                        } else {
+                        JSONObject object = obj.getJSONObject("data");
+                        String activeKey = "";
+                        if (object != null && object.has("activationCode")) {
+                            activeKey = object.optString("activationCode");
+                        }
+                        if (!StringUtils.isEmpty(activeKey)) {
                             activeArc(activeKey, false);
                             ConfigUtil.commitArcProdActiveKey(AppContext.getInstance(), activeKey);
+                        } else {
+                            onFail("激活码为空");
                         }
                     }
                 } catch (Exception e) {