This commit is contained in:
parent
715842ad19
commit
7d1225409a
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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="上海鱼影科技有限公司"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/tv_statement"
|
||||
android:layout_above="@id/tv_yuying"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:textColor="@color/blue_connet"
|
||||
android:textSize="15sp"
|
||||
android:text="声明"
|
||||
/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_above="@id/tv_yuying"
|
||||
android:id="@+id/layout_explain"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="@dimen/shop_item"
|
||||
android:layout_marginTop="@dimen/mine_fragment_gray_size"
|
||||
android:background="@drawable/minefragment_bg_select">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_1"
|
||||
android:layout_width="@dimen/ic_mine_size"
|
||||
android:layout_height="@dimen/ic_mine_size"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/ic_mine_fragment_right"
|
||||
android:layout_marginRight="@dimen/ic_mine_fragment_right"
|
||||
android:src="@drawable/devicerefresh" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toRightOf="@+id/iv_1"
|
||||
android:text="声明"
|
||||
android:textColor="@color/shoplist_text_item"
|
||||
android:textSize="17sp" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/mine_fragment_ic_size"
|
||||
android:layout_height="@dimen/mine_fragment_ic_size"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="@dimen/mine_fragment_ic_right"
|
||||
android:src="@drawable/ic_back_right_black" />
|
||||
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0.1dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@color/line_black" />
|
||||
</RelativeLayout>
|
||||
<RelativeLayout
|
||||
android:layout_above="@id/layout_explain"
|
||||
android:id="@+id/layout_policy"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="@dimen/shop_item"
|
||||
android:layout_marginTop="@dimen/mine_fragment_gray_size"
|
||||
android:background="@drawable/minefragment_bg_select">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_2"
|
||||
android:layout_width="@dimen/ic_mine_size"
|
||||
android:layout_height="@dimen/ic_mine_size"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/ic_mine_fragment_right"
|
||||
android:layout_marginRight="@dimen/ic_mine_fragment_right"
|
||||
android:src="@drawable/ic_mine_changepsw" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toRightOf="@+id/iv_2"
|
||||
android:text="隐私政策"
|
||||
android:textColor="@color/shoplist_text_item"
|
||||
android:textSize="17sp" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/mine_fragment_ic_size"
|
||||
android:layout_height="@dimen/mine_fragment_ic_size"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="@dimen/mine_fragment_ic_right"
|
||||
android:src="@drawable/ic_back_right_black" />
|
||||
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0.1dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@color/line_black" />
|
||||
</RelativeLayout>
|
||||
<RelativeLayout
|
||||
android:layout_above="@id/layout_policy"
|
||||
android:id="@+id/layout_register"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="@dimen/shop_item"
|
||||
android:layout_marginTop="@dimen/mine_fragment_gray_size"
|
||||
android:background="@drawable/minefragment_bg_select">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv_3"
|
||||
android:layout_width="@dimen/ic_mine_size"
|
||||
android:layout_height="@dimen/ic_mine_size"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="@dimen/ic_mine_fragment_right"
|
||||
android:layout_marginRight="@dimen/ic_mine_fragment_right"
|
||||
android:src="@drawable/ic_mine_changenum" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toRightOf="@+id/iv_3"
|
||||
android:text="注册协议"
|
||||
android:textColor="@color/shoplist_text_item"
|
||||
android:textSize="17sp" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/mine_fragment_ic_size"
|
||||
android:layout_height="@dimen/mine_fragment_ic_size"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="@dimen/mine_fragment_ic_right"
|
||||
android:src="@drawable/ic_back_right_black" />
|
||||
|
||||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="0.1dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:background="@color/line_black" />
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -112,13 +112,14 @@
|
|||
android:textColor="@color/main_tab_grey"
|
||||
android:textSize="14sp" />
|
||||
|
||||
<RelativeLayout
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/bt_submit"
|
||||
android:layout_marginBottom="30dp"
|
||||
android:layout_marginLeft="@dimen/new_login_bg_width"
|
||||
android:layout_marginRight="@dimen/new_login_bg_width"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="12dp">
|
||||
|
||||
<CheckBox
|
||||
|
|
@ -129,7 +130,15 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:checked="false" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_toRightOf="@id/ct_check"
|
||||
android:text="我已同意爱鱼奇"
|
||||
android:textColor="@color/main_tab_grey"
|
||||
android:textSize="13dp" />
|
||||
<TextView
|
||||
android:id="@+id/tv_check"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -137,11 +146,30 @@
|
|||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_toRightOf="@id/ct_check"
|
||||
android:text="我已同意爱鱼奇使用协议"
|
||||
android:text="使用协议"
|
||||
android:textColor="@color/primary"
|
||||
android:textSize="13dp" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_toRightOf="@id/ct_check"
|
||||
android:text="和"
|
||||
android:textColor="@color/main_tab_grey"
|
||||
android:textSize="13dp" />
|
||||
<TextView
|
||||
android:id="@+id/tv_policy"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_toRightOf="@id/ct_check"
|
||||
android:text="隐私政策"
|
||||
android:textColor="@color/primary"
|
||||
android:textSize="13dp" />
|
||||
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue