carlos 10 сар өмнө
parent
commit
2c5b402072

+ 2 - 0
app/src/main/java/com/sikey/veryfit/constant/UrlConstants.kt

@@ -20,6 +20,8 @@ object UrlConstants {
     const val IDENTITY_ADMIN: Int = 3
     const val IDENTITY_SUPER_ADMIN: Int = 4
 
+    val SUPPORT_LANGUAGE = arrayOf("en", "de", "fr", "es", "it")
+
     //正式服url
     @JvmField
     var BaseURL = "https://app.smartojoy.com:1443"

+ 15 - 2
app/src/main/java/com/sikey/veryfit/ui/avtivity/component/right/AboutusActivity.kt

@@ -18,6 +18,7 @@ import com.sikey.veryfit.R
 import com.sikey.veryfit.app.DataManager.Companion.instance
 import com.sikey.veryfit.component.other.SubSkipHandler
 import com.sikey.veryfit.constant.UrlConstants
+import com.sikey.veryfit.constant.UrlConstants.SUPPORT_LANGUAGE
 import com.sikey.veryfit.ui.adapter.AboutusListAdapter
 import com.sikey.veryfit.ui.adapter.item.AboutusItem
 import com.sikey.veryfit.ui.adapter.type.AboutusType
@@ -111,7 +112,13 @@ class AboutusActivity : BaseNoActionBarActivity() {
 
                 ResUtils.getString(R.string.software_agreement) -> {
                     item.subHandler = SubSkipHandler { context ->
-                        val uri = Uri.parse("https://life-content.idoocloud.com/page/user_agreement/${Locale.getDefault().language}/VeryFit%20Kids.html")
+                        val language = Locale.getDefault().language
+                        val languageFin = if(SUPPORT_LANGUAGE.contains(language)) {
+                            language
+                        } else {
+                            "en"
+                        }
+                        val uri = Uri.parse("https://life-content.idoocloud.com/page/user_agreement/$languageFin/VeryFit%20Kids.html")
                         val intent = Intent(Intent.ACTION_VIEW, uri)
                         context.startActivity(intent)
                     }
@@ -119,7 +126,13 @@ class AboutusActivity : BaseNoActionBarActivity() {
 
                 ResUtils.getString(R.string.software_privacy) -> {
                     item.subHandler = SubSkipHandler { context ->
-                        val uri = Uri.parse("https://life-content.idoocloud.com/page/privacy_policy/${Locale.getDefault().language}/VeryFit%20Kids.html")
+                        val language = Locale.getDefault().language
+                        val languageFin = if(SUPPORT_LANGUAGE.contains(language)) {
+                            language
+                        } else {
+                            "en"
+                        }
+                        val uri = Uri.parse("https://life-content.idoocloud.com/page/privacy_policy/$languageFin/VeryFit%20Kids.html")
                         val intent = Intent(Intent.ACTION_VIEW, uri)
                         context.startActivity(intent)
                     }

+ 15 - 2
app/src/main/java/com/sikey/veryfit/ui/avtivity/login/SignupActivity.kt

@@ -28,6 +28,7 @@ import com.sikey.veryfit.component.network.http.model.RegisterReq
 import com.sikey.veryfit.component.network.http.toMap
 import com.sikey.veryfit.constant.Constant
 import com.sikey.veryfit.constant.UrlConstants
+import com.sikey.veryfit.constant.UrlConstants.SUPPORT_LANGUAGE
 import com.sikey.veryfit.k2.utils.AESUtils
 import com.sikey.veryfit.ui.avtivity.base.BaseNoActionBarActivity
 import com.sikey.veryfit.ui.fragment.signup.RegisterPhoneFragment
@@ -99,7 +100,13 @@ class SignupActivity : BaseNoActionBarActivity(), View.OnClickListener {
 /*            val intent = Intent(this@SignupActivity, ShowArtimenTermsActivity::class.java)
             intent.putExtra(ShowArtimenTermsActivity.TYPE_TERM, ShowArtimenTermsActivity.TYPE_USER)
             startActivity(intent)*/
-            val uri = Uri.parse("https://life-content.idoocloud.com/page/user_agreement/${Locale.getDefault().language}/VeryFit%20Kids.html")
+            val language = Locale.getDefault().language
+            val languageFin = if(SUPPORT_LANGUAGE.contains(language)) {
+                language
+            } else {
+                "en"
+            }
+            val uri = Uri.parse("https://life-content.idoocloud.com/page/user_agreement/$languageFin/VeryFit%20Kids.html")
             val intent = Intent(Intent.ACTION_VIEW, uri)
             startActivity(intent)
         }
@@ -117,7 +124,13 @@ class SignupActivity : BaseNoActionBarActivity(), View.OnClickListener {
                 ShowArtimenTermsActivity.TYPE_PRIVACY
             )
             startActivity(intent)*/
-            val uri = Uri.parse("https://life-content.idoocloud.com/page/privacy_policy/${Locale.getDefault().language}/VeryFit%20Kids.html")
+            val language = Locale.getDefault().language
+            val languageFin = if(SUPPORT_LANGUAGE.contains(language)) {
+                language
+            } else {
+                "en"
+            }
+            val uri = Uri.parse("https://life-content.idoocloud.com/page/privacy_policy/$languageFin/VeryFit%20Kids.html")
             val intent = Intent(Intent.ACTION_VIEW, uri)
             startActivity(intent)
         }