Browse Source

根据不同渠道,进行充电桩APP名称更改,以及关键词替换

hy 3 years ago
parent
commit
be1b8e7535

+ 7 - 0
app/build.gradle

120
//        wandoujia {} baidu {} anzhi {} pp {} vivo {} meizu {} sougou {} c360 {}
120
//        wandoujia {} baidu {} anzhi {} pp {} vivo {} meizu {} sougou {} c360 {}
121
        productFlavors.all { flavor ->
121
        productFlavors.all { flavor ->
122
            flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
122
            flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
123
            if (name == "vivo") {
124
                resValue "string", "app_name", "一电充电桩"
125
                buildConfigField("String","PRIVACY_LINK","\"http://evcharge.cc/pc/privacy-vivo.html\"")
126
            }else{
127
                resValue "string", "app_name", "充电桩"
128
                buildConfigField("String","PRIVACY_LINK","\"http://evcharge.cc/pc/privacy.html\"")
129
            }
123
        }
130
        }
124
    }
131
    }
125
}
132
}

+ 12 - 2
app/src/main/java/com/electric/chargingpile/activity/AboutActivity.java

20
import android.widget.TextView;
20
import android.widget.TextView;
21
import android.widget.Toast;
21
import android.widget.Toast;
22

22

23
import com.electric.chargingpile.BuildConfig;
23
import com.electric.chargingpile.R;
24
import com.electric.chargingpile.R;
24
import com.electric.chargingpile.util.BarColorUtil;
25
import com.electric.chargingpile.util.BarColorUtil;
25
import com.electric.chargingpile.util.ToastUtil;
26
import com.electric.chargingpile.util.ToastUtil;
35

36

36
public class AboutActivity extends Activity implements OnClickListener, EasyPermissions.PermissionCallbacks {
37
public class AboutActivity extends Activity implements OnClickListener, EasyPermissions.PermissionCallbacks {
37
    private ImageView ivBack, icon_scan;
38
    private ImageView ivBack, icon_scan;
38
    private TextView tvVersion, tv_banquan, tv_call, android;
39
    private TextView tvVersion, tv_banquan, tv_call, android,privacy,nameUserProtocol;
39
    private String app_version;
40
    private String app_version;
40
    Context mContext;
41
    Context mContext;
41
    private static final int RC_CALL_PERM = 123;
42
    private static final int RC_CALL_PERM = 123;
58
        tv_call.setOnClickListener(this);
59
        tv_call.setOnClickListener(this);
59
        findViewById(R.id.tv_2).setOnClickListener(this);
60
        findViewById(R.id.tv_2).setOnClickListener(this);
60
        android = (TextView) findViewById(R.id.android);
61
        android = (TextView) findViewById(R.id.android);
62
        privacy = (TextView) findViewById(R.id.privacy);
63
        nameUserProtocol = (TextView) findViewById(R.id.nameUserProtocol);
64

65
        final String appName = getString(R.string.app_name);
66
        String privacyReplace = privacy.getText().toString().replace("充电桩", appName);
67
        privacy.setText(privacyReplace);
68
        String nameProtocolReplace = nameUserProtocol.getText().toString().replace("充电桩", appName);
69
        nameUserProtocol.setText(nameProtocolReplace);
70

61
        getVersion();
71
        getVersion();
62
    }
72
    }
63

73

69

79

70
    public void onPrivacyView(View view) {
80
    public void onPrivacyView(View view) {
71
        Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
81
        Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
72
        yinsintent.putExtra("url", "http://evcharge.cc/pc/privacy.html");
82
        yinsintent.putExtra("url", BuildConfig.PRIVACY_LINK);
73
        startActivity(yinsintent);
83
        startActivity(yinsintent);
74
    }
84
    }
75

85


+ 8 - 1
app/src/main/java/com/electric/chargingpile/activity/LoginActivity.java

17
import android.widget.Toast;
17
import android.widget.Toast;
18
18
19
import com.blankj.utilcode.util.LogUtils;
19
import com.blankj.utilcode.util.LogUtils;
20
import com.electric.chargingpile.BuildConfig;
20
import com.electric.chargingpile.R;
21
import com.electric.chargingpile.R;
21
import com.electric.chargingpile.application.MainApplication;
22
import com.electric.chargingpile.application.MainApplication;
22
import com.electric.chargingpile.manager.ProfileManager;
23
import com.electric.chargingpile.manager.ProfileManager;
207
        ll_tongyi.setOnClickListener(this);
208
        ll_tongyi.setOnClickListener(this);
208
        iv_tongyi = (ImageView) findViewById(R.id.iv_tongyi);
209
        iv_tongyi = (ImageView) findViewById(R.id.iv_tongyi);
209
210
211
        final String appName = getString(R.string.app_name);
212
        String privacyReplace = tv_yinsi.getText().toString().replace("充电桩", appName);
213
        tv_yinsi.setText(privacyReplace);
214
        String nameProtocolReplace = tv_xieyi.getText().toString().replace("充电桩", appName);
215
        tv_xieyi.setText(nameProtocolReplace);
216
210
    }
217
    }
211
218
212
    private void sp() {
219
    private void sp() {
252
                break;
259
                break;
253
            case R.id.tv_yinsi:
260
            case R.id.tv_yinsi:
254
                Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
261
                Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
255
                yinsintent.putExtra("url", "http://evcharge.cc/pc/privacy.html");
262
                yinsintent.putExtra("url", BuildConfig.PRIVACY_LINK);
256
                startActivity(yinsintent);
263
                startActivity(yinsintent);
257
                break;
264
                break;
258
265

+ 25 - 7
app/src/main/java/com/electric/chargingpile/activity/PrivacyAgreementActivity.java

17
import android.widget.Button;
17
import android.widget.Button;
18
import android.widget.TextView;
18
import android.widget.TextView;
19
19
20
import com.electric.chargingpile.BuildConfig;
20
import com.electric.chargingpile.R;
21
import com.electric.chargingpile.R;
21
import com.electric.chargingpile.manager.ProfileManager;
22
import com.electric.chargingpile.manager.ProfileManager;
22
import com.electric.chargingpile.util.BarColorUtil;
23
import com.electric.chargingpile.util.BarColorUtil;
23
import com.electric.chargingpile.view.AlertDialogCommon;
24
import com.electric.chargingpile.view.AlertDialogCommon;
25
import com.google.gson.internal.GsonBuildConfig;
24
26
25
public class PrivacyAgreementActivity extends Activity {
27
public class PrivacyAgreementActivity extends Activity {
26
28
27
    private TextView agree_enter_text_view;
29
    private TextView agree_enter_text_view,title,subtitle;
28
30
29
    @Override
31
    @Override
30
    protected void onCreate(Bundle savedInstanceState) {
32
    protected void onCreate(Bundle savedInstanceState) {
47
49
48
    private void initView() {
50
    private void initView() {
49
        agree_enter_text_view = findViewById(R.id.agree_enter_text_view);
51
        agree_enter_text_view = findViewById(R.id.agree_enter_text_view);
52
        title = findViewById(R.id.title);
53
        subtitle = findViewById(R.id.subtitle);
54
        //多渠道重新定义
55
        final String appName = getString(R.string.app_name);
56
        String titleReplace = title.getText().toString().replace("充电桩", appName);
57
        title.setText(titleReplace);
58
        String sunReplace = subtitle.getText().toString().replace("充电桩", appName);
59
        subtitle.setText(sunReplace);
60
61
        String str = "如您同意《"+appName+"隐私政策》,请点击「同意」开始使用我们的产品和服务,我们尽全力保护您的个人信息安全"; // 4-13 前包括后不包括
50
62
51
//        String str = "你选择「同意并进入」即表示充分阅读、理解并接受《充电桩APP用户协议和隐私政策》的全部内容"; //23-40 前包括后不包括
52
        String str = "如您同意《充电桩隐私政策》,请点击「同意」开始使用我们的产品和服务,我们尽全力保护您的个人信息安全"; // 4-13 前包括后不包括
53
        //超链接的块对象
63
        //超链接的块对象
54
        ClickableSpan clickableSpan = new ClickableSpan() {
64
        ClickableSpan clickableSpan = new ClickableSpan() {
55
            @Override
65
            @Override
56
            public void onClick(View widget) {
66
            public void onClick(View widget) {
57
                Intent intent = new Intent(getApplication(), MyWebViewActivity.class);
67
                Intent intent = new Intent(getApplication(), MyWebViewActivity.class);
58
                intent.putExtra("url", "http://evcharge.cc/pc/privacy.html");
68
                intent.putExtra("url", BuildConfig.PRIVACY_LINK);
59
                startActivity(intent);
69
                startActivity(intent);
60
            }
70
            }
61
71
72
        SpannableString span = new SpannableString(str);
82
        SpannableString span = new SpannableString(str);
73
        //设置局部效果
83
        //设置局部效果
74
        //(局部的效果对象,局部的起始位置,结束位置,包括方式) INCLUSIVE表示包裹, EXCLUSIVE不包括
84
        //(局部的效果对象,局部的起始位置,结束位置,包括方式) INCLUSIVE表示包裹, EXCLUSIVE不包括
75
        span.setSpan(clickableSpan, 4, 13, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);//此处为前包括后不包括
76
        span.setSpan(new StyleSpan(Typeface.BOLD), 18, 20, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
85
        int clickSpanEnd=13;
86
        int boldSpanStart=18,boldSpanEnd=20;
87
        if (appName.equals("一电充电桩")){
88
            clickSpanEnd=15;
89
            boldSpanStart=20;
90
            boldSpanEnd=22;
91
        }
92
93
        span.setSpan(clickableSpan, 4, clickSpanEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);//此处为前包括后不包括
94
        span.setSpan(new StyleSpan(Typeface.BOLD), boldSpanStart, boldSpanEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
77
        //将文本特效设置到文本框中
95
        //将文本特效设置到文本框中
78
        agree_enter_text_view.setText(span, TextView.BufferType.SPANNABLE);
96
        agree_enter_text_view.setText(span, TextView.BufferType.SPANNABLE);
79
        //设置触摸监听的解析对象
97
        //设置触摸监听的解析对象
94
            @Override
112
            @Override
95
            public void onClick(View v) {
113
            public void onClick(View v) {
96
                new AlertDialogCommon(PrivacyAgreementActivity.this).builder()
114
                new AlertDialogCommon(PrivacyAgreementActivity.this).builder()
97
                        .setMsg("您需要同意《充电桩隐私协议》方可使用本软件")
115
                        .setMsg("您需要同意《"+ appName +"隐私政策》方可使用本软件")
98
                        .setPositiveButton("不退出", new View.OnClickListener() {
116
                        .setPositiveButton("不退出", new View.OnClickListener() {
99
                            @Override
117
                            @Override
100
                            public void onClick(View v) {
118
                            public void onClick(View v) {

+ 8 - 1
app/src/main/java/com/electric/chargingpile/activity/RegisterActivity.java

27
import android.widget.TextView;
27
import android.widget.TextView;
28
import android.widget.Toast;
28
import android.widget.Toast;
29

29

30
import com.electric.chargingpile.BuildConfig;
30
import com.electric.chargingpile.R;
31
import com.electric.chargingpile.R;
31
import com.electric.chargingpile.application.MainApplication;
32
import com.electric.chargingpile.application.MainApplication;
32
import com.electric.chargingpile.data.Register;
33
import com.electric.chargingpile.data.Register;
110
        tv_yinsi = (TextView) findViewById(R.id.tv_yinsi);
111
        tv_yinsi = (TextView) findViewById(R.id.tv_yinsi);
111
        tv_yinsi.setOnClickListener(this);
112
        tv_yinsi.setOnClickListener(this);
112

113

114
        final String appName = getString(R.string.app_name);
115
        String privacyReplace = tv_yinsi.getText().toString().replace("充电桩", appName);
116
        tv_yinsi.setText(privacyReplace);
117
        String nameProtocolReplace = tv_xieyi.getText().toString().replace("充电桩", appName);
118
        tv_xieyi.setText(nameProtocolReplace);
119

113
        animation = AnimationUtils.loadAnimation(RegisterActivity.this, R.anim.nn);
120
        animation = AnimationUtils.loadAnimation(RegisterActivity.this, R.anim.nn);
114
        point = (ImageView) findViewById(R.id.tv_one);
121
        point = (ImageView) findViewById(R.id.tv_one);
115

122

380
                break;
387
                break;
381
            case R.id.tv_yinsi:
388
            case R.id.tv_yinsi:
382
                Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
389
                Intent yinsintent = new Intent(getApplication(), MyWebViewActivity.class);
383
                yinsintent.putExtra("url", "http://evcharge.cc/pc/privacy.html");
390
                yinsintent.putExtra("url", BuildConfig.PRIVACY_LINK);
384
                startActivity(yinsintent);
391
                startActivity(yinsintent);
385
                break;
392
                break;
386
            case R.id.ll_tongyi:
393
            case R.id.ll_tongyi:

+ 1 - 0
app/src/main/res/layout/activity_about.xml

101

101

102

102

103
        <TextView
103
        <TextView
104
            android:id="@+id/nameUserProtocol"
104
            android:text="《充电桩APP用户使用协议》"
105
            android:text="《充电桩APP用户使用协议》"
105
            android:layout_width="wrap_content"
106
            android:layout_width="wrap_content"
106
            android:layout_above="@+id/privacy"
107
            android:layout_above="@+id/privacy"

+ 2 - 0
app/src/main/res/layout/activity_privacy_agreement.xml

27
                android:src="@drawable/icon626" />
27
                android:src="@drawable/icon626" />
28
28
29
            <TextView
29
            <TextView
30
                android:id="@+id/title"
30
                android:layout_width="wrap_content"
31
                android:layout_width="wrap_content"
31
                android:layout_height="match_parent"
32
                android:layout_height="match_parent"
32
                android:layout_gravity="center"
33
                android:layout_gravity="center"
36
                android:textSize="24sp" />
37
                android:textSize="24sp" />
37
38
38
            <TextView
39
            <TextView
40
                android:id="@+id/subtitle"
39
                android:layout_width="match_parent"
41
                android:layout_width="match_parent"
40
                android:layout_height="wrap_content"
42
                android:layout_height="wrap_content"
41
                android:layout_marginTop="15dp"
43
                android:layout_marginTop="15dp"

+ 1 - 1
app/src/main/res/values/strings.xml

20
    <string name="time_error">时间有问题</string>
20
    <string name="time_error">时间有问题</string>
21
    <string name="string_tab_qa">聊聊</string>
21
    <string name="string_tab_qa">聊聊</string>
22
22
23
    <string name="app_name">充电桩</string>
23
24
    <string name="main_name">主界面</string>
24
    <string name="main_name">主界面</string>
25
    <string name="register_name">注册</string>
25
    <string name="register_name">注册</string>
26
    <string name="make_appointment_name">预约</string>
26
    <string name="make_appointment_name">预约</string>