From 3e67b5009721701f37445d3f1e2aa1d2d0f4064c Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 18 Jul 2024 16:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BBhttps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                            | 2 +-
 .../hndahesudintocctmsdriver/ui/login/LoginActivity.java    | 2 +-
 .../hndahesudintocctmsdriver/ui/login/WelcomeActivity.java  | 4 ++--
 .../arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7f213bb..7315900 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,7 +105,7 @@ android {
                                     JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可.
             ]
             buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"")
-            buildConfigField("String", "BASE_URL", "\"http://app.test.dahehuoyun.com/api/\"")
+            buildConfigField("String", "BASE_URL", "\"https://app.test.dahehuoyun.com/api/\"")
             buildConfigField "boolean", "isTest", "true"
             //APP名称，可以在androidMainfest中引用
             resValue "string", "appName", "司机测试"
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
index 66b8de2..fef04e2 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java
@@ -150,7 +150,7 @@ public class LoginActivity extends BaseActivity {
         ConfigBean cb = ConfigParts.getConfigParts(con);
         if (cb != null) {
             url1 = cb.getData().getUserUrl();
-            url2 = "http://agreement.dahehuoyun.com/currency/#/";
+            url2 = "https://agreement.dahehuoyun.com/currency/#/";
         }
         TextView tv_content = findViewById(R.id.tv_content);
         String str = "我已阅读并同意相关服务条款和隐私政策《用户服务协议》和《隐私政策》";
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
index 8d040f9..511a066 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/WelcomeActivity.java
@@ -138,8 +138,8 @@ public class WelcomeActivity extends BaseAppCompatActivity {
             new XPopup.Builder(con)
                     .dismissOnBackPressed(false)
                     .dismissOnTouchOutside(false)
-                    .asCustom(new AgreementAlert(con, "http://agreement.dahehuoyun.com/currency/#/",
-                            "http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
+                    .asCustom(new AgreementAlert(con, "https://agreement.dahehuoyun.com/currency/#/",
+                            "https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/", hd))
                     .show();
         }
         Glide.with(con)
diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java
index ccf1c95..45a932c 100644
--- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java
+++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java
@@ -73,9 +73,9 @@ public class SetupActivity extends BaseActivity {
         ConfigBean cb= ConfigParts.getConfigParts(con);
         if(cb!=null){
 //            url1=cb.getData().getUserUrl();
-            url1="http://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
+            url1="https://agreement.dahehuoyun.com/rule/serviceAgreement/dist/index.html#/";
 //            url2=cb.getData().getPrivateUrl();
-            url2="http://agreement.dahehuoyun.com/currency/#/";
+            url2="https://agreement.dahehuoyun.com/currency/#/";
             kefu=cb.getData().getServiceMobile();
             url3=cb.getData().getSecurityUrl();
         }
@@ -123,7 +123,7 @@ public class SetupActivity extends BaseActivity {
             r8.setOnClickListener(v12 -> {
                 Intent in=new Intent(con,WebActivity.class);
                 in.putExtra("title","交易规则");
-                in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
+                in.putExtra("url","https://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/");
                 startActivity(in);
             });
             r6.setOnClickListener(v12 -> {