diff --git a/.idea/misc.xml b/.idea/misc.xml index 9a51d79..4da7b85 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,9 +8,26 @@ diff --git a/app/src/main/java/com/sl/house_property/AdeviseActivity.java b/app/src/main/java/com/sl/house_property/AdeviseActivity.java index 8d6ba7e..768e416 100644 --- a/app/src/main/java/com/sl/house_property/AdeviseActivity.java +++ b/app/src/main/java/com/sl/house_property/AdeviseActivity.java @@ -7,6 +7,7 @@ import android.view.Gravity; import android.view.View; import android.widget.Toast; +import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.databinding.ActivityAdeviseBinding; import java.util.HashMap; @@ -32,12 +33,11 @@ public class AdeviseActivity extends BaseActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setAbr("意见反馈", new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - },0,null,0,null,0,null,""); + ImmersionBar.with(this) + .keyboardEnable(true) //解决软键盘与底部输入框冲突问题 + // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE + // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出 + .init(); mDataBinding.comimit.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View view) { @@ -55,7 +55,12 @@ public class AdeviseActivity extends BaseActivity { } }); - + mDataBinding.left.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); mDataBinding.connent.addTextChangedListener(new TextWatcher() { @Override public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { diff --git a/app/src/main/java/com/sl/house_property/LoginActivity.java b/app/src/main/java/com/sl/house_property/LoginActivity.java index 922dc22..6320d18 100644 --- a/app/src/main/java/com/sl/house_property/LoginActivity.java +++ b/app/src/main/java/com/sl/house_property/LoginActivity.java @@ -2,12 +2,20 @@ package com.sl.house_property; import android.app.ProgressDialog; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.text.SpannableStringBuilder; +import android.text.TextPaint; +import android.text.method.LinkMovementMethod; +import android.text.style.ClickableSpan; import android.util.Log; import android.view.Gravity; import android.view.View; +import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.NonNull; + import com.cutil.RegexUtils; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; @@ -61,7 +69,7 @@ public class LoginActivity extends BaseActivity implements mDataBinding.gotoregister.setOnClickListener(this); //获取当前日期 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日")){ // mDataBinding.rlzhuce.setVisibility(View.GONE); // mDataBinding.lyfuwu.setVisibility(View.VISIBLE); @@ -71,6 +79,70 @@ public class LoginActivity extends BaseActivity implements // mDataBinding.lyfuwu.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.setColor(getResources().getColor(R.color.text2)); + 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); + mDataBinding.tvYs.setMovementMethod(LinkMovementMethod.getInstance()); + mDataBinding.tvYs.setText(ssb,TextView.BufferType.SPANNABLE); + } @Override @@ -85,9 +157,14 @@ public class LoginActivity extends BaseActivity implements startActivity(intent2); break; case R.id.logintext: + if (!mDataBinding.tvYs.isSelected()) { + setToast("请先阅读并勾选同意用户协议和隐私政策"); + return; + } + String phone = mDataBinding.phone.getText().toString().trim(); String password = mDataBinding.pwd.getText().toString().trim(); - if (phone.length() <1) { + if (phone.length() < 1) { setToast("请输入手机号码"); return; } @@ -158,7 +235,7 @@ public class LoginActivity extends BaseActivity implements LinkedTreeMap adta = (LinkedTreeMap) resultcode.data; String s = gs.toJson(adta); 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).put("username", mDataBinding.phone.getText().toString().trim()); @@ -176,7 +253,6 @@ public class LoginActivity extends BaseActivity implements getpammar(ApiConfig.BASE_URL, map, getResources().getString(R.string.requsting), 0); - break; } @@ -188,7 +264,7 @@ public class LoginActivity extends BaseActivity implements @Override public void call(Throwable throwable) { progressDialog.dismiss(); - setToast( getString(R.string.getdatafailure)); + setToast(getString(R.string.getdatafailure)); throwable.printStackTrace(); } }); @@ -220,12 +296,12 @@ public class LoginActivity extends BaseActivity implements Type type = new TypeToken>() { }.getType(); final ArrayList list = new Gson().fromJson(s, type); - if(list.size()==0){ + if (list.size() == 0) { SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "0"); - Log.e("fuzhi","0"); - }else { + Log.e("fuzhi", "0"); + } else { SPUtils.setSP(LoginActivity.this, DoConfig.FANGCHAN_DATA, "1"); - Log.e("fuzhi","1"); + Log.e("fuzhi", "1"); } if (!Config.getInstance(LoginActivity.this).getBoolean("MainTabActivity", false)) { @@ -249,6 +325,7 @@ public class LoginActivity extends BaseActivity implements addSubscription(subscription); } + /** * 用户协议 * @@ -259,6 +336,7 @@ public class LoginActivity extends BaseActivity implements // startActivity(intent); WebActivitytwo.runActivity(this, "", "https://wy.dou1.net/articlemobile/index/detail?article_id=1"); } + /** * 隐私政策 * diff --git a/app/src/main/java/com/sl/house_property/LogoActivity.java b/app/src/main/java/com/sl/house_property/LogoActivity.java index cbe80b6..de31a0e 100644 --- a/app/src/main/java/com/sl/house_property/LogoActivity.java +++ b/app/src/main/java/com/sl/house_property/LogoActivity.java @@ -1,14 +1,28 @@ package com.sl.house_property; import android.app.Activity; +import android.app.AlertDialog; +import android.content.Context; import android.content.Intent; 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.RelativeLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; import com.cutil.ScreenUtils; import com.sl.house_property.f2.FeeActivity; +import com.tencent.bugly.Bugly; +import cn.jpush.android.api.JPushInterface; import tools.Config; @@ -28,21 +42,107 @@ public class LogoActivity extends Activity{ tipLP.topMargin = (int) (screenHigh*0.28); tipImage.setLayoutParams(tipLP); - imaloder.postDelayed(new Runnable() { - @Override - public void run() { - 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)); + + if (getSharedPreferences("first", Context.MODE_PRIVATE).getInt("first", 0) == 1) { + imaloder.postDelayed(new Runnable() { + @Override + public void run() { + 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)); + } + + + } + },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"); + } - } - },delaytime); + @Override + 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)); + } + } + }); + } } } diff --git a/app/src/main/java/com/sl/house_property/MainActivity.java b/app/src/main/java/com/sl/house_property/MainActivity.java index 941633c..3b88cdf 100644 --- a/app/src/main/java/com/sl/house_property/MainActivity.java +++ b/app/src/main/java/com/sl/house_property/MainActivity.java @@ -1,25 +1,41 @@ package com.sl.house_property; import android.app.Activity; +import android.app.AlertDialog; +import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; import android.os.Handler; import android.os.Message; + +import androidx.annotation.NonNull; 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.view.GestureDetector; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; +import android.view.Window; import android.widget.ImageView; +import android.widget.TextView; + +import com.tencent.bugly.Bugly; import java.util.ArrayList; import adapter.StartViewpagerAdapter; +import cn.jpush.android.api.JPushInterface; import tools.Config; import utils.ConfigTitiles; import utils.SetBigMap; + /*gradlew compileDebug --stacktrace*/ /*gradlew compileDebugSources --stacktrace -info*/ public class MainActivity extends Activity { @@ -31,22 +47,28 @@ public class MainActivity extends Activity { private ImageView point1; private ImageView point2; + // private ImageView point3; public double getPagerScroCHaged() { - return pagerScroCHaged;} + return pagerScroCHaged; + } + public void setPagerScroCHaged(double pagerScroCHaged) { this.pagerScroCHaged = pagerScroCHaged; } + private double pagerScroCHaged = 0.0; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Log.d("Main","main"); - + Log.d("Main", "main"); onceOrNot(); + } + private Handler mHandler = new Handler() { @Override public void handleMessage(Message msg) { @@ -55,13 +77,14 @@ public class MainActivity extends Activity { case 20000: if (welcomepage.getCurrentItem() == 1) { - startActivity(new Intent( MainActivity.this,LogoActivity.class)); + startActivity(new Intent(MainActivity.this, LogoActivity.class)); finish(); } break; } } }; + private void onceOrNot() { // TODO Auto-generated method stub int once = Config.getInstance(MainActivity.this).getInt(ConfigTitiles.ONCEORNOT, 0); @@ -72,10 +95,11 @@ public class MainActivity extends Activity { } else { //onceStart(); otherStart(); - return; + return; } } + private void onceStart() { // TODO Auto-generated method stub mGestureDetector = new GestureDetector(this, new GestureDetector.SimpleOnGestureListener() { @@ -131,7 +155,7 @@ public class MainActivity extends Activity { .showImageOnLoading(R.drawable.ic_circle_progress_imageloading) .build(); ImageLoader.getInstance().*/ - Bitmap bitmap= SetBigMap.readBitMap(MainActivity.this,R.mipmap.bg); + Bitmap bitmap = SetBigMap.readBitMap(MainActivity.this, R.mipmap.bg); image1.setImageBitmap(bitmap); View view2 = inflater.inflate(R.layout.welcome_image, null); final ImageView image2 = (ImageView) view2.findViewById(R.id.myImage); @@ -146,10 +170,10 @@ public class MainActivity extends Activity { viewlist.add(view1); viewlist.add(view2); - new Runnable(){ + new Runnable() { @Override public void run() { - Bitmap bitmap2= SetBigMap.readBitMap(MainActivity.this,R.mipmap.bg); + Bitmap bitmap2 = SetBigMap.readBitMap(MainActivity.this, R.mipmap.bg); image2.setImageBitmap(bitmap2); } }.run(); @@ -209,14 +233,18 @@ public class MainActivity extends Activity { private void otherStart() { // TODO Auto-generated method stub - Intent intent = new Intent( MainActivity.this, LogoActivity.class); + Intent intent = new Intent(MainActivity.this, LogoActivity.class); startActivity(intent); finish(); } + @Override public boolean dispatchTouchEvent(MotionEvent ev) {//分发事件 super.dispatchTouchEvent(ev); //productGestureDetector 是 GestureDetector对象 return mGestureDetector.onTouchEvent(ev); } + + + } diff --git a/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java b/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java index 1a6d531..6ce99c5 100644 --- a/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java +++ b/app/src/main/java/com/sl/house_property/ModifyPswdActivity.java @@ -5,6 +5,7 @@ import android.view.Gravity; import android.view.View; import android.widget.Toast; +import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.databinding.ActivityModifyPswdBinding; import java.util.HashMap; @@ -33,16 +34,26 @@ public class ModifyPswdActivity extends BaseActivity @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - setAbr(getString(R.string.modifypwsd), new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }, 0, null, 0, null, 0, null, ""); - + ImmersionBar.with(this) + .keyboardEnable(true) //解决软键盘与底部输入框冲突问题 + // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE + // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出 + .init(); +// setAbr(getString(R.string.modifypwsd), new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// finish(); +// } +// }, 0, null, 0, null, 0, null, ""); +// mDataBinding.register.setOnClickListener(this); + mDataBinding.left.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); } diff --git a/app/src/main/java/com/sl/house_property/MyApplication.java b/app/src/main/java/com/sl/house_property/MyApplication.java index e6f8249..5d7c22e 100644 --- a/app/src/main/java/com/sl/house_property/MyApplication.java +++ b/app/src/main/java/com/sl/house_property/MyApplication.java @@ -42,37 +42,40 @@ import utils.NineImageLoader; * Created by 90432 on 2018/1/15. */ -public class MyApplication extends Application{ - //private static final String TAG = "JIGUANG-Example"; +public class MyApplication extends Application { + //private static final String TAG = "JIGUANG-Example"; private static final String TAG = MyApplication.class.getSimpleName(); public static Context context; - protected static MyApplication instance; + protected static MyApplication instance; public JCVideoPlayerStandard VideoPlaying; - /* private HttpNet httpNet; - public static Handler getTheErrorHandler; - public static boolean mainonce; + + /* private HttpNet httpNet; + public static Handler getTheErrorHandler; + public static boolean mainonce; */ - public static Context getContext() { - return context; + public static Context getContext() { + return context; - } - @Override - protected void attachBaseContext(Context base) { - super.attachBaseContext(base); - MultiDex.install(this); - } + } + + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + MultiDex.install(this); + } public static MyApplication getApp() { return instance; } - public void existActivitys() { - for(Activity act :activityList){ + + public void existActivitys() { + for (Activity act : activityList) { act.finish(); } } - public void addActivitys(Activity activity ) { + public void addActivitys(Activity activity) { activityList.add(activity); } @@ -85,12 +88,15 @@ public class MyApplication extends Application{ super.onCreate(); instance = this; initOkGo(); - JPushInterface.init(this); - JPushInterface.setDebugMode(true); -// + // CrashHandler crashHandler = CrashHandler.getInstance(); // 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.proxyPort", "8080"); @@ -107,7 +113,6 @@ public class MyApplication extends Application{ public static final String KEY_EXTRAS = "extras"; - public void exit() { for (Activity act : activityList) { act.finish(); @@ -116,18 +121,6 @@ public class MyApplication extends Application{ } - - - - - - - - - - - - private void initOkGo() { //---------这里给出的是示例代码,告诉你可以这么传,实际使用的时候,根据需要传,不需要就不传-------------// HttpHeaders headers = new HttpHeaders(); diff --git a/app/src/main/java/com/sl/house_property/SettingActivity.java b/app/src/main/java/com/sl/house_property/SettingActivity.java index 96f3e79..1bb15c1 100644 --- a/app/src/main/java/com/sl/house_property/SettingActivity.java +++ b/app/src/main/java/com/sl/house_property/SettingActivity.java @@ -7,6 +7,7 @@ import android.os.Message; import android.view.View; import android.widget.Toast; +import com.gyf.immersionbar.ImmersionBar; import com.sl.house_property.databinding.ActivitySettingBinding; import cn.jpush.android.api.JPushInterface; @@ -48,18 +49,22 @@ public class SettingActivity extends BaseActivity implem @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setAbr("系统设置", new View.OnClickListener() { - @Override - public void onClick(View view) { - finish(); - } - }, 0, null, 0, null, 0, null, ""); + ImmersionBar.with(this) + .keyboardEnable(false) //解决软键盘与底部输入框冲突问题 + // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE + // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出 + .init(); mDataBinding.id1.setOnClickListener(this); mDataBinding.id2.setOnClickListener(this); mDataBinding.id3.setOnClickListener(this); mDataBinding.loginout.setOnClickListener(this); mDataBinding.id0.setOnClickListener(this); - + mDataBinding.left.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + finish(); + } + }); mDataBinding.myverion.setText("V" + APKVersionCodeUtils.getVerName(SettingActivity.this)); try { mDataBinding.cachsiez.setText(CacheDataManager.getTotalCacheSize(SettingActivity.this)); diff --git a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java index 4c1a5dd..b8faea6 100644 --- a/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java +++ b/app/src/main/java/com/sl/house_property/user/MyPropertyActivity.java @@ -10,6 +10,7 @@ import android.view.View; import com.google.gson.Gson; import com.google.gson.internal.LinkedTreeMap; import com.google.gson.reflect.TypeToken; +import com.gyf.immersionbar.ImmersionBar; import com.lxj.xpopup.XPopup; import com.lxj.xpopup.interfaces.OnInputConfirmListener; import com.selectpicker.OptionsPopupWindow; @@ -57,12 +58,23 @@ public class MyPropertyActivity extends BaseActivity protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setAbr("我的房产", new View.OnClickListener() { +// setAbr("我的房产", new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// finish(); +// } +// }, 0, null, 0, null, 0, null, ""); + ImmersionBar.with(this) + .keyboardEnable(false) //解决软键盘与底部输入框冲突问题 + // .keyboardEnable(true, WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE + // | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) //软键盘自动弹出 + .init(); + mDataBinding.left.setOnClickListener(new View.OnClickListener() { @Override - public void onClick(View view) { + public void onClick(View v) { finish(); } - }, 0, null, 0, null, 0, null, ""); + }); FullyGridLayoutManager mgr = new FullyGridLayoutManager(MyPropertyActivity.this, 1); mgr.setOrientation(FullyGridLayoutManager.VERTICAL); mgr.setSmoothScrollbarEnabled(true); diff --git a/app/src/main/res/layout/activity_adevise.xml b/app/src/main/res/layout/activity_adevise.xml index 31354ea..4ee06d9 100644 --- a/app/src/main/res/layout/activity_adevise.xml +++ b/app/src/main/res/layout/activity_adevise.xml @@ -5,8 +5,40 @@ > + + + + + + + + - + + + + + + + + + + + + + + + + + + android:orientation="vertical" +> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_history_record.xml b/app/src/main/res/layout/layout_history_record.xml index 7f28cf8..8a9ada0 100644 --- a/app/src/main/res/layout/layout_history_record.xml +++ b/app/src/main/res/layout/layout_history_record.xml @@ -28,14 +28,14 @@ android:src="@mipmap/fanhui" /> + android:textColor="@color/white" + android:textSize="16sp" /> diff --git a/app/src/main/res/mipmap-xhdpi/icon_publish_selected.png b/app/src/main/res/mipmap-xhdpi/icon_publish_selected.png new file mode 100644 index 0000000..f6d715d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/icon_publish_selected.png differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_publish_selected2.png b/app/src/main/res/mipmap-xhdpi/icon_publish_selected2.png new file mode 100644 index 0000000..b621e08 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/icon_publish_selected2.png differ