android:textSize="15sp"

                    android:paddingLeft="44px"

                    android:gravity="center"/>

                    android:textSize="15sp" />

                <ToggleButton

                    android:id="@+id/sex_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_alignParentEnd="true"

                    android:layout_alignParentRight="true"

                    android:layout_centerVertical="true"

                    android:layout_gravity="center_horizontal"

                    android:layout_marginRight="5dp"

                    android:background="@android:color/transparent"

                    android:button="@drawable/sex_btn"

                    android:gravity="center"

                    android:textOff=""

                    android:textOn=""

                    android:layout_marginRight="5dp"

                    android:layout_centerVertical="true"

                    android:layout_alignParentRight="true"

                    android:layout_alignParentEnd="true" />

                    android:textOn="" />

            </com.zhy.autolayout.AutoRelativeLayout>

            <View

                android:layout_width="match_parent"

                android:layout_height="0.5dp"

                android:background="@color/ui_line"

                android:layout_marginLeft="44px"

                android:visibility="gone"/>

                android:background="@color/ui_line"

                android:visibility="gone" />

            <com.zhy.autolayout.AutoRelativeLayout

                android:layout_width="fill_parent"

                android:layout_height="139px"

                android:visibility="gone">

                <TextView

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:gravity="center"

                    android:paddingLeft="44px"

                    android:text="真实姓名"

                    android:textColor="@color/title_row"

                    android:textSize="15sp"

                    android:paddingLeft="44px"

                    android:gravity="center"/>

                    android:textSize="15sp" />

                <EditText

                    android:id="@+id/et_realName"

                    android:layout_width="wrap_content"

                    android:layout_height="139px"

                    android:layout_alignParentTop="true"

                    android:layout_alignParentEnd="true"

                    android:layout_alignParentRight="true"

                    android:layout_marginEnd="44px"

                    android:layout_marginRight="44px"

                    android:background="@color/white"

                    android:gravity="center|right"

                    android:hint="请输入真实姓名"

                    android:singleLine="true"

                    android:textColorHint="@color/ui_68"

                    android:textColor="@color/ui_62"

                    android:gravity="center|right"

                    android:textSize="15sp"

                    android:layout_alignParentTop="true"

                    android:layout_alignParentRight="true"

                    android:layout_alignParentEnd="true"

                    android:layout_marginRight="44px"

                    android:layout_marginEnd="44px" />

                    android:textColorHint="@color/ui_68"

                    android:textSize="15sp" />

            </com.zhy.autolayout.AutoRelativeLayout>

@ -324,113 +285,112 @@

                android:background="@color/ui_line" />

        </LinearLayout>

        <com.zhy.autolayout.AutoLinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:layout_marginTop="15dp"

            android:background="@color/white"

            android:layout_marginTop="15dp">

            android:orientation="vertical">

        <View

            android:layout_width="match_parent"

            android:layout_height="0.5dp"

            android:background="@color/ui_line"

            android:visibility="gone"/>

            <View

                android:layout_width="match_parent"

                android:layout_height="0.5dp"

                android:background="@color/ui_line"

                android:visibility="gone" />

        <com.zhy.autolayout.AutoRelativeLayout

            android:layout_width="fill_parent"

            android:layout_height="139px"

            android:background="@color/white"

            android:visibility="gone">

            <com.zhy.autolayout.AutoRelativeLayout

                android:layout_width="fill_parent"

                android:layout_height="139px"

                android:background="@color/white"

                android:visibility="gone">

            <ToggleButton

                android:id="@+id/car_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_horizontal"

                android:background="@android:color/transparent"

                android:button="@drawable/car_btn"

                android:layout_marginLeft="44px"

                android:gravity="center"

                android:textOff=""

                android:textOn=""

                android:layout_centerVertical="true"

                android:visibility="gone"/>

                <ToggleButton

                    android:id="@+id/car_button"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_centerVertical="true"

                    android:layout_gravity="center_horizontal"

                    android:layout_marginLeft="44px"

                    android:background="@android:color/transparent"

                    android:button="@drawable/car_btn"

                    android:gravity="center"

                    android:textOff=""

                    android:textOn=""

                    android:visibility="gone" />

        </com.zhy.autolayout.AutoRelativeLayout>

            </com.zhy.autolayout.AutoRelativeLayout>

            <com.zhy.autolayout.AutoLinearLayout

                android:layout_width="fill_parent"

                android:layout_height="45dp"

                android:background="@color/white"

                android:orientation="horizontal"

                android:visibility="gone">

        <com.zhy.autolayout.AutoLinearLayout

            android:layout_width="fill_parent"

            android:layout_height="45dp"

            android:background="@color/white"

            android:orientation="horizontal"

            android:visibility="gone">

           <com.zhy.autolayout.AutoLinearLayout

               android:id="@+id/rl_1"

               android:layout_width="0dp"

               android:layout_weight="1"

               android:layout_height="match_parent"

               android:orientation="horizontal">

                <TextView

                    android:id="@+id/onclick"

                    android:layout_width="wrap_content"

                <com.zhy.autolayout.AutoLinearLayout

                    android:id="@+id/rl_1"

                    android:layout_width="0dp"

                    android:layout_height="match_parent"

                    android:text="品牌"

                    android:paddingLeft="16dp"

                    android:textSize="16sp"

                    android:textColor="@color/hintColor"

                    android:gravity="center_vertical"/>

               <Spinner

                   android:id = "@+id/spinner_province_search_event"

                   android:layout_width = "match_parent"

                   android:layout_height ="match_parent"

                   android:gravity="center"

                   android:spinnerMode="dialog">

               </Spinner >

               <!--<ImageView-->

                   <!--android:layout_width="wrap_content"-->

                   <!--android:layout_height="wrap_content"-->

                   <!--android:src="@drawable/icon_xiala2_0"-->

                   <!--android:layout_centerVertical="true"-->

                   <!--android:layout_alignParentRight="true"-->

                   <!--android:layout_alignParentEnd="true"-->

                   <!--android:layout_marginRight="16dp" />-->

           </com.zhy.autolayout.AutoLinearLayout>

                    android:layout_weight="1"

                    android:orientation="horizontal">

                    <TextView

                        android:id="@+id/onclick"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:gravity="center_vertical"

                        android:paddingLeft="16dp"

                        android:text="品牌"

                        android:textColor="@color/hintColor"

                        android:textSize="16sp" />

                    <Spinner

                        android:id="@+id/spinner_province_search_event"

                        android:layout_width="match_parent"

                        android:layout_height="match_parent"

                        android:gravity="center"

                        android:spinnerMode="dialog"></Spinner>

                    <!--<ImageView-->

                    <!--android:layout_width="wrap_content"-->

                    <!--android:layout_height="wrap_content"-->

                    <!--android:src="@drawable/icon_xiala2_0"-->

                    <!--android:layout_centerVertical="true"-->

                    <!--android:layout_alignParentRight="true"-->

                    <!--android:layout_alignParentEnd="true"-->

                    <!--android:layout_marginRight="16dp" />-->

                </com.zhy.autolayout.AutoLinearLayout>

            <com.zhy.autolayout.AutoLinearLayout

                android:id="@+id/rl_2"

                android:layout_width="0dp"

                android:layout_weight="1"

                android:layout_height="match_parent"

                android:orientation="horizontal">

                <TextView

                    android:layout_width="wrap_content"

                <com.zhy.autolayout.AutoLinearLayout

                    android:id="@+id/rl_2"

                    android:layout_width="0dp"

                    android:layout_height="match_parent"

                    android:text="车型"

                    android:paddingLeft="44px"

                    android:textSize="16sp"

                    android:textColor="@color/hintColor"

                    android:gravity="center_vertical"/>

                <Spinner

                    android:id = "@+id/spinner_city_search_event"

                    android:layout_width = "match_parent"

                    android:layout_height ="match_parent"

                    android:gravity="center"

                    android:spinnerMode="dialog">

                </Spinner >

                <!--<ImageView-->

                    android:layout_weight="1"

                    android:orientation="horizontal">

                    <TextView

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:gravity="center_vertical"

                        android:paddingLeft="44px"

                        android:text="车型"

                        android:textColor="@color/hintColor"

                        android:textSize="16sp" />

                       <Spinner

                        android:id="@+id/spinner_city_search_event"

                        android:layout_width="match_parent"

                        android:layout_height="match_parent"

                        android:gravity="center"

                        android:spinnerMode="dialog"></Spinner>

                    <!--<ImageView-->

                    <!--android:layout_width="wrap_content"-->

                    <!--android:layout_height="wrap_content"-->

                    <!--android:src="@drawable/icon_xiala2_0"-->

@ -439,24 +399,23 @@

                    <!--android:layout_alignParentEnd="true"-->

                    <!--android:layout_marginRight="16dp" />-->

            </com.zhy.autolayout.AutoLinearLayout>

                </com.zhy.autolayout.AutoLinearLayout>

        </com.zhy.autolayout.AutoLinearLayout>

        <View

            android:layout_width="match_parent"

            android:layout_height="0.5dp"

            android:background="@color/ui_line"

            android:layout_marginLeft="16dp"

            android:visibility="gone"/>

            </com.zhy.autolayout.AutoLinearLayout>

            <View

                android:layout_width="match_parent"

                android:layout_height="0.5dp"

                android:layout_marginLeft="16dp"

                android:background="@color/ui_line"

                android:visibility="gone" />

        <View

            android:layout_width="match_parent"

            android:layout_height="0.5dp"

            android:background="@color/ui_line"

            android:visibility="gone"/>

            <View

                android:layout_width="match_parent"

                android:layout_height="0.5dp"

                android:background="@color/ui_line"

                android:visibility="gone" />

        </com.zhy.autolayout.AutoLinearLayout>

@ -513,49 +472,49 @@

                android:layout_width="match_parent"

                android:layout_height="39dp"

                android:layout_alignParentBottom="true"

                android:layout_marginTop="15dp"

                android:layout_marginLeft="15dp"

                android:layout_marginTop="15dp"

                android:layout_marginRight="15dp"

                android:layout_marginBottom="8dp"

                android:background="@drawable/textview_greenstyle"

                android:textColor="@color/white"

                android:textSize="16sp"

                android:gravity="center"

                android:text="保存"

                android:gravity="center" />

                android:textColor="@color/white"

                android:textSize="16sp" />

            <ImageView

                android:id="@+id/tv_one"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:layout_above="@+id/tv_make_sure"

                android:gravity="center"

                android:layout_centerHorizontal="true"

                android:layout_gravity="center"

                android:layout_marginBottom="20dp"

                android:background="@drawable/icon_5point"

                android:gravity="center"

                android:padding="5dp"

                android:scaleType="fitXY"

                android:background="@drawable/icon_5point"

                android:textColor="#000000"

                android:visibility="gone"

                android:layout_marginBottom="20dp"

                android:layout_above="@+id/tv_make_sure"

                android:layout_centerHorizontal="true" />

                android:visibility="gone" />

            <RelativeLayout

                android:id="@+id/rl_point"

                android:layout_width="80dp"

                android:layout_height="80dp"

                android:layout_marginBottom="50dp"

                android:layout_centerHorizontal="true"

                android:layout_alignParentBottom="true"

                android:visibility="gone"

                android:background="@drawable/icon_point_bg">

                android:layout_centerHorizontal="true"

                android:layout_marginBottom="50dp"

                android:background="@drawable/icon_point_bg"

                android:visibility="gone">

                <LinearLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:orientation="vertical"

                    android:layout_centerInParent="true">

                    android:layout_centerInParent="true"

                    android:orientation="vertical">

                    <LinearLayout

                        android:layout_width="wrap_content"

@ -566,17 +525,17 @@

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:text="+"

                            android:textSize="16sp"

                            android:textColor="@color/white"/>

                            android:textColor="@color/white"

                            android:textSize="16sp" />

                        <TextView

                            android:id="@+id/tv_point"

                            android:layout_width="wrap_content"

                            android:layout_height="wrap_content"

                            android:text="20"

                            android:textSize="19sp"

                            android:layout_marginLeft="2dp"

                            android:textColor="@color/white"/>

                            android:text="20"

                            android:textColor="@color/white"

                            android:textSize="19sp" />

                    </LinearLayout>

@ -585,16 +544,15 @@

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center_horizontal"

                        android:layout_marginTop="2dp"

                        android:text="充电币"

                        android:textSize="13sp"

                        android:textColor="@color/white"

                        android:layout_marginTop="2dp"/>

                        android:textSize="13sp" />

                </LinearLayout>

            </RelativeLayout>

        </com.zhy.autolayout.AutoRelativeLayout>

Etusivu Tutki Apua

Rekisteröidy Kirjaudu sisään

dudu

/

cdzApp

Tarkkaile 2

Äänestä 1

Fork 0

Koodi Ongelmat 0 Pull-pyynnöt 0 Commitit 477 Julkaisut 18 Wiki

Selaa lähdekoodia

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

hy 3 vuotta sitten

vanhempi

9a594d18b9

commit

be1b8e7535

8 muutettua tiedostoa jossa 64 lisäystä ja 12 poistoa

Jaettu näkymä Näytä diff tilastot

1. 7 0
     app/build.gradle
2. 12 2
     app/src/main/java/com/electric/chargingpile/activity/AboutActivity.java
3. 8 1
     app/src/main/java/com/electric/chargingpile/activity/LoginActivity.java
4. 25 7
     app/src/main/java/com/electric/chargingpile/activity/PrivacyAgreementActivity.java
5. 8 1
     app/src/main/java/com/electric/chargingpile/activity/RegisterActivity.java
6. 1 0
     app/src/main/res/layout/activity_about.xml
7. 2 0
     app/src/main/res/layout/activity_privacy_agreement.xml
8. 1 1
     app/src/main/res/values/strings.xml

+ 7 - 0

app/build.gradle

Näytä tiedosto

		@ -120,6 +120,13 @@ android {
120	120	// wandoujia {} baidu {} anzhi {} pp {} vivo {} meizu {} sougou {} c360 {}
121	121	productFlavors.all { flavor ->
122	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

Näytä tiedosto

		@ -20,6 +20,7 @@ import android.widget.ImageView;
20	20	import android.widget.TextView;
21	21	import android.widget.Toast;
22	22
	23	import com.electric.chargingpile.BuildConfig;
23	24	import com.electric.chargingpile.R;
24	25	import com.electric.chargingpile.util.BarColorUtil;
25	26	import com.electric.chargingpile.util.ToastUtil;
		@ -35,7 +36,7 @@ import pub.devrel.easypermissions.EasyPermissions;
35	36
36	37	public class AboutActivity extends Activity implements OnClickListener, EasyPermissions.PermissionCallbacks {
37	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	40	private String app_version;
40	41	Context mContext;
41	42	private static final int RC_CALL_PERM = 123;
		@ -58,6 +59,15 @@ public class AboutActivity extends Activity implements OnClickListener, EasyPerm
58	59	tv_call.setOnClickListener(this);
59	60	findViewById(R.id.tv_2).setOnClickListener(this);
60	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	71	getVersion();
62	72	}
63	73
		@ -69,7 +79,7 @@ public class AboutActivity extends Activity implements OnClickListener, EasyPerm
69	79
70	80	public void onPrivacyView(View view) {
71	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	83	startActivity(yinsintent);
74	84	}
75	85

+ 8 - 1

app/src/main/java/com/electric/chargingpile/activity/LoginActivity.java

Näytä tiedosto

		@ -17,6 +17,7 @@ import android.widget.TextView;
17	17	import android.widget.Toast;
18	18
19	19	import com.blankj.utilcode.util.LogUtils;
	20	import com.electric.chargingpile.BuildConfig;
20	21	import com.electric.chargingpile.R;
21	22	import com.electric.chargingpile.application.MainApplication;
22	23	import com.electric.chargingpile.manager.ProfileManager;
		@ -207,6 +208,12 @@ public class LoginActivity extends Activity implements View.OnClickListener {
207	208	ll_tongyi.setOnClickListener(this);
208	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	219	private void sp() {
		@ -252,7 +259,7 @@ public class LoginActivity extends Activity implements View.OnClickListener {
252	259	break;
253	260	case R.id.tv_yinsi:
254	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	263	startActivity(yinsintent);
257	264	break;
258	265

+ 25 - 7

app/src/main/java/com/electric/chargingpile/activity/PrivacyAgreementActivity.java

Näytä tiedosto

		@ -17,14 +17,16 @@ import android.view.View;
17	17	import android.widget.Button;
18	18	import android.widget.TextView;
19	19
	20	import com.electric.chargingpile.BuildConfig;
20	21	import com.electric.chargingpile.R;
21	22	import com.electric.chargingpile.manager.ProfileManager;
22	23	import com.electric.chargingpile.util.BarColorUtil;
23	24	import com.electric.chargingpile.view.AlertDialogCommon;
	25	import com.google.gson.internal.GsonBuildConfig;
24	26
25	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	31	@Override
30	32	protected void onCreate(Bundle savedInstanceState) {
		@ -47,15 +49,23 @@ public class PrivacyAgreementActivity extends Activity {
47	49
48	50	private void initView() {
49	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	64	ClickableSpan clickableSpan = new ClickableSpan() {
55	65	@Override
56	66	public void onClick(View widget) {
57	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	69	startActivity(intent);
60	70	}
61	71
		@ -72,8 +82,16 @@ public class PrivacyAgreementActivity extends Activity {
72	82	SpannableString span = new SpannableString(str);
73	83	//设置局部效果
74	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	96	agree_enter_text_view.setText(span, TextView.BufferType.SPANNABLE);
79	97	//设置触摸监听的解析对象
		@ -94,7 +112,7 @@ public class PrivacyAgreementActivity extends Activity {
94	112	@Override
95	113	public void onClick(View v) {
96	114	new AlertDialogCommon(PrivacyAgreementActivity.this).builder()
97		.setMsg("您需要同意《充电桩隐私协议》方可使用本软件")
	115	.setMsg("您需要同意《"+ appName +"隐私政策》方可使用本软件")
98	116	.setPositiveButton("不退出", new View.OnClickListener() {
99	117	@Override
100	118	public void onClick(View v) {

+ 8 - 1

app/src/main/java/com/electric/chargingpile/activity/RegisterActivity.java

Näytä tiedosto

		@ -27,6 +27,7 @@ import android.widget.LinearLayout;
27	27	import android.widget.TextView;
28	28	import android.widget.Toast;
29	29
	30	import com.electric.chargingpile.BuildConfig;
30	31	import com.electric.chargingpile.R;
31	32	import com.electric.chargingpile.application.MainApplication;
32	33	import com.electric.chargingpile.data.Register;
		@ -110,6 +111,12 @@ public class RegisterActivity extends Activity implements OnClickListener {
110	111	tv_yinsi = (TextView) findViewById(R.id.tv_yinsi);
111	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	120	animation = AnimationUtils.loadAnimation(RegisterActivity.this, R.anim.nn);
114	121	point = (ImageView) findViewById(R.id.tv_one);
115	122
		@ -380,7 +387,7 @@ public class RegisterActivity extends Activity implements OnClickListener {
380	387	break;
381	388	case R.id.tv_yinsi:
382	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	391	startActivity(yinsintent);
385	392	break;
386	393	case R.id.ll_tongyi:

+ 1 - 0

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

Näytä tiedosto

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

+ 2 - 0

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

Näytä tiedosto

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

+ 1 - 1

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

Näytä tiedosto

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