Commit f79c6be5 authored by 王海's avatar 王海

修改组合商品模块,选择会员类型方式

parent d68aac24
...@@ -19,6 +19,7 @@ import com.xingdata.zzdpos.api.ApiFactory; ...@@ -19,6 +19,7 @@ import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.databinding.ActivityFeedBackBinding; import com.xingdata.zzdpos.databinding.ActivityFeedBackBinding;
import com.xingdata.zzdpos.model.Feed; import com.xingdata.zzdpos.model.Feed;
import com.xingdata.zzdpos.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
public class FeedBackActivity extends AppCompatActivity { public class FeedBackActivity extends AppCompatActivity {
...@@ -87,33 +88,10 @@ public class FeedBackActivity extends AppCompatActivity { ...@@ -87,33 +88,10 @@ public class FeedBackActivity extends AppCompatActivity {
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
@Override @Override
protected void onPause() { protected void onPause() {
......
package com.xingdata.zzdpos.ui.login; package com.xingdata.zzdpos.ui.login;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.AppUtils; import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
...@@ -23,6 +20,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean; ...@@ -23,6 +20,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean; import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.ui.main.MainActivity; import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity; import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.view.PopupWindowDownList; import com.xingdata.zzdpos.view.PopupWindowDownList;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -325,32 +323,9 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin ...@@ -325,32 +323,9 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog; ...@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
import com.xingdata.zzdpos.ui.main.fragment.CasherFragment; import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;
import com.xingdata.zzdpos.ui.main.fragment.MyselfFragment; import com.xingdata.zzdpos.ui.main.fragment.MyselfFragment;
import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment; import com.xingdata.zzdpos.ui.main.fragment.ServiceFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -195,32 +196,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -195,32 +196,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.manage.bale; package com.xingdata.zzdpos.ui.manage.bale;
import android.content.Context;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
...@@ -18,6 +14,7 @@ import com.xingdata.zzdpos.model.Sssku; ...@@ -18,6 +14,7 @@ import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.model.Ussku; import com.xingdata.zzdpos.model.Ussku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.bale.fragment.BaleIndexFragment; import com.xingdata.zzdpos.ui.manage.bale.fragment.BaleIndexFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
...@@ -131,31 +128,8 @@ public class BaleActivity extends BaseActivity<BalePresenter, ActivityBaleBindin ...@@ -131,31 +128,8 @@ public class BaleActivity extends BaseActivity<BalePresenter, ActivityBaleBindin
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.manage.inventory; package com.xingdata.zzdpos.ui.manage.inventory;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
...@@ -22,6 +18,7 @@ import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment; ...@@ -22,6 +18,7 @@ import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment;
import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment; import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment;
import com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment; import com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment;
import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity; import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
...@@ -145,33 +142,10 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity ...@@ -145,33 +142,10 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -20,6 +20,7 @@ import com.xingdata.zzdpos.model.Pager; ...@@ -20,6 +20,7 @@ import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.otherselect.fragment.OtherDetailFragment; import com.xingdata.zzdpos.ui.manage.otherselect.fragment.OtherDetailFragment;
import com.xingdata.zzdpos.ui.manage.otherselect.fragment.OtherListFragment; import com.xingdata.zzdpos.ui.manage.otherselect.fragment.OtherListFragment;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
...@@ -117,31 +118,8 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter, ...@@ -117,31 +118,8 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.manage.replenishment; package com.xingdata.zzdpos.ui.manage.replenishment;
import android.content.Context;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
...@@ -16,6 +12,7 @@ import com.xingdata.zzdpos.model.Sssku; ...@@ -16,6 +12,7 @@ import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentDetailFragment; import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentDetailFragment;
import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentFragment; import com.xingdata.zzdpos.ui.manage.replenishment.fragment.ReplenishmentFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
...@@ -100,31 +97,8 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter, ...@@ -100,31 +97,8 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.manage.sssku; package com.xingdata.zzdpos.ui.manage.sssku;
import android.content.Context;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
...@@ -28,6 +24,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment; ...@@ -28,6 +24,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment;
import com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment; import com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
...@@ -285,31 +282,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin ...@@ -285,31 +282,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.manage.user; package com.xingdata.zzdpos.ui.manage.user;
import android.content.Context;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
...@@ -12,6 +8,7 @@ import com.xingdata.zzdpos.databinding.ActivityUserBinding; ...@@ -12,6 +8,7 @@ import com.xingdata.zzdpos.databinding.ActivityUserBinding;
import com.xingdata.zzdpos.model.Oper; import com.xingdata.zzdpos.model.Oper;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Sta; import com.xingdata.zzdpos.model.Sta;
import com.xingdata.zzdpos.util.Global;
public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBinding> implements public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBinding> implements
UserContract.View { UserContract.View {
...@@ -55,31 +52,8 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin ...@@ -55,31 +52,8 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.marketing.integral; package com.xingdata.zzdpos.ui.marketing.integral;
import android.content.Context;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
...@@ -19,6 +16,7 @@ import com.xingdata.zzdpos.model.Ubound; ...@@ -19,6 +16,7 @@ import com.xingdata.zzdpos.model.Ubound;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog; import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralIndexFragment; import com.xingdata.zzdpos.ui.marketing.integral.fragment.IntegralIndexFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
...@@ -92,31 +90,8 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn ...@@ -92,31 +90,8 @@ public class IntegralActivity extends BaseActivity<IntegralPresenter, ActivityIn
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -26,6 +26,7 @@ import com.xingdata.zzdpos.ui.marketing.ms.model.Area; ...@@ -26,6 +26,7 @@ import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
import com.xingdata.zzdpos.ui.marketing.ms.model.Group; import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
import com.xingdata.zzdpos.ui.marketing.ms.model.Type; import com.xingdata.zzdpos.ui.marketing.ms.model.Type;
import com.xingdata.zzdpos.ui.marketing.ms.model.User; import com.xingdata.zzdpos.ui.marketing.ms.model.User;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
...@@ -190,31 +191,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A ...@@ -190,31 +191,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.base.BaseActivity; ...@@ -12,6 +12,7 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipLevelBinding; import com.xingdata.zzdpos.databinding.ActivityVipLevelBinding;
import com.xingdata.zzdpos.model.Mscard; import com.xingdata.zzdpos.model.Mscard;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.util.Global;
public class RechargeRuleActivity extends BaseActivity<RechargeRulePresenter, ActivityVipLevelBinding> implements RechargeRuleContract.View { public class RechargeRuleActivity extends BaseActivity<RechargeRulePresenter, ActivityVipLevelBinding> implements RechargeRuleContract.View {
private Bundle mBundle; private Bundle mBundle;
...@@ -42,32 +43,9 @@ public class RechargeRuleActivity extends BaseActivity<RechargeRulePresenter, Ac ...@@ -42,32 +43,9 @@ public class RechargeRuleActivity extends BaseActivity<RechargeRulePresenter, Ac
} }
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -14,6 +14,7 @@ import com.xingdata.zzdpos.databinding.ActivityReturnTicketBinding; ...@@ -14,6 +14,7 @@ import com.xingdata.zzdpos.databinding.ActivityReturnTicketBinding;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Trule; import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.util.Global;
public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter, public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
ActivityReturnTicketBinding> ActivityReturnTicketBinding>
...@@ -77,31 +78,8 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter, ...@@ -77,31 +78,8 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.marketing.viplevel; package com.xingdata.zzdpos.ui.marketing.viplevel;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityVipLevelBinding; import com.xingdata.zzdpos.databinding.ActivityVipLevelBinding;
import com.xingdata.zzdpos.model.Level; import com.xingdata.zzdpos.model.Level;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.util.Global;
public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevelBinding> public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevelBinding>
implements LevelContract.View { implements LevelContract.View {
...@@ -42,31 +39,8 @@ public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevel ...@@ -42,31 +39,8 @@ public class LevelActivity extends BaseActivity<LevelPresenter, ActivityVipLevel
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.payment; package com.xingdata.zzdpos.ui.payment;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.zzdpos.C; import com.xingdata.zzdpos.C;
...@@ -14,8 +10,10 @@ import com.xingdata.zzdpos.base.BaseActivity; ...@@ -14,8 +10,10 @@ import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityPaymentBinding; import com.xingdata.zzdpos.databinding.ActivityPaymentBinding;
import com.xingdata.zzdpos.ui.payment.fragment.PaymentFragment; import com.xingdata.zzdpos.ui.payment.fragment.PaymentFragment;
import com.xingdata.zzdpos.ui.settle.SettleActivity; import com.xingdata.zzdpos.ui.settle.SettleActivity;
import com.xingdata.zzdpos.util.Global;
public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding> implements PaymentContract.View { public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding>
implements PaymentContract.View {
private PaymentFragment mPaymentFragment = new PaymentFragment(); private PaymentFragment mPaymentFragment = new PaymentFragment();
...@@ -38,33 +36,10 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym ...@@ -38,33 +36,10 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
intent.putExtra(C.EXTRA_KEY.SETTLE_EXTRA, amt); intent.putExtra(C.EXTRA_KEY.SETTLE_EXTRA, amt);
ActivityUtils.startActivity(intent); ActivityUtils.startActivity(intent);
} }
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.sendticke; package com.xingdata.zzdpos.ui.sendticke;
import android.content.Context;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
...@@ -17,6 +13,7 @@ import com.xingdata.zzdpos.model.Trule; ...@@ -17,6 +13,7 @@ import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip; import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment; import com.xingdata.zzdpos.ui.sendticke.fragment.SendTickerIndexFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
...@@ -90,33 +87,11 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter, ...@@ -90,33 +87,11 @@ public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
loadingDialog.dismiss(); loadingDialog.dismiss();
} }
} }
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -120,10 +120,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -120,10 +120,13 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
null, tickerId, null, tickerId,
loadingDialog); loadingDialog);
} }
} }
} }
case R.id.cl_all:{
mViewBinding.llAllVipGroup.setVisibility(View.VISIBLE);
mViewBinding.clAll.setVisibility(View.GONE);
}
break;
} }
} }
...@@ -136,6 +139,9 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -136,6 +139,9 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
levelList.get(nowVipGroupId).setSelect(true); levelList.get(nowVipGroupId).setSelect(true);
vipGroupAdapter.notifyDataSetChanged(); vipGroupAdapter.notifyDataSetChanged();
mViewBinding.tvSelect.setText(levelList.get(position).getVipLevelName()); mViewBinding.tvSelect.setText(levelList.get(position).getVipLevelName());
mViewBinding.tvVipGroupName.setText(levelList.get(position).getVipLevelName());
mViewBinding.llAllVipGroup.setVisibility(View.GONE);
mViewBinding.clAll.setVisibility(View.VISIBLE);
} }
}); });
returnTicketAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() { returnTicketAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
......
package com.xingdata.zzdpos.ui.settle; package com.xingdata.zzdpos.ui.settle;
import android.content.Context;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.KeyboardUtils; import com.blankj.utilcode.util.KeyboardUtils;
...@@ -29,11 +25,13 @@ import com.xingdata.zzdpos.ui.settle.fragment.PayResultFragment; ...@@ -29,11 +25,13 @@ import com.xingdata.zzdpos.ui.settle.fragment.PayResultFragment;
import com.xingdata.zzdpos.ui.settle.fragment.SettleFragment; import com.xingdata.zzdpos.ui.settle.fragment.SettleFragment;
import com.xingdata.zzdpos.ui.settle.fragment.TicketFragment; import com.xingdata.zzdpos.ui.settle.fragment.TicketFragment;
import com.xingdata.zzdpos.ui.settle.fragment.VipFragment; import com.xingdata.zzdpos.ui.settle.fragment.VipFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.List; import java.util.List;
public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettleBinding> implements SettleContract.View { public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettleBinding>
implements SettleContract.View {
private SettleFragment mSettleFragment = new SettleFragment(); private SettleFragment mSettleFragment = new SettleFragment();
...@@ -224,33 +222,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle ...@@ -224,33 +222,11 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
break; break;
} }
} }
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.statistics; package com.xingdata.zzdpos.ui.statistics;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.FragmentUtils; import com.blankj.utilcode.util.FragmentUtils;
import com.xingdata.zzdpos.C; import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
...@@ -27,13 +19,16 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog; ...@@ -27,13 +19,16 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment; import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsDateFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment; import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsFragment;
import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment; import com.xingdata.zzdpos.ui.statistics.fragment.StatisticsTitleFragment;
import com.xingdata.zzdpos.util.Global;
public class StatisticsActivity extends BaseActivity<StatisticsPresenter, ActivityStatisticsBinding> implements StatisticsContract.View { public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
ActivityStatisticsBinding> implements StatisticsContract.View {
private StatisticsDateFragment mStatisticsDateFragment = new StatisticsDateFragment(); private StatisticsDateFragment mStatisticsDateFragment = new StatisticsDateFragment();
private StatisticsFragment mStatisticsFragment = new StatisticsFragment(); private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment(); private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment();
LoadingDialog mLoadingDialog = new LoadingDialog(); LoadingDialog mLoadingDialog = new LoadingDialog();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_statistics; return R.layout.activity_statistics;
...@@ -41,7 +36,8 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi ...@@ -41,7 +36,8 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
@Override @Override
public void initView() { public void initView() {
FragmentUtils.add(getSupportFragmentManager(), mStatisticsFragment, mViewBinding.fragmentContainer.getId(), false, true); FragmentUtils.add(getSupportFragmentManager(), mStatisticsFragment, mViewBinding
.fragmentContainer.getId(), false, true);
} }
...@@ -53,13 +49,15 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi ...@@ -53,13 +49,15 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
@Override @Override
public void showOrderListFragment() { public void showOrderListFragment() {
mStatisticsTitleFragment.setTitle(C.MENU.MENU_STATISTICS_ORDER); mStatisticsTitleFragment.setTitle(C.MENU.MENU_STATISTICS_ORDER);
FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding.fragmentContainer.getId(), false, true); FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding
.fragmentContainer.getId(), false, true);
} }
@Override @Override
public void showMStFragment() { public void showMStFragment() {
mStatisticsTitleFragment.setTitle(C.MENU.MENU_STATISTICS_MS); mStatisticsTitleFragment.setTitle(C.MENU.MENU_STATISTICS_MS);
FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding.fragmentContainer.getId(), false, true); FragmentUtils.add(getSupportFragmentManager(), mStatisticsTitleFragment, mViewBinding
.fragmentContainer.getId(), false, true);
} }
@Override @Override
...@@ -80,25 +78,27 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi ...@@ -80,25 +78,27 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
@Override @Override
public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) { public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
mStatisticsDateFragment.pop(); mStatisticsDateFragment.pop();
mStatisticsTitleFragment.searchSuc(saleorderPager, start,end); mStatisticsTitleFragment.searchSuc(saleorderPager, start, end);
} }
@Override @Override
public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long end) { public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long
end) {
mStatisticsDateFragment.pop(); mStatisticsDateFragment.pop();
mStatisticsTitleFragment.searchRechargeSuc(vipRechargeOrderPager, start,end); mStatisticsTitleFragment.searchRechargeSuc(vipRechargeOrderPager, start, end);
} }
@Override @Override
public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) { public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
mStatisticsDateFragment.pop(); mStatisticsDateFragment.pop();
mStatisticsTitleFragment.searchTicketSuc(ticketPager, start,end); mStatisticsTitleFragment.searchTicketSuc(ticketPager, start, end);
} }
@Override @Override
public void showDateFragment(Integer integer) { public void showDateFragment(Integer integer) {
mStatisticsDateFragment.setSearchType(integer); mStatisticsDateFragment.setSearchType(integer);
FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding.fragmentContainer.getId(), false, true); FragmentUtils.add(getSupportFragmentManager(), mStatisticsDateFragment, mViewBinding
.fragmentContainer.getId(), false, true);
} }
...@@ -114,46 +114,25 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi ...@@ -114,46 +114,25 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter, Activi
} }
@Override @Override
public void getSmtListSucc(Pager<Smt> smtPager){ public void getSmtListSucc(Pager<Smt> smtPager) {
mStatisticsTitleFragment.getSmtListSucc(smtPager); mStatisticsTitleFragment.getSmtListSucc(smtPager);
} }
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
// if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) { // if (event.getKeyCode() == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent
// .ACTION_DOWN) {
// if (getSupportFragmentManager().getBackStackEntryCount() > 1) { // if (getSupportFragmentManager().getBackStackEntryCount() > 1) {
// getSupportFragmentManager().popBackStack(); // getSupportFragmentManager().popBackStack();
// } // }
// } // }
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
} }
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -32,6 +32,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog; ...@@ -32,6 +32,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.main.MainActivity; import com.xingdata.zzdpos.ui.main.MainActivity;
import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter; import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter;
import com.xingdata.zzdpos.util.ConvertUtil; import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
...@@ -282,31 +283,8 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese ...@@ -282,31 +283,8 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -3,14 +3,11 @@ package com.xingdata.zzdpos.ui.store; ...@@ -3,14 +3,11 @@ package com.xingdata.zzdpos.ui.store;
import android.animation.Keyframe; import android.animation.Keyframe;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder; import android.animation.PropertyValuesHolder;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.EditorInfo; import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.constant.PermissionConstants; import com.blankj.utilcode.constant.PermissionConstants;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
...@@ -33,6 +30,7 @@ import com.xingdata.zzdpos.ui.store.dialog.CartDialog; ...@@ -33,6 +30,7 @@ import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
import com.xingdata.zzdpos.ui.store.dialog.MsDialog; import com.xingdata.zzdpos.ui.store.dialog.MsDialog;
import com.xingdata.zzdpos.ui.store.fragment.SearchFragment; import com.xingdata.zzdpos.ui.store.fragment.SearchFragment;
import com.xingdata.zzdpos.ui.store.fragment.StoreFragment; import com.xingdata.zzdpos.ui.store.fragment.StoreFragment;
import com.xingdata.zzdpos.util.Global;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -224,31 +222,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -224,31 +222,8 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.ui.vip; package com.xingdata.zzdpos.ui.vip;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
...@@ -21,6 +19,7 @@ import com.xingdata.zzdpos.model.Trule; ...@@ -21,6 +19,7 @@ import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.model.Vip; import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.model.VipRechargeOrder; import com.xingdata.zzdpos.model.VipRechargeOrder;
import com.xingdata.zzdpos.ui.dialog.PromptDialog; import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.view.ViewTools; import com.xingdata.zzdpos.view.ViewTools;
import java.util.List; import java.util.List;
...@@ -99,12 +98,12 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> ...@@ -99,12 +98,12 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
PromptDialog promptDialog = new PromptDialog(); PromptDialog promptDialog = new PromptDialog();
promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_ERROR, "支付失败").setCustomButton promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_ERROR, "支付失败").setCustomButton
("重新支付", new View.OnClickListener() { ("重新支付", new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
mPresenter.fullVip(vip, amtPay, amtSend); mPresenter.fullVip(vip, amtPay, amtSend);
promptDialog.dismiss(); promptDialog.dismiss();
} }
}).show(this); }).show(this);
} }
@Override @Override
...@@ -124,31 +123,8 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding> ...@@ -124,31 +123,8 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
@Override @Override
public boolean dispatchTouchEvent(MotionEvent ev) { public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) { Global.clickHideKeyboard(ev, this);
View v = getCurrentFocus();
if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
return super.dispatchTouchEvent(ev); return super.dispatchTouchEvent(ev);
} }
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
package com.xingdata.zzdpos.util; package com.xingdata.zzdpos.util;
import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
/** /**
* Created by Administrator on 2018/1/17. * Created by Administrator on 2018/1/17.
*/ */
public class Global { public class Global {
private static void fragmentShowKeyboard(Context context) { public static void clickHideKeyboard(MotionEvent ev, Activity context) {
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context if (ev.getAction() == MotionEvent.ACTION_DOWN) {
.INPUT_METHOD_SERVICE); View v = context.getCurrentFocus();
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_NOT_ALWAYS); if (isShouldHideKeyboard(v, ev)) {
InputMethodManager imm =
(InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(),
InputMethodManager.HIDE_NOT_ALWAYS
);
}
}
} }
public static void setFocus(View view, Context context) { public static void setFocus(View view, Context context) {
...@@ -21,4 +31,25 @@ public class Global { ...@@ -21,4 +31,25 @@ public class Global {
view.requestFocus(); view.requestFocus();
Global.fragmentShowKeyboard(context); Global.fragmentShowKeyboard(context);
} }
private static void fragmentShowKeyboard(Context context) {
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context
.INPUT_METHOD_SERVICE);
imm.toggleSoftInput(InputMethodManager.SHOW_IMPLICIT, InputMethodManager.HIDE_NOT_ALWAYS);
}
// 根据 EditText 所在坐标和用户点击的坐标相对比,来判断是否隐藏键盘
private static boolean isShouldHideKeyboard(View v, MotionEvent event) {
if (v != null && (v instanceof EditText)) {
int[] l = {0, 0};
v.getLocationInWindow(l);
int left = l[0],
top = l[1],
bottom = top + v.getHeight(),
right = left + v.getWidth();
return !(event.getX() > left && event.getX() < right
&& event.getY() > top && event.getY() < bottom);
}
return false;
}
} }
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
type="String"/> type="String"/>
</data> </data>
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
...@@ -52,7 +53,8 @@ ...@@ -52,7 +53,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:onClick="@{OnClickListener}" android:onClick="@{OnClickListener}"
android:orientation="vertical"> android:orientation="vertical"
android:visibility="gone">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
...@@ -149,31 +151,88 @@ ...@@ -149,31 +151,88 @@
android:layout_marginTop="@dimen/all_bounced_padding" android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@drawable/up_down_line_white" android:background="@drawable/up_down_line_white"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="visible">
<TextView <LinearLayout
android:id="@+id/ll_all_vip_group"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/up_down_line_white" android:orientation="vertical"
android:paddingBottom="@dimen/all_margin" android:visibility="visible">
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/all_margin" <TextView
android:text="请选择发放对象" android:layout_width="match_parent"
android:textColor="@color/black_baozheng" android:layout_height="wrap_content"
android:textSize="@dimen/text_three_title"/> android:background="@drawable/up_down_line_white"
android:paddingBottom="@dimen/all_margin"
<android.support.v7.widget.RecyclerView android:paddingLeft="@dimen/all_padding"
android:id="@+id/vip_type" android:paddingTop="@dimen/all_margin"
android:text="请选择发放对象"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/vip_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"/>
</LinearLayout>
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_all"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:visibility="gone"
android:background="@color/white"/> android:layout_height="@dimen/list3_height"
android:background="@drawable/up_down_line_white"
android:foreground="?android:attr/selectableItemBackground"
android:onClick="@{OnClickListener}">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_all_head"
android:layout_width="@dimen/settle_vip_head"
android:layout_height="@dimen/settle_vip_head"
android:layout_marginStart="@dimen/all_margin"
app:backgroundImage="@color/white_caocao"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="parent"
app:placeholderImage="@mipmap/vip_type_send"
app:roundAsCircle="true"
app:roundingBorderColor="@color/gray_huanggai"
app:roundingBorderWidth="@dimen/all_line_width"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/iv_all_head"
app:layout_constraintTop_toBottomOf="parent">
<TextView
android:id="@+id/tv_vip_group_name"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_text_size"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"
app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"/>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment