马上连更改

app/src/main/assets/agreement.html

@@ -26,22 +26,22 @@
 
     <p class="font_content">a) Our goal is to provide quality service to all customers. Please read these terms of service carefully before you access the site or the service. <br/>
       </p>
-    <p class="font_content">b) These Terms of Service (“the Terms”) govern your use of the 影猫加速器 and the associated website domains (the “Site”) and related service (the “Services”), which are owned and operated by the 影猫加速器 Team (“影猫加速器,” “our”, “we” or “us”). The Terms constitute a legally binding agreement (the “Agreement”) between you and the 影猫 加速器 Team.</p>
+    <p class="font_content">b) These Terms of Service (“the Terms”) govern your use of the 马上连加速器 and the associated website domains (the “Site”) and related service (the “Services”), which are owned and operated by the 马上连加速器 Team (“马上连加速器,” “our”, “we” or “us”). The Terms constitute a legally binding agreement (the “Agreement”) between you and the 马上连 加速器 Team.</p>
     <p class="font_subtitle">
-      影猫加速器 Service
+      马上连加速器 Service
     </p>
     <p class="font_content">a) You understand that we are providing you with a virtual private network (or "加速器") service, which includes, but is not limited to, the use of servers, transport, routers, IP addresses and other equipment and protocols to transmit information over our network (the "System"). You agree to abide by the Terms with respect to your use of the Service.</p>
     <p class="font_subtitle">
       Usage Policy
     </p>
-    <p class="font_content">a) BY USING 影猫 加速器 SERVICE (the "Service") YOU AGREE:</p>
+    <p class="font_content">a) BY USING 马上连 加速器 SERVICE (the "Service") YOU AGREE:</p>
     <p class="font_content">a) NOT to use the system for sending spam, port scanning, scanning for open proxies or open relays, sending opt-in email, unsolicited email or any type or version of email sent in large quantities even if the email is ultimately sent off of another server.</p>
     <p class="font_content">b) NOT to launch any pop-ups from our service.</p>
     <p class="font_content">c) NOT to attack in any way shape or form any other computer or network while on our service.</p>
     <p class="font_content">d) NOT to use the service for things that could hurt our network or other people.</p>
-    <p class="font_content">b) It is the user responsibility to know and comprehend any and all relevant laws related to any jurisdiction or venue that concerns you and your actions. 影猫 加速器 is not liable in any way or form for actions done by its users including a criminal liability and a civil liability for harm executed or not executed beyond any money paid to 影猫 加速器 for its services by a concrete individual.</p>
+    <p class="font_content">b) It is the user responsibility to know and comprehend any and all relevant laws related to any jurisdiction or venue that concerns you and your actions. 马上连 加速器 is not liable in any way or form for actions done by its users including a criminal liability and a civil liability for harm executed or not executed beyond any money paid to 马上连 加速器 for its services by a concrete individual.</p>
-    <p class="font_content">c) Violations of this Usage Policy or the Terms may result in termination of your account, without any refund of amounts previously paid for the Service. Additionally, you may be held responsible for any and all damages incurred to 影猫 加速器, including any amounts charged by any outside entity due to said violation(s), including attorney’s fees and costs without limitation.</p>
+    <p class="font_content">c) Violations of this Usage Policy or the Terms may result in termination of your account, without any refund of amounts previously paid for the Service. Additionally, you may be held responsible for any and all damages incurred to 马上连 加速器, including any amounts charged by any outside entity due to said violation(s), including attorney’s fees and costs without limitation.</p>
-    <p class="font_content">d) 影猫 加速器 enables you to download software, software updates or patches, or other utilities and tools onto your mobile phones or Internet-enabled device. 影猫 加速器 ("the Software") grants to you a nonexclusive, limited license to use the Software solely for the purpose stated by 影猫 加速器 at the time the Software is made available to you and in accordance with these Terms. Modifying, distributing to unauthorized parties, reverse engineering, or otherwise using the Software in any way not expressly authorized by 影猫 加速器, is strictly prohibited.</p>
+    <p class="font_content">d) 马上连 加速器 enables you to download software, software updates or patches, or other utilities and tools onto your mobile phones or Internet-enabled device. 马上连 加速器 ("the Software") grants to you a nonexclusive, limited license to use the Software solely for the purpose stated by 马上连 加速器 at the time the Software is made available to you and in accordance with these Terms. Modifying, distributing to unauthorized parties, reverse engineering, or otherwise using the Software in any way not expressly authorized by 马上连 加速器, is strictly prohibited.</p>
     <p class="font_subtitle">
       Disclaimers
     </p>

app/src/main/assets/privacy.html

@@ -24,7 +24,7 @@
         <p class="font_subtitle">
           引言
         </p>
-        <p class="font_content">影猫非常重视您的隐私。因此，我们制定了涵盖如何收集、使用、披露、转让以及存储您的信息的隐私政策。如您使用或继续使用我们的服务，都表示您同意我们按照本《影猫隐私政策》收集、使用、储存和分享您的信息。请花些时间熟悉我们针对客户隐私的做法，如有任何疑问，请联系我们。</p>
+        <p class="font_content">马上连非常重视您的隐私。因此，我们制定了涵盖如何收集、使用、披露、转让以及存储您的信息的隐私政策。如您使用或继续使用我们的服务，都表示您同意我们按照本《马上连隐私政策》收集、使用、储存和分享您的信息。请花些时间熟悉我们针对客户隐私的做法，如有任何疑问，请联系我们。</p>
 
         <p class="font_subtitle">
           信息收集
@@ -44,25 +44,25 @@
         <p class="font_subtitle">
           信息使用
         </p>
-        <p class="font_content">影猫利用收集的信息来提供、维护、保护和改进服务，同时开发新的服务为用户创造更好的体验，并提高我们的总体服务品质。</p>
+        <p class="font_content">马上连利用收集的信息来提供、维护、保护和改进服务，同时开发新的服务为用户创造更好的体验，并提高我们的总体服务品质。</p>
 
         <p class="font_subtitle">
-          您理解并同意，影猫可在如下情形使用您的信息：
+          您理解并同意，马上连可在如下情形使用您的信息：
         </p>
         <p class="font_content">1）向您提供服务，特别是为您提供定制服务；</p>
         <p class="font_content">2）在我们提供服务时，用于身份验证、客户服务、安全防范、诈骗监测、存档和备份用途，确保我们向您提供的产品和服务的安全性；</p>
         <p class="font_content">3）帮助我们设计新服务，改善我们现有服务；</p>
         <p class="font_content">4）向您提供与您更加相关的广告以替代普遍投放的广告；</p>
         <p class="font_content">5）评估我们服务中的广告和其他促销及推广活动的效果，并加以改善；</p>
-        <p class="font_content">6）影猫可能会对产品使用情况进行统计，并可能会与公众分享这些统计信息，以展示我们服务的整体使用趋势；</p>
+        <p class="font_content">6）马上连可能会对产品使用情况进行统计，并可能会与公众分享这些统计信息，以展示我们服务的整体使用趋势；</p>
         <p class="font_content">7）软件认证或管理软件升级；</p>
         <p class="font_content">8）其他有利于为您提供服务的情形。</p>
 
         <p class="font_subtitle">
           信息披露
         </p>
-        <p class="font_content">除以下情形外，未经您的同意，影猫不会与任何第三方分享您的个人信息。</p>
+        <p class="font_content">除以下情形外，未经您的同意，马上连不会与任何第三方分享您的个人信息。</p>
-        <p class="font_content">影猫可能将您的个人信息与我们的关联公司、合作伙伴及第三方服务供应商、承包商及代理（例如代表我们发出电子邮件或推送通知的通讯服务提供商）分享（他们可能并非位于您所在的法域），用作下列用途：</p>
+        <p class="font_content">马上连可能将您的个人信息与我们的关联公司、合作伙伴及第三方服务供应商、承包商及代理（例如代表我们发出电子邮件或推送通知的通讯服务提供商）分享（他们可能并非位于您所在的法域），用作下列用途：</p>
         <p class="font_content">1）向您提供我们的服务；</p>
         <p class="font_content">2）实现“我们可能如何使用信息”部分所述目的；</p>
         <p class="font_content">3）理解、维护和改善我们的服务。</p>

app/src/main/java/com/yingmao/clash/act/ChangeNodeActivity.kt

@@ -570,14 +570,14 @@ class ChangeNodeActivity : BaseActivity() {
                 tvProA.setBackgroundResource(R.drawable.oc_proxy_choose_bg)
                 tvProj.setBackgroundResource(0)
                 tvProA.setTextColor(Color.parseColor("#FFFFFF"))
-                tvProj.setTextColor(Color.parseColor("#B36C1B"))
+                tvProj.setTextColor(Color.parseColor("#000000"))
                 sendMode(false)
             }
 
             ProxyMode.GLOBAL -> {
                 isGlo = true
                 tvProA.setBackgroundResource(0)
-                tvProA.setTextColor(Color.parseColor("#B36C1B"))
+                tvProA.setTextColor(Color.parseColor("#000000"))
                 tvProj.setTextColor(Color.parseColor("#FFFFFF"))
                 tvProj.setBackgroundResource(R.drawable.oc_proxy_choose_bg)
                 sendMode(true)

app/src/main/java/com/yingmao/clash/act/SplashActivity.kt

@@ -220,7 +220,7 @@ class SplashActivity : BaseActivity() {
         username = Utils.getUniqueID(this)
         MainApplication.initUtil()
         setLocalLanguage()
-        splashAtyVM.getSplashBg()
+//        splashAtyVM.getSplashBg()
         var clashBinder = MainApplication.getApp()?.let {
             ClashManager(it).wrap() as IClashManager
         }
@@ -887,13 +887,13 @@ class SplashActivity : BaseActivity() {
                                     showUpdateDialog(md.versionPath!!, md.illustrate!!, false)
                                 }
                             } else {
-                                val intent = Intent(this@SplashActivity, UIMainActivity::class.java)
+                                val intent = Intent(this@SplashActivity, NewMainActivity::class.java)
                                 startActivity(intent)
                                 finish()
                             }
                         }
                     } else {
-                        val intent = Intent(this@SplashActivity, UIMainActivity::class.java)
+                        val intent = Intent(this@SplashActivity, NewMainActivity::class.java)
                         startActivity(intent)
                         finish()
                     }

app/src/main/res/drawable/oc_proxy_bg.xml

@@ -3,7 +3,7 @@
     <item>
         <shape>
             <!--    边框颜色 -->
-            <solid android:color="#B36C1B"/>
+            <solid android:color="#FFF"/>
             <corners android:topRightRadius="24dp" android:topLeftRadius="24dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="3dp"/>
         </shape>
     </item>
@@ -11,7 +11,7 @@
     <item android:top="1dp" android:left="1dp" android:right="3dp" android:bottom="3dp" >
         <shape>
             <!--     View填充颜色 -->
-            <solid android:color="#FFE7CC" />
+            <solid android:color="#5F8AFF" />
             <corners android:topRightRadius="24dp" android:topLeftRadius="24dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="3dp"/>
 
         </shape>

app/src/main/res/drawable/oc_proxy_choose_bg.xml

@@ -3,7 +3,7 @@
     <item>
         <shape>
             <!--    边框颜色 -->
-            <solid android:color="#B36C1B"/>
+            <solid android:color="#FFF"/>
             <corners android:topRightRadius="24dp" android:topLeftRadius="24dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="3dp"/>
         </shape>
     </item>
@@ -11,7 +11,7 @@
     <item android:top="1dp" android:left="1dp" android:right="4dp" android:bottom="4dp" >
         <shape>
             <!--     View填充颜色 -->
-            <solid android:color="#FF8A04" />
+            <solid android:color="#3428E8" />
             <corners android:topRightRadius="24dp" android:topLeftRadius="24dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="3dp"/>
 
         </shape>

app/src/main/res/layout/activity_change_node.xml

@@ -90,7 +90,7 @@
             android:layout_weight="1"
             android:text="@string/jsmpri"
             android:gravity="center"
-            android:textColor="#B36C1B"
+            android:textColor="#000"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             />

app/src/main/res/layout/new_main_activity.xml

@@ -214,7 +214,7 @@
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="30dp"
+            android:layout_marginTop="40dp"
             />
 
         <LinearLayout
@@ -356,6 +356,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
+                    android:visibility="gone"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/clSing">

build.gradle.kts

@@ -107,6 +107,7 @@ subprojects {
                 buildConfigField("boolean", "is_back_cn", "false")
                 buildConfigField("boolean", "is_ym", "true")
                 buildConfigField("boolean", "is_tz", "false")
+                buildConfigField("boolean", "is_yunti", "false")
                 buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"")
                 buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"")
                 buildConfigField("boolean", "is_free", "false")
@@ -118,6 +119,25 @@ subprojects {
                     )
                 )
             }
+            create("6961") {
+                isDefault = true
+                dimension = flavorDimensionList[0]
+                buildConfigField("boolean", "PREMIUM", "Boolean.parseBoolean(\"false\")")
+                buildConfigField("boolean", "is_back_cn", "false")
+                buildConfigField("boolean", "is_ym", "true")
+                buildConfigField("boolean", "is_tz", "false")
+                buildConfigField("boolean", "is_yunti", "false")
+                buildConfigField("String", "applicationId", "\"com.jsq.mashanglian\"")
+                buildConfigField("String", "service_url", "\"https://api.ymvpnpro.cc:8700\"")
+                buildConfigField("boolean", "is_free", "false")
+                buildConfigField("String", "productId", "\"6961\"")
+                manifestPlaceholders(
+                    mapOf(
+                        "APP_NAME" to "@string/ConnectImmediately",
+                        "APP_ICON" to "@mipmap/logo_connect_immediately"
+                    )
+                )
+            }
         }
         sourceSets {
             getByName("9972") {