Skip to content

T
TangKuPos
Commit c53c1a99 authored by 王海's avatar 王海
Browse files
Options

修改bug

parent 14445939
Show whitespace changes
Inline Side-by-side
Showing with 330 additions and 59 deletions
app/src/main/java/com/xingdata/zzdpos/ui/feedback/FeedBackActivity.java
View file @ c53c1a99
package com.xingdata.zzdpos.ui.feedback;
import android.content.Context;
import android.databinding.DataBindingUtil;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
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.ToastUtils;
......@@ -38,7 +42,8 @@ public class FeedBackActivity extends AppCompatActivity {
mFeedBackBinding.editText.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
mFeedBackBinding.setTextSize(mFeedBackBinding.editText.getText().toString().length() + "");
mFeedBackBinding.setTextSize(mFeedBackBinding.editText.getText().toString()
.length() + "");
}
@Override
......@@ -58,7 +63,8 @@ public class FeedBackActivity extends AppCompatActivity {
ToastUtils.showShort("请详细描述下您遇到的问题");
} else {
Feed feed = new Feed();
feed.setFeedText(mFeedBackBinding.editText.getText().toString() + "联系方式：" + mFeedBackBinding.editContactWay.getText().toString());
feed.setFeedText(mFeedBackBinding.editText.getText().toString() + "联系方式：" +
mFeedBackBinding.editContactWay.getText().toString());
feed.setOpMapId(LoginPresenter.loginReturnBean.getOpMapId());
feed.setOperMobile(LoginPresenter.loginReturnBean.getOperMobile());
feed.setFeedFlag("0");
......@@ -79,6 +85,36 @@ public class FeedBackActivity extends AppCompatActivity {
});
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
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);
}
// 根据 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
protected void onPause() {
KeyboardUtils.hideSoftInput(this);
......
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ c53c1a99
package com.xingdata.zzdpos.ui.login;
import android.content.Context;
import android.content.Intent;
import android.view.MotionEvent;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.KeyboardUtils;
......@@ -318,5 +322,35 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
loadingDialog.dismiss();
}
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
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);
}
// 根据 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;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ c53c1a99
package com.xingdata.zzdpos.ui.main;
import android.app.Activity;
import android.content.Context;
import android.databinding.DataBindingUtil;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
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.xingdata.zzdpos.R;
......@@ -27,16 +28,17 @@ import java.util.List;
import io.reactivex.Observable;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Scheduler;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements MainContract.View {
public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBinding> implements
MainContract.View {
public static MainActivity mainActivity;
private int[] titleInts = {R.string.menu_cashier, R.string.menu_service, R.string.menu_myself};
private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R.mipmap.icon_menu_myself_0};
private int[] iconList = {R.mipmap.icon_menu_cashier_1, R.mipmap.icon_menu_service_0, R
.mipmap.icon_menu_myself_0};
private FragmentViewAdapter mFragmentPagerAdapter;
// private List<View> views=new ArrayList<>();
private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
......@@ -75,7 +77,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
e.onNext(getLayoutInflater().inflate(R.layout.item_menu_bottom, null));
e.onNext(getLayoutInflater().inflate(R.layout.item_menu_bottom, null));
}
}).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread()).subscribe(new Consumer<View>() {
}).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<View>() {
int i = 0;
@Override
......@@ -84,7 +87,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
ItemMenuBottomBinding itemMenuBottomBinding = DataBindingUtil.bind(view);
itemMenuBottomBinding.text.setText(titleInts[i]);
if (i == 0) {
itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color.red_guanyu));
itemMenuBottomBinding.text.setTextColor(getResources().getColor(R.color
.red_guanyu));
}
itemMenuBottomBinding.img.setImageResource(iconList[i]);
itemMenuBottomBindings.add(itemMenuBottomBinding);
......@@ -102,16 +106,22 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
public void onTabSelected(TabLayout.Tab tab) {
switch (tab.getPosition()) {
case 0:
itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap.icon_menu_cashier_1);
itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R.color.red_guanyu));
itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap
.icon_menu_cashier_1);
itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R
.color.red_guanyu));
break;
case 1:
itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap.icon_menu_service_1);
itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R.color.red_guanyu));
itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap
.icon_menu_service_1);
itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R
.color.red_guanyu));
break;
case 2:
itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap.icon_menu_myself_1);
itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R.color.red_guanyu));
itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap
.icon_menu_myself_1);
itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R
.color.red_guanyu));
break;
}
}
......@@ -120,16 +130,22 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
public void onTabUnselected(TabLayout.Tab tab) {
switch (tab.getPosition()) {
case 0:
itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap.icon_menu_cashier_0);
itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R.color.black_likui));
itemMenuBottomBindings.get(0).img.setImageResource(R.mipmap
.icon_menu_cashier_0);
itemMenuBottomBindings.get(0).text.setTextColor(getResources().getColor(R
.color.black_likui));
break;
case 1:
itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap.icon_menu_service_0);
itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R.color.black_likui));
itemMenuBottomBindings.get(1).img.setImageResource(R.mipmap
.icon_menu_service_0);
itemMenuBottomBindings.get(1).text.setTextColor(getResources().getColor(R
.color.black_likui));
break;
case 2:
itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap.icon_menu_myself_0);
itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R.color.black_likui));
itemMenuBottomBindings.get(2).img.setImageResource(R.mipmap
.icon_menu_myself_0);
itemMenuBottomBindings.get(2).text.setTextColor(getResources().getColor(R
.color.black_likui));
break;
}
}
......@@ -169,4 +185,34 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
public void onBackPressedSupport() {
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
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);
}
// 根据 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;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/BaleActivity.java
View file @ c53c1a99
package com.xingdata.zzdpos.ui.manage.bale;
import android.content.Context;
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.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
......@@ -122,4 +128,34 @@ public class BaleActivity extends BaseActivity<BalePresenter, ActivityBaleBindin
}
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
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);
}
// 根据 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;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java
View file @ c53c1a99
......@@ -65,10 +65,12 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
if (nowType == 1) {
//添加
listData.clear();
mViewBinding.tvTitle.setText("添加组合");
mViewBinding.btnDismantling.setVisibility(View.GONE);
} else if (nowType == 2) {
//更新可以拆解商品
mViewBinding.tvTitle.setText("编辑组合");
mViewBinding.btnDismantling.setVisibility(View.VISIBLE);
if (ussku != null) {
mViewBinding.etShopMoney.setText(ConvertUtil.fenToYuan(ussku.getSkuRetailPrice1()));
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachFragment.java
View file @ c53c1a99
......@@ -5,6 +5,7 @@ import android.view.KeyEvent;
import android.view.View;
import android.widget.TextView;
import com.blankj.utilcode.util.KeyboardUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
......@@ -76,5 +77,4 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
Global.setFocus(mViewBinding.etKeyword, getActivity());
}
}
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryActivity.java
View file @ c53c1a99
package com.xingdata.zzdpos.ui.manage.inventory;
import android.content.Context;
import android.content.Intent;
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.KeyboardUtils;
......@@ -11,20 +16,18 @@ import com.xingdata.zzdpos.databinding.ActivityInventoryBinding;
import com.xingdata.zzdpos.model.Cs;
import com.xingdata.zzdpos.model.CsDetail;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Saleorder;
import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment;
import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment;
import com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment;
import com.xingdata.zzdpos.ui.statistics.StatisticsDetailActivity;
import java.util.List;
public class InventoryActivity extends BaseActivity<InventoryPresenter, ActivityInventoryBinding> implements InventoryContract.View {
public class InventoryActivity extends BaseActivity<InventoryPresenter, ActivityInventoryBinding>
implements InventoryContract.View {
private InventoryFragment mInventoryFragment = new InventoryFragment();
private ManageDateFragment mManageDateFragment = new ManageDateFragment();
private InventoryAddFragment mInventoryAddFragment;
......@@ -139,6 +142,36 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
}
}
}
@Override
public boolean dispatchTouchEvent(MotionEvent ev) {
if (ev.getAction() == MotionEvent.ACTION_DOWN) {
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);
}
// 根据 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;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java
View file @ c53c1a99
package com.xingdata.zzdpos.ui.marketing.integral.fragment;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.bigkoo.pickerview.OptionsPickerView;
import com.bigkoo.pickerview.listener.CustomListener;
import com.blankj.utilcode.util.KeyboardUtils;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.App;
......@@ -177,6 +180,9 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
if (loadingDialog != null) {
loadingDialog.dismiss();
}
mViewBinding.etIntegralTimeLimit.addTextChangedListener(textWatcher);
mViewBinding.etIntegralCategoryTimeLimit.addTextChangedListener(textWatcher);
mViewBinding.etShopTimeLimit.addTextChangedListener(textWatcher);
}
private void setShopTypeClick(Boolean b) {
......@@ -230,7 +236,6 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
mViewBinding.etIntegralTimeLimit.setText(ShowGbound.getBoundExp() + "");
}
}
break;
case 1: {
......@@ -528,6 +533,27 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
public void setNowType(int nowType) {
this.nowType = nowType;
}
TextWatcher textWatcher = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
}
@Override
public void afterTextChanged(Editable editable) {
String tempStr = editable.toString();
int len = tempStr.length();
if (len >= 1 && tempStr.startsWith("0")) {
editable.replace(0, 1, "");
}
}
};
//
// /**
// * 显示软键盘，Dialog使用
......
app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
View file @ c53c1a99
......@@ -28,8 +28,8 @@ public final class SystemUtil {
* @return 设备型号
*/
public static String getDeviceModel() {
return DeviceUtils.getModel();
// return "AECRC10";
// return DeviceUtils.getModel();
return "AECRC10";
}
......@@ -57,8 +57,8 @@ public final class SystemUtil {
e.printStackTrace();
}
}
return deviceSN;
// return "548496";
// return deviceSN;
return "548496";
}
/**
......
app/src/main/res/layout/fragment_bale_edit.xml
View file @ c53c1a99
......@@ -49,25 +49,23 @@
app:layout_constraintTop_toBottomOf="parent">
<TextView
android:id="@+id/tv_keyword"
android:id="@+id/tv_title"
android:layout_width="0dp"
android:layout_height="@dimen/all_seach_height"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_weight="1"
android:background="@drawable/shape_gray_r1"
android:clickable="true"
android:drawableLeft="@mipmap/ic_search"
android:drawablePadding="@dimen/all_spacing"
android:enabled="true"
android:gravity="center|left"
android:hint="@string/store_search_hint"
android:gravity="center"
android:maxLength="20"
android:maxLines="1"
android:onClick="@{OnClickListener}"
android:paddingLeft="@dimen/all_padding"
android:textColor="@color/black_likui"
android:text="新增组合"
android:textColor="@color/black_baozheng"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"/>
android:textSize="@dimen/all_sub_title_size"/>
<ImageButton
android:id="@+id/btn_scan"
......@@ -122,10 +120,45 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_left"
android:id="@+id/ll_keyword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/cl_title"
android:background="@color/white"
android:orientation="horizontal"
>
<TextView
android:id="@+id/tv_keyword"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:background="@drawable/shape_gray_r1"
android:clickable="true"
android:drawableLeft="@mipmap/ic_search"
android:drawablePadding="@dimen/all_padding"
android:enabled="true"
android:gravity="center|left"
android:hint="@string/store_search_hint"
android:maxLength="20"
android:maxLines="1"
android:onClick="@{OnClickListener}"
android:paddingLeft="@dimen/all_padding"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size_low"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_left"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_keyword"
android:orientation="vertical"
>
......
app/src/main/res/layout/fragment_bale_index.xml
View file @ c53c1a99
......@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao"
app:layout_constraintBottom_toTopOf="@id/btn_add"
app:layout_constraintBottom_toTopOf="@id/tv_keyword"
app:layout_constraintTop_toTopOf="parent">
<ImageButton
......@@ -52,25 +52,22 @@
app:layout_constraintTop_toBottomOf="parent">
<TextView
android:id="@+id/tv_keyword"
android:layout_width="0dp"
android:layout_height="@dimen/all_seach_height"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_weight="1"
android:background="@drawable/shape_gray_r1"
android:clickable="true"
android:drawableLeft="@mipmap/ic_search"
android:drawablePadding="@dimen/all_spacing"
android:enabled="true"
android:gravity="center|left"
android:hint="@string/store_search_hint"
android:gravity="center"
android:maxLength="20"
android:maxLines="1"
android:onClick="@{OnClickListener}"
android:paddingLeft="@dimen/all_padding"
android:textColor="@color/black_likui"
android:text="商品组合"
android:textColor="@color/black_baozheng"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size"/>
android:textSize="@dimen/all_sub_title_size"/>
<ImageButton
android:id="@+id/btn_scan"
......@@ -91,10 +88,39 @@
app:layout_constraintBottom_toBottomOf="parent"/>
</android.support.constraint.ConstraintLayout>
<View
<LinearLayout
android:id="@+id/ll_keyword"
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"></View>
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@+id/cl_title">
<TextView
android:id="@+id/tv_keyword"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:background="@drawable/shape_gray_r1"
android:clickable="true"
android:drawableLeft="@mipmap/ic_search"
android:drawablePadding="@dimen/all_padding"
android:enabled="true"
android:gravity="center|left"
android:hint="@string/store_search_hint"
android:maxLength="20"
android:maxLines="1"
android:onClick="@{OnClickListener}"
android:paddingLeft="@dimen/all_padding"
android:textColor="@color/black_likui"
android:textColorHint="@color/gray_huanggai"
android:textSize="@dimen/all_text_size_low"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/btn_add"
......@@ -107,7 +133,7 @@
app:layout_constraintBottom_toTopOf="@id/ll_menu"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cl_title">
app:layout_constraintTop_toBottomOf="@+id/ll_keyword">
<ImageView
......@@ -126,11 +152,6 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toBottomOf="@+id/btn_add"></View>
<TextView
android:id="@+id/btn_group"
......
app/src/main/res/layout/fragment_send_ticker.xml
View file @ c53c1a99
......@@ -72,7 +72,7 @@
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="parent"
app:placeholderImage="@mipmap/icon_menu_service_1"
app:placeholderImage="@mipmap/vip_send"
app:roundAsCircle="true"
app:roundingBorderColor="@color/gray_huanggai"
app:roundingBorderWidth="@dimen/all_line_width"/>
......@@ -117,6 +117,7 @@
android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintRight_toLeftOf="@id/cb_point"
app:layout_constraintTop_toBottomOf="parent"/>
......@@ -128,6 +129,7 @@
android:layout_marginEnd="@dimen/all_margin"
android:button="@mipmap/but_elect02"
android:contentDescription="@string/settle_balance"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="parent"/>
......@@ -166,11 +168,13 @@
android:layout_height="wrap_content"
android:background="@color/white"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:background="@color/gray_huanggai"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
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