From ebd02b6a6da4bef2527e691f15d828b09101edc1 Mon Sep 17 00:00:00 2001
From: Arrow Em <arrowem@ArrowdeMacBook-Pro.local>
Date: Wed, 4 Aug 2021 18:40:06 +0800
Subject: [PATCH] change the environment of demo

---
 .idea/compiler.xml                                  |  2 +-
 .idea/gradle.xml                                    |  5 ++---
 .idea/misc.xml                                      |  2 +-
 .idea/runConfigurations.xml                         | 13 -------------
 .../mogo/cloud/live/manager/MoGoLiveManager.java    |  2 +-
 .../passport/internal/InternalPassportManager.java  |  5 ++++-
 .../cloud/passport/third/ThirdPassportManager.java  |  5 ++++-
 .../mogo/cloud/socket/SocketServicesConstants.java  |  2 --
 8 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index e98503b..27207cc 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="11 (2)" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -27,7 +27,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2887110..0beb143 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -13,7 +13,7 @@
     <option name="HEAP_SIZE" value="1024" />
     <option name="LOCALE" value="zh_CN" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="12" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
index 5bc7957..674ba85 100644
--- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
+++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/MoGoLiveManager.java
@@ -406,10 +406,10 @@ public class MoGoLiveManager {
         switch (MoGoAiCloudClientConfig.getInstance().getNetMode()) {
             case HTTP_DNS_ENV_DEV:
             case HTTP_DNS_ENV_QA:
-            case HTTP_DNS_ENV_DEMO:
                 isTestEnv = true;
                 break;
             case HTTP_DNS_ENV_RELEASE:
+            case HTTP_DNS_ENV_DEMO:
                 isTestEnv = false;
         }
         mExpressEngine = ZegoExpressEngine.createEngine(
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java
index 8d0ee31..b0b5bac 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/internal/InternalPassportManager.java
@@ -62,6 +62,10 @@ public class InternalPassportManager {
         });
     }
 
+    /**
+     * 演示环境(SHOW环境)和线上环境(RELEASE)均走 Environment.release
+     * @return {@link Environment}
+     */
     private Environment getNetEnvironment() {
         int mode = mAiCloudClientConfig.getNetMode();
         Environment environment;
@@ -70,7 +74,6 @@ public class InternalPassportManager {
                 environment = Environment.dev;
                 break;
             case MogoHttpDnsConfig.HTTP_DNS_ENV_QA:
-            case MogoHttpDnsConfig.HTTP_DNS_ENV_DEMO:
                 environment = Environment.qa;
                 break;
             default:
diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java
index 1bb8cf8..2a33897 100644
--- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java
+++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/third/ThirdPassportManager.java
@@ -64,13 +64,16 @@ public class ThirdPassportManager {
                 Log.w(TAG, "loginCallback：" + loginCallback);
             }
 
+            /**
+             * 演示环境(SHOW环境)和线上环境(RELEASE)均走 Environment.release
+             * @return {@link Environment}
+             */
             Environment environment;
             switch (mAiCloudClientConfig.getNetMode()) {
                 case MogoHttpDnsConfig.HTTP_DNS_ENV_DEV:
                     environment = Environment.dev;
                     break;
                 case MogoHttpDnsConfig.HTTP_DNS_ENV_QA:
-                case MogoHttpDnsConfig.HTTP_DNS_ENV_DEMO:
                     environment = Environment.qa;
                     break;
                 default:
diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java
index 0356972..57b6496 100644
--- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java
+++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketServicesConstants.java
@@ -28,9 +28,7 @@ public class SocketServicesConstants {
             case HTTP_DNS_ENV_DEV:
                 return com.zhidao.socket.Environment.dev;
             case HTTP_DNS_ENV_QA:
-            case HTTP_DNS_ENV_DEMO:
                 return com.zhidao.socket.Environment.qa;
-            case HTTP_DNS_ENV_RELEASE:
             default:
                 return com.zhidao.socket.Environment.release;
         }