隐私合规

This commit is contained in:
jinyuer
2021-12-13 15:09:32 +08:00
parent 5234933749
commit d23b9c54f3
9 changed files with 359 additions and 65 deletions

4
.idea/misc.xml generated
View File

@@ -8,6 +8,10 @@
<component name="DesignSurface"> <component name="DesignSurface">
<option name="filePathToZoomLevelMap"> <option name="filePathToZoomLevelMap">
<map> <map>
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_login.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_logo.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/activity_main.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/dialog_initmate.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_discovery.xml" value="0.3614583333333333" /> <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_discovery.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_main.xml" value="0.3614583333333333" /> <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/fragment_main.xml" value="0.3614583333333333" />
<entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/item_discovery.xml" value="0.3614583333333333" /> <entry key="..\:/AndroidStudioProject/HouseProperty/app/src/main/res/layout/item_discovery.xml" value="0.3614583333333333" />

View File

@@ -2,12 +2,18 @@ package com.sl.house_property;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.style.ClickableSpan;
import android.util.Log; import android.util.Log;
import android.view.Gravity; import android.view.Gravity;
import android.view.View; import android.view.View;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull;
import com.cutil.RegexUtils; import com.cutil.RegexUtils;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.internal.LinkedTreeMap; import com.google.gson.internal.LinkedTreeMap;
@@ -61,7 +67,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
mDataBinding.gotoregister.setOnClickListener(this); mDataBinding.gotoregister.setOnClickListener(this);
//获取当前日期 //获取当前日期
String gettimetwo = DateUtilss.gettimetwo(); String gettimetwo = DateUtilss.gettimetwo();
Log.e("当前日期",gettimetwo); Log.e("当前日期", gettimetwo);
// if(gettimetwo.equals("2021年04月02日")||gettimetwo.equals("2021年04月03日")||gettimetwo.equals("2021年04月04日")||gettimetwo.equals("2021年04月05日")||gettimetwo.equals("2021年04月06日")){ // if(gettimetwo.equals("2021年04月02日")||gettimetwo.equals("2021年04月03日")||gettimetwo.equals("2021年04月04日")||gettimetwo.equals("2021年04月05日")||gettimetwo.equals("2021年04月06日")){
// mDataBinding.rlzhuce.setVisibility(View.GONE); // mDataBinding.rlzhuce.setVisibility(View.GONE);
// mDataBinding.lyfuwu.setVisibility(View.VISIBLE); // mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
@@ -71,6 +77,66 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
// mDataBinding.lyfuwu.setVisibility(View.VISIBLE); // mDataBinding.lyfuwu.setVisibility(View.VISIBLE);
// mDataBinding.lyyinsi.setVisibility(View.VISIBLE); // mDataBinding.lyyinsi.setVisibility(View.VISIBLE);
// } // }
String str = "我已阅读并同意《隐私政策》和《用户协议";
SpannableStringBuilder ssb = new SpannableStringBuilder();
ssb.append(str);
int v1 = str.indexOf("");
ssb.setSpan(new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
if (mDataBinding.tvYs.isSelected()) {
mDataBinding.tvYs.setSelected(false);
Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected2);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
} else {
mDataBinding.tvYs.setSelected(true);
Drawable drawable = getResources().getDrawable(R.mipmap.icon_publish_selected);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
mDataBinding.tvYs.setCompoundDrawables(drawable, null, null, null);
}
}
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setUnderlineText(false);
}
}, 0, v1, 0);
int start = str.indexOf("");
ssb.setSpan(new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
//隐私政策
WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
}
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(getResources().getColor(R.color.red));
ds.setUnderlineText(false);
}
}, start, start + 6, 0);
int end = str.lastIndexOf("");
ssb.setSpan(new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
//用户协议
WebActivitytwo.runActivity(LoginActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
}
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(getResources().getColor(R.color.red));
ds.setUnderlineText(false);
}
}, end, end + 6, 0);
} }
@Override @Override
@@ -85,9 +151,14 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
startActivity(intent2); startActivity(intent2);
break; break;
case R.id.logintext: case R.id.logintext:
if (!mDataBinding.tvYs.isSelected()) {
setToast("请先阅读并勾选同意用户协议和隐私政策");
return;
}
String phone = mDataBinding.phone.getText().toString().trim(); String phone = mDataBinding.phone.getText().toString().trim();
String password = mDataBinding.pwd.getText().toString().trim(); String password = mDataBinding.pwd.getText().toString().trim();
if (phone.length() <1) { if (phone.length() < 1) {
setToast("请输入手机号码"); setToast("请输入手机号码");
return; return;
} }
@@ -158,7 +229,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
LinkedTreeMap adta = (LinkedTreeMap) resultcode.data; LinkedTreeMap adta = (LinkedTreeMap) resultcode.data;
String s = gs.toJson(adta); String s = gs.toJson(adta);
RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象 RegisterUser user = gs.fromJson(s, RegisterUser.class);//把JSON字符串转为对象
JPushInterface.setAlias(getApplicationContext(),0,user.getUserid()); JPushInterface.setAlias(getApplicationContext(), 0, user.getUserid());
Config.getInstance(LoginActivity.this).putUser(user); Config.getInstance(LoginActivity.this).putUser(user);
Config.getInstance(LoginActivity.this).put("username", mDataBinding.phone.getText().toString().trim()); Config.getInstance(LoginActivity.this).put("username", mDataBinding.phone.getText().toString().trim());
@@ -176,7 +247,6 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
getpammar(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0); getpammar(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0);
break; break;
} }
@@ -188,7 +258,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
@Override @Override
public void call(Throwable throwable) { public void call(Throwable throwable) {
progressDialog.dismiss(); progressDialog.dismiss();
setToast( getString(R.string.getdatafailure)); setToast(getString(R.string.getdatafailure));
throwable.printStackTrace(); throwable.printStackTrace();
} }
}); });
@@ -220,12 +290,12 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
Type type = new TypeToken<ArrayList<MyHouseEntity>>() { Type type = new TypeToken<ArrayList<MyHouseEntity>>() {
}.getType(); }.getType();
final ArrayList<MyHouseEntity> list = new Gson().fromJson(s, type); final ArrayList<MyHouseEntity> list = new Gson().fromJson(s, type);
if(list.size()==0){ if (list.size() == 0) {
SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "0"); SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "0");
Log.e("fuzhi","0"); Log.e("fuzhi", "0");
}else { } else {
SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "1"); SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "1");
Log.e("fuzhi","1"); Log.e("fuzhi", "1");
} }
if (!Config.getInstance(LoginActivity.this).getBoolean("MainTabActivity", false)) { if (!Config.getInstance(LoginActivity.this).getBoolean("MainTabActivity", false)) {
@@ -249,6 +319,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
addSubscription(subscription); addSubscription(subscription);
} }
/** /**
* 用户协议 * 用户协议
* *
@@ -259,6 +330,7 @@ public class LoginActivity extends BaseActivity<ActivityLoginBinding> implements
// startActivity(intent); // startActivity(intent);
WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1"); WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
} }
/** /**
* 隐私政策 * 隐私政策
* *

View File

@@ -1,14 +1,28 @@
package com.sl.house_property; package com.sl.house_property;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
import android.view.Gravity;
import android.view.View;
import android.view.Window;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
import com.cutil.ScreenUtils; import com.cutil.ScreenUtils;
import com.sl.house_property.f2.FeeActivity; import com.sl.house_property.f2.FeeActivity;
import com.tencent.bugly.Bugly;
import cn.jpush.android.api.JPushInterface;
import tools.Config; import tools.Config;
@@ -28,21 +42,107 @@ public class LogoActivity extends Activity{
tipLP.topMargin = (int) (screenHigh*0.28); tipLP.topMargin = (int) (screenHigh*0.28);
tipImage.setLayoutParams(tipLP); tipImage.setLayoutParams(tipLP);
imaloder.postDelayed(new Runnable() {
@Override if (getSharedPreferences("first", Context.MODE_PRIVATE).getInt("first", 0) == 1) {
public void run() { imaloder.postDelayed(new Runnable() {
finish(); @Override
if( (Config.getInstance(LogoActivity.this).getUser()==null)){ public void run() {
Intent intent =new Intent(LogoActivity.this,LoginActivity.class); finish();
startActivity(intent); if( (Config.getInstance(LogoActivity.this).getUser()==null)){
}else { Intent intent =new Intent(LogoActivity.this,LoginActivity.class);
startActivity( new Intent(LogoActivity.this, MainTabActivity.class)); startActivity(intent);
}else {
startActivity( new Intent(LogoActivity.this, MainTabActivity.class));
}
}
},delaytime);
} else {
startDialog();
}
}
private void startDialog() {
AlertDialog alertDialog = new AlertDialog.Builder(this).create();
alertDialog.show();
alertDialog.setCancelable(false);
Window window = alertDialog.getWindow();
if (window != null) {
window.setContentView(R.layout.dialog_initmate);
window.setGravity(Gravity.CENTER);
TextView tvContent = window.findViewById(R.id.tv_content);
TextView tvCancel = window.findViewById(R.id.tv_cancel);
TextView tvAgree = window.findViewById(R.id.tv_agree);
String str =
" 感谢您对沃克智慧社区的支持!我们非常重视您的个人信息和隐私保护。为了更好地保障您的个人权益,在您使用我们的产品前,请务必审慎阅读《隐私政策》和《用户协议》内的所有条款。如您同意以上协议内容,请点击“同意”,开始使用我们的产品和服务!";
SpannableStringBuilder ssb = new SpannableStringBuilder();
ssb.append(str);
int start = str.indexOf("");
ssb.setSpan(new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
//隐私政策
WebActivitytwo.runActivity(LogoActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=19");
} }
@Override
public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(getResources().getColor(R.color.red));
ds.setUnderlineText(false);
}
}, start, start + 6, 0);
int end = str.lastIndexOf("");
ssb.setSpan(new ClickableSpan() {
@Override
public void onClick(@NonNull View widget) {
//用户协议
WebActivitytwo.runActivity(LogoActivity.this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1");
}
} @Override
},delaytime); public void updateDrawState(@NonNull TextPaint ds) {
super.updateDrawState(ds);
ds.setColor(getResources().getColor(R.color.red));
ds.setUnderlineText(false);
}
}, end, end + 6, 0);
tvContent.setMovementMethod(LinkMovementMethod.getInstance());
tvContent.setText(ssb, TextView.BufferType.SPANNABLE);
tvCancel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
alertDialog.cancel();
finish();
}
});
tvAgree.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
getSharedPreferences("first", Context.MODE_PRIVATE).edit().putInt("first", 1).apply();
JPushInterface.init(getApplication());
Bugly.init(getApplication(),"d45325664f",false);
alertDialog.cancel();
finish();
if( (Config.getInstance(LogoActivity.this).getUser()==null)){
Intent intent =new Intent(LogoActivity.this,LoginActivity.class);
startActivity(intent);
}else {
startActivity( new Intent(LogoActivity.this, MainTabActivity.class));
}
}
});
}
} }
} }

View File

@@ -1,25 +1,41 @@
package com.sl.house_property; package com.sl.house_property;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.Message; import android.os.Message;
import androidx.annotation.NonNull;
import androidx.viewpager.widget.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.text.SpannableStringBuilder;
import android.text.TextPaint;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
import android.util.Log; import android.util.Log;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.Window;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView;
import com.tencent.bugly.Bugly;
import java.util.ArrayList; import java.util.ArrayList;
import adapter.StartViewpagerAdapter; import adapter.StartViewpagerAdapter;
import cn.jpush.android.api.JPushInterface;
import tools.Config; import tools.Config;
import utils.ConfigTitiles; import utils.ConfigTitiles;
import utils.SetBigMap; import utils.SetBigMap;
/*gradlew compileDebug --stacktrace*/ /*gradlew compileDebug --stacktrace*/
/*gradlew compileDebugSources --stacktrace -info*/ /*gradlew compileDebugSources --stacktrace -info*/
public class MainActivity extends Activity { public class MainActivity extends Activity {
@@ -31,22 +47,28 @@ public class MainActivity extends Activity {
private ImageView point1; private ImageView point1;
private ImageView point2; private ImageView point2;
// private ImageView point3; // private ImageView point3;
public double getPagerScroCHaged() { public double getPagerScroCHaged() {
return pagerScroCHaged;} return pagerScroCHaged;
}
public void setPagerScroCHaged(double pagerScroCHaged) { public void setPagerScroCHaged(double pagerScroCHaged) {
this.pagerScroCHaged = pagerScroCHaged; this.pagerScroCHaged = pagerScroCHaged;
} }
private double pagerScroCHaged = 0.0; private double pagerScroCHaged = 0.0;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
Log.d("Main","main"); Log.d("Main", "main");
onceOrNot(); onceOrNot();
} }
private Handler mHandler = new Handler() { private Handler mHandler = new Handler() {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
@@ -55,13 +77,14 @@ public class MainActivity extends Activity {
case 20000: case 20000:
if (welcomepage.getCurrentItem() == 1) { if (welcomepage.getCurrentItem() == 1) {
startActivity(new Intent( MainActivity.this,LogoActivity.class)); startActivity(new Intent(MainActivity.this, LogoActivity.class));
finish(); finish();
} }
break; break;
} }
} }
}; };
private void onceOrNot() { private void onceOrNot() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
int once = Config.getInstance(MainActivity.this).getInt(ConfigTitiles.ONCEORNOT, 0); int once = Config.getInstance(MainActivity.this).getInt(ConfigTitiles.ONCEORNOT, 0);
@@ -72,10 +95,11 @@ public class MainActivity extends Activity {
} else { } else {
//onceStart(); //onceStart();
otherStart(); otherStart();
return; return;
} }
} }
private void onceStart() { private void onceStart() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
mGestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() { mGestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() {
@@ -131,7 +155,7 @@ public class MainActivity extends Activity {
.showImageOnLoading(R.drawable.ic_circle_progress_imageloading) .showImageOnLoading(R.drawable.ic_circle_progress_imageloading)
.build(); .build();
ImageLoader.getInstance().*/ ImageLoader.getInstance().*/
Bitmap bitmap= SetBigMap.readBitMap(MainActivity.this,R.mipmap.bg); Bitmap bitmap = SetBigMap.readBitMap(MainActivity.this, R.mipmap.bg);
image1.setImageBitmap(bitmap); image1.setImageBitmap(bitmap);
View view2 = inflater.inflate(R.layout.welcome_image, null); View view2 = inflater.inflate(R.layout.welcome_image, null);
final ImageView image2 = (ImageView) view2.findViewById(R.id.myImage); final ImageView image2 = (ImageView) view2.findViewById(R.id.myImage);
@@ -146,10 +170,10 @@ public class MainActivity extends Activity {
viewlist.add(view1); viewlist.add(view1);
viewlist.add(view2); viewlist.add(view2);
new Runnable(){ new Runnable() {
@Override @Override
public void run() { public void run() {
Bitmap bitmap2= SetBigMap.readBitMap(MainActivity.this,R.mipmap.bg); Bitmap bitmap2 = SetBigMap.readBitMap(MainActivity.this, R.mipmap.bg);
image2.setImageBitmap(bitmap2); image2.setImageBitmap(bitmap2);
} }
}.run(); }.run();
@@ -209,14 +233,18 @@ public class MainActivity extends Activity {
private void otherStart() { private void otherStart() {
// TODO Auto-generated method stub // TODO Auto-generated method stub
Intent intent = new Intent( MainActivity.this, LogoActivity.class); Intent intent = new Intent(MainActivity.this, LogoActivity.class);
startActivity(intent); startActivity(intent);
finish(); finish();
} }
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) {//分发事件 public boolean dispatchTouchEvent(MotionEvent ev) {//分发事件
super.dispatchTouchEvent(ev); super.dispatchTouchEvent(ev);
//productGestureDetector 是 GestureDetector对象 //productGestureDetector 是 GestureDetector对象
return mGestureDetector.onTouchEvent(ev); return mGestureDetector.onTouchEvent(ev);
} }
} }

View File

@@ -42,37 +42,40 @@ import utils.NineImageLoader;
* Created by 90432 on 2018/1/15. * Created by 90432 on 2018/1/15.
*/ */
public class MyApplication extends Application{ public class MyApplication extends Application {
//private static final String TAG = "JIGUANG-Example"; //private static final String TAG = "JIGUANG-Example";
private static final String TAG = MyApplication.class.getSimpleName(); private static final String TAG = MyApplication.class.getSimpleName();
public static Context context; public static Context context;
protected static MyApplication instance; protected static MyApplication instance;
public JCVideoPlayerStandard VideoPlaying; public JCVideoPlayerStandard VideoPlaying;
/* private HttpNet httpNet;
public static Handler getTheErrorHandler; /* private HttpNet httpNet;
public static boolean mainonce; public static Handler getTheErrorHandler;
public static boolean mainonce;
*/ */
public static Context getContext() { public static Context getContext() {
return context; return context;
} }
@Override
protected void attachBaseContext(Context base) { @Override
super.attachBaseContext(base); protected void attachBaseContext(Context base) {
MultiDex.install(this); super.attachBaseContext(base);
} MultiDex.install(this);
}
public static MyApplication getApp() { public static MyApplication getApp() {
return instance; return instance;
} }
public void existActivitys() {
for(Activity act :activityList){ public void existActivitys() {
for (Activity act : activityList) {
act.finish(); act.finish();
} }
} }
public void addActivitys(Activity activity ) { public void addActivitys(Activity activity) {
activityList.add(activity); activityList.add(activity);
} }
@@ -85,12 +88,15 @@ public class MyApplication extends Application{
super.onCreate(); super.onCreate();
instance = this; instance = this;
initOkGo(); initOkGo();
JPushInterface.init(this);
JPushInterface.setDebugMode(true);
//
// CrashHandler crashHandler = CrashHandler.getInstance(); // CrashHandler crashHandler = CrashHandler.getInstance();
// crashHandler.init(this); // crashHandler.init(this);
Bugly.init(this,"d45325664f",false); if (getSharedPreferences("first", Context.MODE_PRIVATE).getInt("first", 0) == 1) {
JPushInterface.init(this);
JPushInterface.setDebugMode(false);
Bugly.init(this, "d45325664f", false);
}
// System.setProperty("http.proxyHost", "haotian.hoheng.cn"); // System.setProperty("http.proxyHost", "haotian.hoheng.cn");
// System.setProperty("http.proxyPort", "8080"); // System.setProperty("http.proxyPort", "8080");
@@ -107,7 +113,6 @@ public class MyApplication extends Application{
public static final String KEY_EXTRAS = "extras"; public static final String KEY_EXTRAS = "extras";
public void exit() { public void exit() {
for (Activity act : activityList) { for (Activity act : activityList) {
act.finish(); act.finish();
@@ -116,18 +121,6 @@ public class MyApplication extends Application{
} }
private void initOkGo() { private void initOkGo() {
//---------这里给出的是示例代码,告诉你可以这么传,实际使用的时候,根据需要传,不需要就不传-------------// //---------这里给出的是示例代码,告诉你可以这么传,实际使用的时候,根据需要传,不需要就不传-------------//
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();

View File

@@ -97,14 +97,24 @@
android:background="@null" android:background="@null"
android:hint="请输入密码" /> android:hint="请输入密码" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/tv_ys"
android:layout_marginTop="16dp"
android:layout_width="match_parent"
android:layout_height="40dp"
android:text="我已阅读并同意隐私政策和用户协议"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:drawableLeft="@mipmap/icon_publish_selected2"
android:layout_marginLeft="20dip"
/>
<TextView <TextView
android:id="@+id/logintext" android:id="@+id/logintext"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="45dp" android:layout_height="45dp"
android:layout_marginLeft="20dip" android:layout_marginLeft="20dip"
android:layout_marginRight="20dip" android:layout_marginRight="20dip"
android:layout_marginTop="45dip" android:layout_marginTop="20dip"
android:background="@drawable/selector_common_btn" android:background="@drawable/selector_common_btn"
android:gravity="center" android:gravity="center"
android:text="登录" android:text="登录"

View File

@@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@color/background_color_white"
android:layout_height="wrap_content">
<LinearLayout
android:background="@color/background_color_white"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="25dp"
android:padding="5dp"
android:text="用户协议与隐私权限说明"
android:textColor="#282828"
android:textSize="20sp"
android:textStyle="bold" />
<!-- <ScrollView-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingTop="20dp"-->
<!-- android:paddingBottom="20dp">-->
<TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:lineSpacingMultiplier="1.2"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:textColor="#282828"
android:textSize="16sp" />
<!-- </ScrollView>-->
<View
android:id="@+id/view_1"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#E7E7E7" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:padding="12dp"
android:text="拒绝"
android:layout_gravity="center"
android:textColor="@color/text2"
android:textStyle="bold" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="#E7E7E7" />
<TextView
android:id="@+id/tv_agree"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_below="@+id/view_1"
android:layout_toRightOf="@+id/view_2"
android:layout_weight="1"
android:gravity="center"
android:padding="12dp"
android:text="同 意"
android:layout_gravity="center"
android:textColor="@color/text2"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>

Binary file not shown.

After

Width:  |  Height:  |  Size: 958 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 928 B