diff --git a/.idea/misc.xml b/.idea/misc.xml index 12583cf..4da7b85 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,13 +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/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/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" +> + + + + + + + + android:textColor="@color/white" + android:textSize="16sp" />