增加服务条款

TMessagesProj/src/main/java/org/telegram/cricdit/config/Constants.java

@@ -19,6 +19,8 @@ public class Constants {
     //Privacy Policy地址
     public static final String WEB_URL_PRIVACY_POLICY = "https://m.cricdit.com/agreement?flag=app";
 
+    public static final String WEB_URL_TERMS_OF_SERVICE = "https://m.cricdit.com/service?flag=app";
+
 //    public static final String WEB_URL_NEWS_H5_PREFIX = "https://n.cricdit.com/news?id=";
     public static final String WEB_URL_NEWS_H5_PREFIX = "https://news.cricdit.com?id=";
 

TMessagesProj/src/main/java/org/telegram/cricdit/view/popup/PrivacyPolicyPopup.java

@@ -4,27 +4,21 @@ import android.content.Context;
 import android.graphics.Color;
 import android.text.SpannableString;
 import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.text.style.ClickableSpan;
 import android.text.style.ForegroundColorSpan;
+import android.text.style.UnderlineSpan;
 import android.view.View;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.lxj.xpopup.core.BottomPopupView;
 
-import org.telegram.cricdit.adapter.ReportAdapter;
-import org.telegram.cricdit.bean.ReportBean;
 import org.telegram.cricdit.utils.SPUtils;
-import org.telegram.cricdit.utils.ToastUtil;
-import org.telegram.messenger.AndroidUtilities;
+import org.telegram.messenger.LocaleController;
 import org.telegram.messenger.R;
-import org.telegram.ui.ActionBar.AlertDialog;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class PrivacyPolicyPopup extends BottomPopupView {
 
@@ -52,16 +46,8 @@ public class PrivacyPolicyPopup extends BottomPopupView {
         mDecline = findViewById(R.id.privacy_policy_decline);
         mContent = findViewById(R.id.privacy_policy_content);
 
-        String srcStr = "Read our Privacy Policy. Tap 'Agree and continue' to use";
-        String keyStr = "Privacy Policy";
-        hightStr(mContent, srcStr, keyStr);
-
-        mContent.setOnClickListener(v -> {
-            if (mOnContentClickListener != null) {
-                dismiss();
-                mOnContentClickListener.clickContent();
-            }
-        });
+        mContent.setText(getClickableSpan());
+        mContent.setMovementMethod(LinkMovementMethod.getInstance());
 
         mConfirm.setOnClickListener(v -> {
             dismiss();
@@ -76,19 +62,6 @@ public class PrivacyPolicyPopup extends BottomPopupView {
 
     }
 
-    private void hightStr(TextView titleText, String srcString, String hlStr) {
-        titleText.setText("");
-        String hlLower = hlStr.toLowerCase();
-        int lastEnd = 0;
-        SpannableString spannableString = new SpannableString(srcString);
-        for (int i = 0; i <= srcString.length() - hlStr.length(); i++) {
-            if (srcString.substring(i, i + hlStr.length()).toLowerCase().equals(hlLower)) {
-                spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#4c8eca")), i, i + hlStr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-            }
-        }
-        titleText.append(spannableString);
-    }
-
     private OnContentClickListener mOnContentClickListener;
 
     public void setOnContentClickListener(OnContentClickListener onContentClickListener) {
@@ -97,10 +70,58 @@ public class PrivacyPolicyPopup extends BottomPopupView {
 
     public interface OnContentClickListener {
 
-        void clickContent();
+        void clickContent(int i);
 
         void decline();
 
     }
 
+    //设置超链接文字
+    private SpannableString getClickableSpan() {
+
+        String str1 = LocaleController.getString(R.string.CdReadOur) + " ";
+        String str2 = LocaleController.getString(R.string.CdPrivacyPolicy);
+        String str3 = LocaleController.getString(R.string.CdAgree) + " ";
+        String str4 = LocaleController.getString(R.string.CdTOS);
+
+        int privacyLengthStart = str1.length();
+        int privacyLengthEnd = str1.length() + str2.length();
+
+        int serviceLengthStart = str1.length() + str2.length() + str3.length();
+        int serviceLengthEnd = str1.length() + str2.length() + str3.length() + str4.length();
+
+
+        SpannableString spanStr = new SpannableString(str1 + str2 + str3 + str4);
+        //设置下划线文字
+//        spanStr.setSpan(new UnderlineSpan(), privacyLengthStart, privacyLengthEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        //设置文字的单击事件
+        spanStr.setSpan(new ClickableSpan() {
+
+            @Override
+            public void onClick(View widget) {
+                if (mOnContentClickListener != null) {
+                    dismiss();
+                    mOnContentClickListener.clickContent(0);
+                }
+            }
+        }, privacyLengthStart, privacyLengthEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        //设置文字的前景色
+        spanStr.setSpan(new ForegroundColorSpan(getContext().getResources().getColor(R.color.colorBlue)), privacyLengthStart, privacyLengthEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        //设置下划线文字
+//        spanStr.setSpan(new UnderlineSpan(), serviceLengthStart, serviceLengthEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        //设置文字的单击事件
+        spanStr.setSpan(new ClickableSpan() {
+
+            @Override
+            public void onClick(View widget) {
+                if (mOnContentClickListener != null) {
+                    dismiss();
+                    mOnContentClickListener.clickContent(1);
+                }
+            }
+        }, serviceLengthStart, serviceLengthEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        //设置文字的前景色
+        spanStr.setSpan(new ForegroundColorSpan(getContext().getResources().getColor(R.color.colorBlue)), serviceLengthStart, serviceLengthEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        return spanStr;
+    }
 }

TMessagesProj/src/main/java/org/telegram/onecric/ui/activity/MatchActivity.java

@@ -13,7 +13,6 @@ import androidx.viewpager.widget.ViewPager;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.tabs.TabLayout;
 import com.lxj.xpopup.XPopup;
-import com.lxj.xpopup.core.BasePopupView;
 
 import org.telegram.cricdit.adapter.NewsViewPagerAdapter;
 import org.telegram.cricdit.base.BaseTabActivity;
@@ -148,14 +147,16 @@ public class MatchActivity extends BaseTabActivity {
                 mPopupView = new PrivacyPolicyPopup(getContext(), new PrivacyPolicyPopup.OnContentClickListener() {
 
                     @Override
-                    public void clickContent() {
+                    public void clickContent(int i) {
                         mPopupView.dismiss();
-                        presentFragment(new WebviewActivity(Constants.WEB_URL_PRIVACY_POLICY, ""));
+                        if (i==0) {
+                            presentFragment(new WebviewActivity(Constants.WEB_URL_PRIVACY_POLICY, ""));
+                        } else {
+                            presentFragment(new WebviewActivity(Constants.WEB_URL_TERMS_OF_SERVICE, ""));
+                        }
                     }
-
                     @Override
                     public void decline() {
-//                        finishFragment();
                         getParentActivity().finish();
                         System.exit(0);
                     }

TMessagesProj/src/main/res/layout/layout_privacy_policy.xml

@@ -10,7 +10,7 @@
         android:id="@+id/privacy_policy_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/privacy_policy"
+        android:text="@string/CdWelcome"
         android:textColor="@color/colorBlack"
         android:textSize="16sp"
         android:textStyle="bold"
@@ -24,8 +24,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:paddingStart="10dp"
-        android:paddingEnd="10dp"
         android:gravity="center"
         android:textColor="@color/colorBlack"
         android:textSize="14sp"

TMessagesProj/src/main/res/values/strings.xml

@@ -31,6 +31,14 @@
     <string name="CdPointsRecord">Points record</string>
     <string name="CdCrcma">Crcma</string>
 
+    <string name="CdReadOur">Read our</string>
+<!--    <string name="CdPrivacyPolicy">Privacy Policy</string>-->
+    <string name="CdAgree">. Tap \'Agree and continue\' to accept the</string>
+    <string name="CdTOS">Terms of Service</string>
+
+    <string name="CdWelcome">Welcome to Cricdit</string>
+
+
 
     <!--==============================Cricdit结束================================-->
 

gradle.properties

@@ -15,8 +15,8 @@
 #Sat Mar 12 05:53:50 MSK 2016
 #APP_VERSION_NAME=9.0.2
 #APP_VERSION_CODE=2808
-APP_VERSION_NAME=0.1.9
-APP_VERSION_CODE=20
+APP_VERSION_NAME=0.2.0
+APP_VERSION_CODE=21
 #APP_PACKAGE=org.telegram.messenger
 APP_PACKAGE=com.cricdit.cricdit
 RELEASE_KEY_PASSWORD=123456