diff --git a/iFish7/src/main/java/com/ifish/activity/AboutActivity.java b/iFish7/src/main/java/com/ifish/activity/AboutActivity.java
index d94c02776..c95dad141 100644
--- a/iFish7/src/main/java/com/ifish/activity/AboutActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/AboutActivity.java
@@ -10,6 +10,7 @@ package com.ifish.activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.Intent;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Bundle;
@@ -59,7 +60,9 @@ public class AboutActivity extends BaseActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.about_activity);
initTitle("关于我们");
- findViewById(R.id.tv_statement).setOnClickListener(this);
+ findViewById(R.id.layout_explain).setOnClickListener(this);
+ findViewById(R.id.layout_policy).setOnClickListener(this);
+ findViewById(R.id.layout_register).setOnClickListener(this);
c_logo = findMyViewById(R.id.c_logo);
findViewById(R.id.c_logo).setOnClickListener(this);
TextView tv_version = (TextView) findViewById(R.id.tv_version);
@@ -248,10 +251,27 @@ public class AboutActivity extends BaseActivity {
public void onClick(View v) {
super.onClick(v);
switch (v.getId()) {
- case R.id.tv_statement:
+ case R.id.layout_explain:
startActivity(StatementActivity.class);
AnimationUtil.startAnimation(AboutActivity.this);
break;
+ case R.id.layout_policy:
+ Intent ix = new Intent();
+ ix.setClass(this, WebViewActivity.class);//注册协议
+ ix.putExtra(WebViewActivity.URL, HttpManager.PRIVACY_URL);
+ ix.putExtra(WebViewActivity.WEBVIEWTITLE, Commons.Text.PRIVACY_TITLE);
+ startActivity(ix);
+ AnimationUtil.startAnimation(this);
+ break;
+
+ case R.id.layout_register:
+ Intent i = new Intent();
+ i.setClass(this, WebViewActivity.class);//注册协议
+ i.putExtra(WebViewActivity.URL, HttpManager.REGISTERAGREEMENT_URL);
+ i.putExtra(WebViewActivity.WEBVIEWTITLE, Commons.Text.REGISTERAGREEMENT);
+ startActivity(i);
+ AnimationUtil.startAnimation(this);
+ break;
case R.id.c_logo:
// debugMode();
// changeURL();
diff --git a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java
index 0afcdf3bf..a95bd1075 100644
--- a/iFish7/src/main/java/com/ifish/activity/LoginActivity.java
+++ b/iFish7/src/main/java/com/ifish/activity/LoginActivity.java
@@ -126,6 +126,7 @@ public class LoginActivity extends BaseActivity {
findViewById(R.id.title_text_right).setOnClickListener(this);
findViewById(R.id.tv_forget).setOnClickListener(this);
findViewById(R.id.tv_check).setOnClickListener(this);
+ findViewById(R.id.tv_policy).setOnClickListener(this);
}
@Override
@@ -144,6 +145,15 @@ public class LoginActivity extends BaseActivity {
startActivity(i);
AnimationUtil.startAnimation(this);
break;
+
+ case R.id.tv_policy:
+ Intent ix = new Intent();
+ ix.setClass(this, WebViewActivity.class);//注册协议
+ ix.putExtra(WebViewActivity.URL, HttpManager.PRIVACY_URL);
+ ix.putExtra(WebViewActivity.WEBVIEWTITLE, Text.PRIVACY_TITLE);
+ startActivity(ix);
+ AnimationUtil.startAnimation(this);
+ break;
case R.id.title_text_right:
startActivity(RegisteredActivity.class);
AnimationUtil.startAnimation(this);
diff --git a/iFish7/src/main/res/layout/about_activity.xml b/iFish7/src/main/res/layout/about_activity.xml
index 1a9816ee3..ad713a3c3 100644
--- a/iFish7/src/main/res/layout/about_activity.xml
+++ b/iFish7/src/main/res/layout/about_activity.xml
@@ -74,20 +74,132 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
+ android:layout_marginTop="10dp"
android:textColor="@color/text_hint_login"
android:textSize="13sp"
android:text="上海鱼影科技有限公司"
/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/iFish7/src/main/res/layout/login_activity.xml b/iFish7/src/main/res/layout/login_activity.xml
index 796a7b679..b1a170a4a 100644
--- a/iFish7/src/main/res/layout/login_activity.xml
+++ b/iFish7/src/main/res/layout/login_activity.xml
@@ -112,13 +112,14 @@
android:textColor="@color/main_tab_grey"
android:textSize="14sp" />
-
-
+
+
+
-
+