Skip to content

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

修改组合ui显示问题

parent 4bf008dc
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 157 deletions
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ aac01143
...@@ -70,7 +70,7 @@ public class App extends Application { ...@@ -70,7 +70,7 @@ public class App extends Application {
.start(); .start();
// 初始化异常处理 // 初始化异常处理
// initEx(); initEx();
//初始化Fragment框架 //初始化Fragment框架
initFragment(); initFragment();
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java
View file @ aac01143
...@@ -65,7 +65,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter, ...@@ -65,7 +65,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
// } // }
// }).show((BaseActivity) getActivity()); // }).show((BaseActivity) getActivity());
// } // }
mViewBinding.setOnClickListener( mViewBinding.setOnClickListener(
new OnClickListener() { new OnClickListener() {
@Override @Override
......
app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java
View file @ aac01143
package com.xingdata.zzdpos.ui.main; package com.xingdata.zzdpos.ui.main;
import android.content.Context;
import android.databinding.DataBindingUtil; import android.databinding.DataBindingUtil;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
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.Toast;
import com.blankj.utilcode.util.ActivityUtils; import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.api.print.ZX_PrintPOS; import com.xingdata.api.print.ZX_PrintPOS;
...@@ -32,7 +28,6 @@ import java.util.List; ...@@ -32,7 +28,6 @@ import java.util.List;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.ObservableEmitter; import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe; import io.reactivex.ObservableOnSubscribe;
import io.reactivex.Scheduler;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer; import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
...@@ -212,7 +207,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin ...@@ -212,7 +207,11 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override @Override
protected void onDestroy() { protected void onDestroy() {
ZX_PrintPOS.getInstance(this).Destory(); try {
ZX_PrintPOS.getInstance(this).Destory();
} catch (Exception e) {
}
super.onDestroy(); super.onDestroy();
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java
View file @ aac01143
...@@ -97,7 +97,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd ...@@ -97,7 +97,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
mViewBinding.rvImgList.setLayoutManager(new GridLayoutManager(mContext, 3)); mViewBinding.rvImgList.setLayoutManager(new GridLayoutManager(mContext, 3));
mViewBinding.rvImgList.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration mViewBinding.rvImgList.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration
(3, 10, true)); (3, 3, true));
mViewBinding.etShopMoney.setFilters(InputFilters.getMoneyFilter(5, 2)); mViewBinding.etShopMoney.setFilters(InputFilters.getMoneyFilter(5, 2));
mViewBinding.setOnClickListener(new OnClickListener() { mViewBinding.setOnClickListener(new OnClickListener() {
@Override @Override
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachFragment.java
View file @ aac01143
package com.xingdata.zzdpos.ui.manage.bale.fragment; package com.xingdata.zzdpos.ui.manage.bale.fragment;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.widget.TextView;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
...@@ -11,7 +9,6 @@ import com.xingdata.zzdpos.base.BaseFragment; ...@@ -11,7 +9,6 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentBaleSeachBinding; import com.xingdata.zzdpos.databinding.FragmentBaleSeachBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.manage.bale.BalePresenter; import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
/** /**
...@@ -37,32 +34,30 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS ...@@ -37,32 +34,30 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
pop(); pop();
} }
break; break;
case R.id.btn_seach: {
seach(mViewBinding.etKeyword
.getText().toString());
}
break;
default: {
}
break;
} }
} }
} }
); );
mViewBinding.etKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() { // mViewBinding.etKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override // @Override
public boolean onEditorAction // public boolean onEditorAction
(TextView textView, int i, // (TextView textView, int i,
KeyEvent keyEvent) { // KeyEvent keyEvent) {
seach(mViewBinding.etKeyword // seach(mViewBinding.etKeyword
.getText().toString()); // .getText().toString());
return false; // return false;
} // }
} // }
//
); // );
Global.setFocus(mViewBinding.etKeyword, getActivity()); mViewBinding.vSearch.setOnSearchListener(keyword -> {
mViewBinding.vSearch.hideSoftInput();
loadingDialog.show((BaseActivity) getActivity());
seach(keyword);
});
mViewBinding.vSearch.setHint("请输入商品名称/助记码/条码");
mViewBinding.vSearch.setEmptyEnabled(true);
mViewBinding.vSearch.showSoftInput();
} }
public void seach(String str) { public void seach(String str) {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachShopFragment.java
View file @ aac01143
...@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.manage.bale.fragment; ...@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.manage.bale.fragment;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.LinearLayoutManager;
import android.view.KeyEvent;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
...@@ -15,7 +14,6 @@ import com.xingdata.zzdpos.model.Sssku; ...@@ -15,7 +14,6 @@ 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.bale.BalePresenter; import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
import com.xingdata.zzdpos.ui.manage.bale.adpter.EditDialogQueryShopItemAdapter; import com.xingdata.zzdpos.ui.manage.bale.adpter.EditDialogQueryShopItemAdapter;
import com.xingdata.zzdpos.util.Global;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -63,11 +61,11 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter, ...@@ -63,11 +61,11 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
} }
loadingDialog.show((BaseActivity) getActivity()); loadingDialog.show((BaseActivity) getActivity());
if (barCode != null) { if (barCode != null) {
mViewBinding.etKeyword.setText(barCode); mViewBinding.vSearch.setText(barCode);
mPresenter.queryShopItem(barCode, true, mPresenter.queryShopItem(barCode, true,
loadingDialog); loadingDialog);
} else { } else {
mPresenter.queryShopItem(mViewBinding.etKeyword.getText().toString(), true, mPresenter.queryShopItem("", true,
loadingDialog); loadingDialog);
} }
...@@ -80,15 +78,15 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter, ...@@ -80,15 +78,15 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
pop(); pop();
} }
break; break;
case R.id.btn_seach: { // case R.id.btn_seach: {
loadingDialog.show((BaseActivity) // loadingDialog.show((BaseActivity)
getActivity()); // getActivity());
mPresenter.queryShopItem(mViewBinding // mPresenter.queryShopItem(mViewBinding
.etKeyword.getText() // .etKeyword.getText()
.toString(), // .toString(),
true, loadingDialog); // true, loadingDialog);
} // }
break; // break;
default: { default: {
} }
...@@ -97,26 +95,36 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter, ...@@ -97,26 +95,36 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
} }
} }
); );
mViewBinding.etKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() { // mViewBinding.etKeyword.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override // @Override
public boolean onEditorAction // public boolean onEditorAction
(TextView textView, int i, // (TextView textView, int i,
KeyEvent keyEvent) { // KeyEvent keyEvent) {
loadingDialog.show((BaseActivity) // loadingDialog.show((BaseActivity)
getActivity()); // getActivity());
mPresenter.queryShopItem // mPresenter.queryShopItem
(mViewBinding // (mViewBinding
.etKeyword //
.getText() // .etKeyword
.toString(), //
true, // .getText()
loadingDialog); //
return false; // .toString(),
} // true,
} // loadingDialog);
// return false;
); // }
// }
// );
mViewBinding.vSearch.setOnSearchListener(keyword -> {
mViewBinding.vSearch.hideSoftInput();
loadingDialog.show((BaseActivity) getActivity());
mPresenter.queryShopItem(keyword, true, loadingDialog);
});
mViewBinding.vSearch.setHint("请输入商品名称/助记码/条码");
mViewBinding.vSearch.setEmptyEnabled(true);
mViewBinding.vSearch.showSoftInput();
} }
...@@ -130,7 +138,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter, ...@@ -130,7 +138,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
queryShopItemAdapter.setNewData(nowData); queryShopItemAdapter.setNewData(nowData);
getEmptyView("没有数据"); getEmptyView("没有数据");
} }
Global.setFocus(mViewBinding.etKeyword, getActivity()); mViewBinding.vSearch.showSoftInput();
} }
public void setAddData(List<Sssku> addData, Boolean isLoadMore) { public void setAddData(List<Sssku> addData, Boolean isLoadMore) {
...@@ -143,7 +151,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter, ...@@ -143,7 +151,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
queryShopItemAdapter.addData(nowData); queryShopItemAdapter.addData(nowData);
getEmptyView("没有数据"); getEmptyView("没有数据");
} }
Global.setFocus(mViewBinding.etKeyword, getActivity()); mViewBinding.vSearch.showSoftInput();
} }
/** /**
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java
View file @ aac01143
...@@ -6,9 +6,11 @@ import android.view.View; ...@@ -6,9 +6,11 @@ import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendTickerVipBinding; import com.xingdata.zzdpos.databinding.FragmentSendTickerVipBinding;
import com.xingdata.zzdpos.model.Vip; import com.xingdata.zzdpos.model.Vip;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter; import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter; import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter;
import com.xingdata.zzdpos.ui.settle.SettleActivity; import com.xingdata.zzdpos.ui.settle.SettleActivity;
...@@ -23,6 +25,7 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT ...@@ -23,6 +25,7 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
@SuppressLint("InflateParams") @SuppressLint("InflateParams")
View emptyView; View emptyView;
TextView noSeachData; TextView noSeachData;
LoadingDialog loadingDialog = new LoadingDialog();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
...@@ -66,9 +69,11 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT ...@@ -66,9 +69,11 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
}); });
mViewBinding.vSearch.setOnSearchListener(keyword -> { mViewBinding.vSearch.setOnSearchListener(keyword -> {
mViewBinding.vSearch.hideSoftInput(); mViewBinding.vSearch.hideSoftInput();
loadingDialog.show((BaseActivity) getActivity());
mPresenter.searchVip(keyword); mPresenter.searchVip(keyword);
}); });
mViewBinding.vSearch.setHint("请输入会员手机号进行搜索"); mViewBinding.vSearch.setHint("请输入会员手机号进行搜索");
// mViewBinding.vSearch.setEmptyEnabled(true);
mViewBinding.vSearch.showSoftInput(); mViewBinding.vSearch.showSoftInput();
} }
...@@ -78,6 +83,9 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT ...@@ -78,6 +83,9 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
* @param vips 会员列表 * @param vips 会员列表
*/ */
public void loadVips(List<Vip> vips) { public void loadVips(List<Vip> vips) {
if (loadingDialog != null && loadingDialog.isShowing) {
loadingDialog.dismiss();
}
if (vips.size() == 0) { if (vips.size() == 0) {
noSeachData.setText(R.string.settle_vip_search_empty_no_seach); noSeachData.setText(R.string.settle_vip_search_empty_no_seach);
mVipAdapter.setEmptyView(emptyView); mVipAdapter.setEmptyView(emptyView);
......
app/src/main/java/com/xingdata/zzdpos/view/SearchBar.java
View file @ aac01143
...@@ -83,7 +83,7 @@ public class SearchBar extends ConstraintLayout { ...@@ -83,7 +83,7 @@ public class SearchBar extends ConstraintLayout {
mViewBinding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.view_search_bar, this, true); mViewBinding = DataBindingUtil.inflate(LayoutInflater.from(context), R.layout.view_search_bar, this, true);
mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> { mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
if (i == EditorInfo.IME_ACTION_SEARCH) { if (i == EditorInfo.IME_ACTION_SEARCH||i==EditorInfo.IME_ACTION_UNSPECIFIED) {
String str = mViewBinding.etSearch.getText().toString(); String str = mViewBinding.etSearch.getText().toString();
if (StringUtils.isEmpty(str) && !isEmptyEnabled) { if (StringUtils.isEmpty(str) && !isEmptyEnabled) {
ToastUtils.showShort("请输入搜索内容"); ToastUtils.showShort("请输入搜索内容");
......
app/src/main/res/layout/activity_error_dialog.xml
View file @ aac01143
...@@ -92,7 +92,8 @@ ...@@ -92,7 +92,8 @@
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1.5"
android:gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button
...@@ -107,11 +108,10 @@ ...@@ -107,11 +108,10 @@
android:textColor="@drawable/selector_gray_button_text_color"/> android:textColor="@drawable/selector_gray_button_text_color"/>
<Button <Button
style="@style/button_positive_allradius"
android:id="@+id/btn_ok" android:id="@+id/btn_ok"
android:layout_width="0dp" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_weight="1"
android:background="@drawable/selector_gradient_red_button_background"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@{ok}" android:text="@{ok}"
android:textColor="@color/white"/> android:textColor="@color/white"/>
......
app/src/main/res/layout/fragment_bale_edit.xml
View file @ aac01143
...@@ -309,7 +309,6 @@ ...@@ -309,7 +309,6 @@
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/shape_black" android:background="@drawable/shape_black"
android:paddingLeft="@dimen/all_bounced_spacing"
android:paddingRight="@dimen/all_bounced_spacing"></android.support.v7.widget.RecyclerView> android:paddingRight="@dimen/all_bounced_spacing"></android.support.v7.widget.RecyclerView>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_bale_seach.xml
View file @ aac01143
...@@ -46,52 +46,61 @@ ...@@ -46,52 +46,61 @@
android:src="@mipmap/back_black" android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent"/> app:layout_constraintLeft_toLeftOf="parent"/>
<LinearLayout <com.xingdata.zzdpos.view.SearchBar
android:id="@+id/v_search"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_marginEnd="@dimen/all_margin" app:hint="@string/store_search_hint"
android:gravity="center|left" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back" app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="parent"> app:layout_constraintTop_toTopOf="parent"/>
<!--<LinearLayout-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="match_parent"-->
<!--android:layout_marginEnd="@dimen/all_margin"-->
<!--android:gravity="center|left"-->
<!--app:layout_constraintBottom_toTopOf="parent"-->
<!--app:layout_constraintLeft_toRightOf="@id/btn_back"-->
<!--app:layout_constraintRight_toRightOf="parent"-->
<!--app:layout_constraintTop_toBottomOf="parent">-->
<EditText <!--<EditText-->
android:id="@+id/et_keyword" <!--android:id="@+id/et_keyword"-->
style="@style/searchBarEditor" <!--style="@style/searchBarEditor"-->
android:layout_width="0dp" <!--android:layout_width="0dp"-->
android:layout_marginEnd="@dimen/all_spacing" <!--android:layout_marginEnd="@dimen/all_spacing"-->
android:layout_weight="1" <!--android:layout_weight="1"-->
android:background="@drawable/shape_gray_r1" <!--android:background="@drawable/shape_gray_r1"-->
android:clickable="true" <!--android:clickable="true"-->
android:drawableLeft="@mipmap/ic_search" <!--android:drawableLeft="@mipmap/ic_search"-->
android:drawablePadding="@dimen/all_spacing" <!--android:drawablePadding="@dimen/all_spacing"-->
android:enabled="true" <!--android:enabled="true"-->
android:gravity="center|left" <!--android:gravity="center|left"-->
android:hint="@string/store_search_hint" <!--android:hint="@string/store_search_hint"-->
android:maxLength="20" <!--android:maxLength="20"-->
android:maxLines="1" <!--android:maxLines="1"-->
android:onClick="@{OnClickListener}" <!--android:onClick="@{OnClickListener}"-->
android:paddingLeft="@dimen/all_padding" <!--android:paddingLeft="@dimen/all_padding"-->
android:saveEnabled="false" <!--android:saveEnabled="false"-->
android:textColor="@color/black_likui" <!--android:textColor="@color/black_likui"-->
android:textSize="@dimen/all_text_size_low"/> <!--android:textSize="@dimen/all_text_size_low"/>-->
<TextView <!--<TextView-->
android:id="@+id/btn_seach" <!--android:id="@+id/btn_seach"-->
android:layout_width="wrap_content" <!--android:layout_width="wrap_content"-->
android:layout_height="match_parent" <!--android:layout_height="match_parent"-->
android:background="@color/transparent" <!--android:background="@color/transparent"-->
android:contentDescription="@string/store_scan" <!--android:contentDescription="@string/store_scan"-->
android:foreground="?android:attr/actionBarItemBackground" <!--android:foreground="?android:attr/actionBarItemBackground"-->
android:gravity="center" <!--android:gravity="center"-->
android:onClick="@{OnClickListener}" <!--android:onClick="@{OnClickListener}"-->
android:text="搜索" <!--android:text="搜索"-->
android:textColor="@color/black_baozheng" <!--android:textColor="@color/black_baozheng"-->
android:textSize="@dimen/all_body_size" <!--android:textSize="@dimen/all_body_size"-->
/> <!--/>-->
</LinearLayout> <!--</LinearLayout>-->
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_bale_seach_shop.xml
View file @ aac01143
...@@ -44,46 +44,55 @@ ...@@ -44,46 +44,55 @@
android:src="@mipmap/back_black" android:src="@mipmap/back_black"
app:layout_constraintLeft_toLeftOf="parent"/> app:layout_constraintLeft_toLeftOf="parent"/>
<LinearLayout <com.xingdata.zzdpos.view.SearchBar
android:id="@+id/v_search"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_marginEnd="@dimen/all_margin" app:hint="@string/store_search_hint"
android:gravity="center" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back" app:layout_constraintLeft_toRightOf="@id/btn_back"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="parent"> app:layout_constraintTop_toTopOf="parent"/>
<!--<LinearLayout-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="match_parent"-->
<!--android:layout_marginEnd="@dimen/all_margin"-->
<!--android:gravity="center"-->
<!--app:layout_constraintBottom_toTopOf="parent"-->
<!--app:layout_constraintLeft_toRightOf="@id/btn_back"-->
<!--app:layout_constraintRight_toRightOf="parent"-->
<!--app:layout_constraintTop_toBottomOf="parent">-->
<EditText <!--<EditText-->
android:id="@+id/et_keyword" <!--android:id="@+id/et_keyword"-->
style="@style/searchBarEditor" <!--style="@style/searchBarEditor"-->
android:layout_width="0dp" <!--android:layout_width="0dp"-->
android:layout_marginEnd="@dimen/all_spacing" <!--android:layout_marginEnd="@dimen/all_spacing"-->
android:layout_weight="1" <!--android:layout_weight="1"-->
android:focusable="true" <!--android:focusable="true"-->
android:hint="@string/store_search_hint" <!--android:hint="@string/store_search_hint"-->
android:imeOptions="actionSearch" <!--android:imeOptions="actionSearch"-->
android:inputType="text" <!--android:inputType="text"-->
android:labelFor="@+id/et_search" <!--android:labelFor="@+id/et_search"-->
android:saveEnabled="false" <!--android:saveEnabled="false"-->
android:textColor="@color/black_likui" <!--android:textColor="@color/black_likui"-->
android:textSize="@dimen/all_text_size_low"/> <!--android:textSize="@dimen/all_text_size_low"/>-->
<TextView <!--<TextView-->
android:id="@+id/btn_seach" <!--android:id="@+id/btn_seach"-->
android:layout_width="wrap_content" <!--android:layout_width="wrap_content"-->
android:layout_height="match_parent" <!--android:layout_height="match_parent"-->
android:background="@color/transparent" <!--android:background="@color/transparent"-->
android:contentDescription="@string/store_scan" <!--android:contentDescription="@string/store_scan"-->
android:foreground="?android:attr/actionBarItemBackground" <!--android:foreground="?android:attr/actionBarItemBackground"-->
android:gravity="center" <!--android:gravity="center"-->
android:onClick="@{OnClickListener}" <!--android:onClick="@{OnClickListener}"-->
android:text="搜索" <!--android:text="搜索"-->
android:textColor="@color/black_baozheng" <!--android:textColor="@color/black_baozheng"-->
android:textSize="@dimen/all_body_size" <!--android:textSize="@dimen/all_body_size"-->
/> <!--/>-->
</LinearLayout> <!--</LinearLayout>-->
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_send_ticker_vip.xml
View file @ aac01143
...@@ -75,8 +75,7 @@ ...@@ -75,8 +75,7 @@
android:id="@+id/v_search" android:id="@+id/v_search"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:inputType="number" app:inputType="number"
android:maxLength="11"
app:hint="@string/store_search_hint" app:hint="@string/store_search_hint"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_back" app:layout_constraintLeft_toRightOf="@id/btn_back"
......
app/src/main/res/layout/item_bale_editfragment_img.xml
View file @ aac01143
...@@ -9,16 +9,15 @@ ...@@ -9,16 +9,15 @@
</data> </data>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="75dp" android:layout_width="match_parent"
android:layout_height="75dp" android:layout_height="40dp"
android:layout_margin="@dimen/all_padding"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:orientation="vertical"> android:orientation="vertical">
<com.facebook.drawee.view.SimpleDraweeView <com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/iv_pic" android:id="@+id/iv_pic"
android:layout_width="25dp" android:layout_width="match_parent"
android:layout_height="25dp" android:layout_height="match_parent"
android:src="@mipmap/icon_qrcode"/> android:src="@mipmap/icon_qrcode"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
......
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