Skip to content

T
TangKuPos
Commit f667a07e authored by zhang_z's avatar zhang_z
Browse files
Options

语言包;

parent 8a654b6a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1837 additions and 364 deletions
.idea/codeStyles/Project.xml
View file @ f667a07e
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<Objective-C-extensions> <codeStyleSettings language="XML">
<file> <indentOptions>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> <option name="CONTINUATION_INDENT_SIZE" value="4" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> </indentOptions>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> <arrangement>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> <rules>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> <section>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> <rule>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> <match>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> <AND>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> <NAME>xmlns:android</NAME>
</file> <XML_ATTRIBUTE />
<class> <XML_NAMESPACE>^$</XML_NAMESPACE>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> </AND>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> </match>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> </rule>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> </section>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> <section>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> <rule>
</class> <match>
<extensions> <AND>
<pair source="cpp" header="h" fileNamingConvention="NONE" /> <NAME>xmlns:.*</NAME>
<pair source="c" header="h" fileNamingConvention="NONE" /> <XML_ATTRIBUTE />
</extensions> <XML_NAMESPACE>^$</XML_NAMESPACE>
</Objective-C-extensions> </AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>
\ No newline at end of file
.idea/encodings.xml 0 → 100644
View file @ f667a07e
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>
\ No newline at end of file
.idea/misc.xml
View file @ f667a07e
...@@ -5,27 +5,31 @@ ...@@ -5,27 +5,31 @@
<option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
<option name="myNullables"> <option name="myNullables">
<value> <value>
<list size="5"> <list size="7">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
<item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" /> <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
<item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
<item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
<item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
</list> </list>
</value> </value>
</option> </option>
<option name="myNotNulls"> <option name="myNotNulls">
<value> <value>
<list size="4"> <list size="6">
<item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
<item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
<item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
<item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
<item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
<item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
</list> </list>
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">
......
.idea/vcs.xml
View file @ f667a07e
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>
\ No newline at end of file
app/build.gradle
View file @ f667a07e
...@@ -9,43 +9,24 @@ android { ...@@ -9,43 +9,24 @@ android {
targetSdkVersion 27 targetSdkVersion 27
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
}
//解决问题的代码
dexOptions {
jumboMode true
}
buildTypes {
release {
zipAlignEnabled true
debuggable true
//混淆编译
// minifyEnabled true//打开
//移除无用的资源文件s
// shrinkResources true//打开
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
} }
//开启DataBinding //开启DataBinding
dataBinding { dataBinding {
enabled = true enabled = true
} }
//使用Realm数据库 //使用Realm数据库
realm { realm {
syncEnabled = true syncEnabled = true
} }
lintOptions {
disable 'GoogleAppIndexingWarning'
checkReleaseBuilds false
abortOnError false
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
sourceSets {
main {
assets.srcDirs = ['src/main/assets', 'src/main/assets/']
}
}
} }
repositories { repositories {
flatDir { flatDir {
...@@ -78,7 +59,7 @@ dependencies { ...@@ -78,7 +59,7 @@ dependencies {
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30' implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.30'
implementation 'com.yanzhenjie:permission:1.1.2' implementation 'com.yanzhenjie:permission:1.1.2'
implementation 'com.wanjian:cockroach:0.0.5' implementation 'com.wanjian:cockroach:0.0.5'
implementation 'me.yokeyword:fragmentation:1.1.6' implementation 'me.yokeyword:fragmentation:1.3.6'
implementation 'com.github.arcadefire:nice-spinner:1.3.1' implementation 'com.github.arcadefire:nice-spinner:1.3.1'
implementation 'com.contrarywind:Android-PickerView:3.2.5' implementation 'com.contrarywind:Android-PickerView:3.2.5'
implementation 'com.github.ybq:Android-SpinKit:1.1.0' implementation 'com.github.ybq:Android-SpinKit:1.1.0'
......
app/release/output.json 0 → 100644
View file @ f667a07e
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/C.java
View file @ f667a07e
...@@ -65,7 +65,7 @@ public class C { ...@@ -65,7 +65,7 @@ public class C {
* <p> * <p>
* sn:test2019 设备型号 AECRC10 （收银机） * sn:test2019 设备型号 AECRC10 （收银机）
*/ */
public static final String URL_TEST = "http://121.40.56.52:80/"; public static final String URL_TEST = "http://op.51zzd.com/";
/** /**
* 开发平台（开发人员使用） * 开发平台（开发人员使用）
...@@ -80,7 +80,7 @@ public class C { ...@@ -80,7 +80,7 @@ public class C {
/** /**
* 地址 * 地址
*/ */
public static final String BASE_URL = URL_ONLINE; public static final String BASE_URL = URL_TEST;
private static final String PKG = "/tk/"; private static final String PKG = "/tk/";
......
app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java
View file @ f667a07e
...@@ -665,28 +665,19 @@ public final class ApiFactory { ...@@ -665,28 +665,19 @@ public final class ApiFactory {
/** /**
* 库存盘点记录查询接口 * 库存盘点记录查询接口
* *
* @param pageNulmber * @param pageNumber
* @param pageSize * @param pageSize
* @return * @return
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber, public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> queryCsList(int pageNumber, int pageSize, long startDate, long endDate) {
int pageSize, return run(Api.getInstance().service.querCsList(pageNumber, pageSize, startDate, endDate));
long startDate,
long endDate) {
return run(Api.getInstance().service.querCsList(pageNulmber, pageSize, startDate,
endDate));
} }
/** /**
* 库存盘点记录查询接口 * 库存盘点记录查询接口
*
* @param pageNulmber
* @param pageSize
* @return
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> querCsList(int pageNulmber, public static Observable<Pager<com.xingdata.zzdpos.model.Cs>> queryCsList(int pageNumber, int pageSize) {
int pageSize) { return run(Api.getInstance().service.querCsList(pageNumber, pageSize));
return run(Api.getInstance().service.querCsList(pageNulmber, pageSize));
} }
} }
...@@ -694,8 +685,7 @@ public final class ApiFactory { ...@@ -694,8 +685,7 @@ public final class ApiFactory {
/** /**
* 查询公告列表 * 查询公告列表
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Notice>> queryNotice(int pageNum, public static Observable<Pager<com.xingdata.zzdpos.model.Notice>> queryNotice(int pageNum, int pageSize) {
int pageSize) {
return run(Api.getInstance().service.queryNotice(pageNum, pageSize)); return run(Api.getInstance().service.queryNotice(pageNum, pageSize));
} }
} }
...@@ -704,11 +694,8 @@ public final class ApiFactory { ...@@ -704,11 +694,8 @@ public final class ApiFactory {
/** /**
* 查询充值记录 * 查询充值记录
*/ */
public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int public static Observable<Pager<VipRechargeOrder>> queryRecharge(int pageNum, int pageSize, long startDate, long endDate) {
pageSize, long startDate, return run(Api.getInstance().service.queryRecharge(pageNum, pageSize, startDate, endDate));
long endDate) {
return run(Api.getInstance().service.queryRecharge(pageNum, pageSize, startDate,
endDate));
} }
/** /**
...@@ -721,8 +708,7 @@ public final class ApiFactory { ...@@ -721,8 +708,7 @@ public final class ApiFactory {
/** /**
* 查询充值记录 * 查询充值记录
*/ */
public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId, int pageNum, public static Observable<Pager<VipRechargeOrder>> queryRecharge(long vipId, int pageNum, int pageSize) {
int pageSize) {
return run(Api.getInstance().service.queryRecharge(vipId, pageNum, pageSize)); return run(Api.getInstance().service.queryRecharge(vipId, pageNum, pageSize));
} }
} }
...@@ -743,8 +729,7 @@ public final class ApiFactory { ...@@ -743,8 +729,7 @@ public final class ApiFactory {
/** /**
* 订货提交 * 订货提交
*/ */
public static Observable<String> addPsb(com.xingdata.zzdpos.model public static Observable<String> addPsb(com.xingdata.zzdpos.model.Psb psb) {
.Psb psb) {
return run(Api.getInstance().service.addPsb(psb)); return run(Api.getInstance().service.addPsb(psb));
} }
...@@ -758,8 +743,7 @@ public final class ApiFactory { ...@@ -758,8 +743,7 @@ public final class ApiFactory {
/** /**
* 查询订货订单 * 查询订货订单
*/ */
public static Observable<Pager<com.xingdata.zzdpos.model.Psb>> queryPsb(int pageNum, public static Observable<Pager<com.xingdata.zzdpos.model.Psb>> queryPsb(int pageNum, int pageSize) {
int pageSize) {
return run(Api.getInstance().service.queryPsb(pageNum, pageSize)); return run(Api.getInstance().service.queryPsb(pageNum, pageSize));
} }
...@@ -869,31 +853,22 @@ public final class ApiFactory { ...@@ -869,31 +853,22 @@ public final class ApiFactory {
return run(Api.getInstance().service.detailMs(id)); return run(Api.getInstance().service.detailMs(id));
} }
public static Observable<com.xingdata.zzdpos.model.Ms> update(com.xingdata.zzdpos.model public static Observable<com.xingdata.zzdpos.model.Ms> update(com.xingdata.zzdpos.model.Ms ms) {
.Ms ms) {
return run(Api.getInstance().service.updateMs(ms)); return run(Api.getInstance().service.updateMs(ms));
} }
public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms public static Observable<com.xingdata.zzdpos.model.Ms> add(com.xingdata.zzdpos.model.Ms ms) {
ms) {
return run(Api.getInstance().service.addMs(ms)); return run(Api.getInstance().service.addMs(ms));
} }
} }
public static class Level { public static class Level {
public static Observable<com.xingdata.zzdpos.model.Level> addVipLevel(com.xingdata.zzdpos public static Observable<com.xingdata.zzdpos.model.Level> addVipLevel(com.xingdata.zzdpos.model.Level level) {
.model
.Level
level) {
return run(Api.getInstance().service.addVipLevel(level)); return run(Api.getInstance().service.addVipLevel(level));
} }
public static Observable<com.xingdata.zzdpos.model.Level> updateVipLevel(com.xingdata public static Observable<com.xingdata.zzdpos.model.Level> updateVipLevel(com.xingdata.zzdpos.model.Level level) {
.zzdpos
.model
.Level
level) {
return run(Api.getInstance().service.updateVipLevel(level)); return run(Api.getInstance().service.updateVipLevel(level));
} }
...@@ -936,14 +911,11 @@ public final class ApiFactory { ...@@ -936,14 +911,11 @@ public final class ApiFactory {
} }
public static class Oper { public static class Oper {
public static Observable<com.xingdata.zzdpos.model.Oper> addOper(com.xingdata.zzdpos.model public static Observable<com.xingdata.zzdpos.model.Oper> addOper(com.xingdata.zzdpos.model.Oper oper) {
.Oper oper) {
return run(Api.getInstance().service.addOper(oper)); return run(Api.getInstance().service.addOper(oper));
} }
public static Observable<com.xingdata.zzdpos.model.Oper> updateOper(com.xingdata.zzdpos public static Observable<com.xingdata.zzdpos.model.Oper> updateOper(com.xingdata.zzdpos.model.Oper oper) {
.model.Oper
oper) {
return run(Api.getInstance().service.updateOper(oper)); return run(Api.getInstance().service.updateOper(oper));
} }
......
app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java
View file @ f667a07e
...@@ -22,6 +22,7 @@ import java.util.List; ...@@ -22,6 +22,7 @@ import java.util.List;
import me.yokeyword.fragmentation.SupportActivity; import me.yokeyword.fragmentation.SupportActivity;
/** /**
* BaseActivity,供新创建的Activity继承 * BaseActivity,供新创建的Activity继承
* *
...@@ -152,6 +153,7 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi ...@@ -152,6 +153,7 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
C.SYSTEM.mStateEnable = false; C.SYSTEM.mStateEnable = false;
super.onPause(); super.onPause();
} }
@Override @Override
protected void onStop() { protected void onStop() {
// C.SYSTEM.mStateEnable = false; // C.SYSTEM.mStateEnable = false;
......
app/src/main/java/com/xingdata/zzdpos/base/BaseSelectedAdapter.java
View file @ f667a07e
...@@ -19,11 +19,10 @@ import java.util.List; ...@@ -19,11 +19,10 @@ import java.util.List;
* @author Zhangzhen * @author Zhangzhen
*/ */
public abstract class BaseSelectedAdapter<T, B extends ViewDataBinding> extends BaseQuickAdapter<T, BaseViewHolder> { public abstract class BaseSelectedAdapter<T, B extends ViewDataBinding> extends BaseQuickAdapter<T, BaseViewHolder> {
private OnItemClickListener mOnItemClickListener;
private int mSelectedPosition = 0; private int mSelectedPosition = 0;
private OnItemClickListener mOnItemClickListener;
private boolean isEnabled = true; private boolean isEnabled = true;
private boolean isAutoClickItem; private boolean isAutoClickItem;
public BaseSelectedAdapter(int layoutResId, @Nullable List<T> data) { public BaseSelectedAdapter(int layoutResId, @Nullable List<T> data) {
......
app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java
View file @ f667a07e
...@@ -174,7 +174,7 @@ public class DBFactory { ...@@ -174,7 +174,7 @@ public class DBFactory {
query.equalTo("msCoustomTag", 0); query.equalTo("msCoustomTag", 0);
return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING)) return Observable.just(query.findAll().sort("msTouchTag2", Sort.DESCENDING))
.flatMap(ms -> Observable.just(getList(ms))); .flatMap(ms -> Observable.just(getList(ms)));
} }
...@@ -205,7 +205,7 @@ public class DBFactory { ...@@ -205,7 +205,7 @@ public class DBFactory {
RealmQuery<Pay> query = DB.getInstance().get(VipPresenter.class).where(Pay.class); RealmQuery<Pay> query = DB.getInstance().get(VipPresenter.class).where(Pay.class);
query.equalTo("payDispFlag", 1); query.equalTo("payDispFlag", 1);
return Observable.just(query.findAllSorted("payType", Sort.ASCENDING)) return Observable.just(query.findAll().sort("payType", Sort.ASCENDING))
.flatMap(pays -> Observable.just(getList(pays))); .flatMap(pays -> Observable.just(getList(pays)));
} }
...@@ -221,7 +221,7 @@ public class DBFactory { ...@@ -221,7 +221,7 @@ public class DBFactory {
RealmQuery<Pay> query = DB.getInstance().get(SettlePresenter.class).where(Pay.class); RealmQuery<Pay> query = DB.getInstance().get(SettlePresenter.class).where(Pay.class);
query.equalTo("payDispFlag", 1); query.equalTo("payDispFlag", 1);
return Observable.just(query.findAllSorted("payType", Sort.ASCENDING)) return Observable.just(query.findAll().sort("payType", Sort.ASCENDING))
.flatMap(pays -> Observable.just(getList(pays))); .flatMap(pays -> Observable.just(getList(pays)));
} }
...@@ -250,8 +250,7 @@ public class DBFactory { ...@@ -250,8 +250,7 @@ public class DBFactory {
query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo query.beginGroup().lessThanOrEqualTo("msTimeBegin", timeNow).greaterThanOrEqualTo
("msTimeEnd", timeNow).endGroup(); ("msTimeEnd", timeNow).endGroup();
return Observable.just(query.findAll().sort("msTouchTag2", Sort.DESCENDING))
return Observable.just(query.findAllSorted("msTouchTag2", Sort.DESCENDING))
.flatMap(ms -> Observable.just(getList(ms))); .flatMap(ms -> Observable.just(getList(ms)));
} }
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementActivity.java
View file @ f667a07e
...@@ -3,14 +3,12 @@ package com.xingdata.zzdpos.ui.announcement; ...@@ -3,14 +3,12 @@ package com.xingdata.zzdpos.ui.announcement;
import android.view.View; import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
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.ActivityAnnouncementBinding; import com.xingdata.zzdpos.databinding.ActivityAnnouncementBinding;
import com.xingdata.zzdpos.model.Notice; import com.xingdata.zzdpos.model.Notice;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.ui.announcement.fragment.AnnouncementFragment; import com.xingdata.zzdpos.ui.announcement.fragment.AnnouncementFragment;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.util.OnClickListener; import com.xingdata.zzdpos.util.OnClickListener;
...@@ -26,7 +24,7 @@ public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, Ac ...@@ -26,7 +24,7 @@ public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, Ac
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("公告"); mViewBinding.icTitle.tvTitle.setText(R.string.title_notifications);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/InventoryPresenter.java
View file @ f667a07e
...@@ -3,27 +3,16 @@ package com.xingdata.zzdpos.ui.manage.inventory; ...@@ -3,27 +3,16 @@ package com.xingdata.zzdpos.ui.manage.inventory;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.api.ApiFactory; import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.db.DB;
import com.xingdata.zzdpos.db.DBFactory;
import com.xingdata.zzdpos.model.Cs; import com.xingdata.zzdpos.model.Cs;
import com.xingdata.zzdpos.model.CsDetail; import com.xingdata.zzdpos.model.CsDetail;
import com.xingdata.zzdpos.model.Sssku; import com.xingdata.zzdpos.model.Sssku;
import com.xingdata.zzdpos.ui.main.MainPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.StringUtil; import com.xingdata.zzdpos.util.StringUtil;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.List;
import io.reactivex.Observable;
import io.realm.RealmQuery;
import static com.xingdata.zzdpos.db.DBFactory.getList;
public class InventoryPresenter extends InventoryContract.Presenter { public class InventoryPresenter extends InventoryContract.Presenter {
...@@ -185,7 +174,7 @@ public class InventoryPresenter extends InventoryContract.Presenter { ...@@ -185,7 +174,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
@Override @Override
public void getInventoryList(int pageNum, long start, long end) { public void getInventoryList(int pageNum, long start, long end) {
mView.isShowLoading(true); mView.isShowLoading(true);
ApiFactory.Cs.querCsList(pageNum, nowPageSize, start, end).doFinally(() -> mView.isShowLoading(false)) ApiFactory.Cs.queryCsList(pageNum, nowPageSize, start, end).doFinally(() -> mView.isShowLoading(false))
.subscribe(csPager -> { .subscribe(csPager -> {
//判断是否能加载更多 //判断是否能加载更多
if (csPager.getList().size() == 0) { if (csPager.getList().size() == 0) {
...@@ -214,7 +203,7 @@ public class InventoryPresenter extends InventoryContract.Presenter { ...@@ -214,7 +203,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
@Override @Override
public void getInventoryList(int PageNumber) { public void getInventoryList(int PageNumber) {
mView.isShowLoading(true); mView.isShowLoading(true);
ApiFactory.Cs.querCsList(PageNumber, nowPageSize).doFinally(() -> mView.isShowLoading(false)) ApiFactory.Cs.queryCsList(PageNumber, nowPageSize).doFinally(() -> mView.isShowLoading(false))
.subscribe(csPager -> { .subscribe(csPager -> {
//判断是否能加载更多 //判断是否能加载更多
mView.loadCs(csPager); mView.loadCs(csPager);
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/PayResultFragment.java
View file @ f667a07e
package com.xingdata.zzdpos.ui.settle.fragment; package com.xingdata.zzdpos.ui.settle.fragment;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentPayResultBinding; import com.xingdata.zzdpos.databinding.FragmentPayResultBinding;
...@@ -43,15 +42,7 @@ public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPay ...@@ -43,15 +42,7 @@ public class PayResultFragment extends BaseFragment<SettlePresenter, FragmentPay
mPresenter.clickContinue(); mPresenter.clickContinue();
}); });
mViewBinding.setStrSettleMode(getString(R.string.all_confirm));
switch (mSettleMode) {
case C.SETTLE_MODE.PAYMENT:
mViewBinding.setStrSettleMode("继续收款");
break;
case C.SETTLE_MODE.STORE:
mViewBinding.setStrSettleMode("继续开单");
break;
}
} }
@Override @Override
......
app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java
View file @ f667a07e
...@@ -85,10 +85,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin ...@@ -85,10 +85,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
}); });
mViewBinding.tvSelectAll.setOnClickListener(view -> {
mGiftFragment.selectAll();
});
mScanFragment.setOnScanCompletedListener(barcode -> mPresenter.scanComplete(barcode)); mScanFragment.setOnScanCompletedListener(barcode -> mPresenter.scanComplete(barcode));
mScanFragment.setOnBackPressedListener(this::backToStoreFragment); mScanFragment.setOnBackPressedListener(this::backToStoreFragment);
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/store/adapter/SkugrpAdapter.java
View file @ f667a07e
...@@ -9,7 +9,6 @@ import com.xingdata.zzdpos.model.Sskugrp; ...@@ -9,7 +9,6 @@ import com.xingdata.zzdpos.model.Sskugrp;
import java.util.ArrayList; import java.util.ArrayList;
public class SkugrpAdapter extends BaseSelectedAdapter<Sskugrp, ItemSelectorBinding> { public class SkugrpAdapter extends BaseSelectedAdapter<Sskugrp, ItemSelectorBinding> {
public SkugrpAdapter() { public SkugrpAdapter() {
super(R.layout.item_selector, new ArrayList<>(), false); super(R.layout.item_selector, new ArrayList<>(), false);
} }
......
app/src/main/res/drawable/red_border_thr.xml
View file @ f667a07e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/all_shape_radius" /> <corners android:radius="@dimen/all_shape_radius" />
......
app/src/main/res/layout/activity_main.xml
View file @ f667a07e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout> <layout>
<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"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.xingdata.zzdpos.ui.main.MainActivity"> tools:context="com.xingdata.zzdpos.ui.main.MainActivity">
<android.support.design.widget.TabLayout <android.support.design.widget.TabLayout
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
app:tabSelectedTextColor="@color/red_guanyu" app:tabSelectedTextColor="@color/red_guanyu"
app:tabTextAppearance="@android:style/TextAppearance.Holo.Small" app:tabTextAppearance="@android:style/TextAppearance.Holo.Small"
app:tabTextColor="@color/black_likui"> app:tabTextColor="@color/black_likui">
</android.support.design.widget.TabLayout> </android.support.design.widget.TabLayout>
<android.support.v4.view.ViewPager <android.support.v4.view.ViewPager
android:id="@+id/fragment_container" android:id="@+id/fragment_container"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -41,15 +41,15 @@ ...@@ -41,15 +41,15 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="1.0"> app:layout_constraintVertical_bias="1.0">
</android.support.v4.view.ViewPager> </android.support.v4.view.ViewPager>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="@id/tab_layout" /> app:layout_constraintTop_toTopOf="@id/tab_layout" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/activity_store.xml
View file @ f667a07e
...@@ -263,42 +263,24 @@ ...@@ -263,42 +263,24 @@
android:textStyle="bold" android:textStyle="bold"
android:visibility="@{cartCount>0?View.VISIBLE:View.GONE}" /> android:visibility="@{cartCount>0?View.VISIBLE:View.GONE}" />
</FrameLayout> </FrameLayout>
<TextView
android:id="@+id/tv_select_all"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:background="?attr/selectableItemBackground"
android:drawablePadding="@dimen/all_spacing"
android:drawableStart="@mipmap/radio_select_bg"
android:gravity="center_vertical"
android:paddingEnd="@dimen/all_spacing"
android:paddingStart="@dimen/all_spacing"
android:text="@string/gift_select_all"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size"
android:visibility="@{titleMode==4?View.VISIBLE:View.GONE}"
app:layout_constraintBottom_toBottomOf="@id/fl_cart"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="@id/fl_cart" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:animateLayoutChanges="true" android:animateLayoutChanges="true"
android:visibility="@{titleMode==4?View.VISIBLE:View.GONE}" android:visibility="@{titleMode==4?View.VISIBLE:View.GONE}"
app:layout_constraintBottom_toTopOf="@id/fl_cart" app:layout_constraintBottom_toTopOf="@id/fl_cart"
app:layout_constraintLeft_toRightOf="@id/tv_select_all" app:layout_constraintTop_toBottomOf="@id/fl_cart"
app:layout_constraintTop_toBottomOf="@id/fl_cart"> tools:layout_editor_absoluteX="81dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/money_rmb" android:text="@string/money_rmb"
android:textColor="@color/red_guanyu" android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_text_size" /> android:textSize="@dimen/all_text_size" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -306,18 +288,18 @@ ...@@ -306,18 +288,18 @@
android:textColor="@color/red_guanyu" android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_sub_title_size" android:textSize="@dimen/all_sub_title_size"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_spacing"
android:layout_marginStart="@dimen/all_spacing" android:layout_marginStart="@dimen/all_spacing"
android:layout_marginEnd="@dimen/all_spacing"
android:text="@string/inputer_add" android:text="@string/inputer_add"
android:textColor="@color/red_guanyu" android:textColor="@color/red_guanyu"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
android:visibility="@{giftPayAmt>0?View.VISIBLE:View.GONE}" /> android:visibility="@{giftPayAmt>0?View.VISIBLE:View.GONE}" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ f667a07e
...@@ -423,96 +423,6 @@ ...@@ -423,96 +423,6 @@
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_result"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_result_hint">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingRight="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"
android:text="@{finallyPrice}"
android:textColor="@color/reddeep"
android:textSize="@dimen/big_big_text_size" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_num"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/ll_result"
app:layout_constraintEnd_toStartOf="@id/ll_result"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/ll_result">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/all_padding"
android:text="@{sumNum}"
android:textColor="@color/reddeep"
android:textSize="@dimen/big_big_text_size"
android:textStyle="bold" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_slight_line_width"
android:background="@color/gray_kongming"
app:layout_constraintTop_toBottomOf="@id/ll_no" />
<TextView
android:id="@+id/tv_result_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:paddingTop="@dimen/all_padding"
android:text="金额"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintEnd_toEndOf="@+id/ll_result"
app:layout_constraintStart_toStartOf="@id/ll_result"
app:layout_constraintTop_toBottomOf="@id/ll_no" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:paddingTop="@dimen/all_padding"
android:text="缺货种类"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintBottom_toBottomOf="@id/tv_result_hint"
app:layout_constraintEnd_toEndOf="@id/ll_num"
app:layout_constraintStart_toStartOf="@id/ll_num"
app:layout_constraintTop_toTopOf="@id/tv_result_hint" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_bounced_padding"
android:background="@drawable/singleline_zhouyu_huanggai"
app:layout_constraintTop_toBottomOf="@id/ll_result" />
</android.support.constraint.ConstraintLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_vip_info_edit.xml
View file @ f667a07e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
......
app/src/main/res/layout/view_search_bar.xml
View file @ f667a07e
...@@ -2,33 +2,32 @@ ...@@ -2,33 +2,32 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<data> <data>
<import type="android.view.View" /> <import type="android.view.View" />
<variable <variable
name="keywordLength" name="keywordLength"
type="int" /> type="int" />
</data> </data>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<EditText <EditText
android:id="@+id/et_search" android:id="@+id/et_search"
style="@style/searchBarEditor" style="@style/searchBarEditor"
android:layout_width="0dp" android:layout_width="0dp"
android:labelFor="@+id/et_search" android:labelFor="@+id/et_search"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_spacing" android:paddingStart="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/tv_search" app:layout_constraintRight_toLeftOf="@id/tv_search"
app:layout_constraintTop_toBottomOf="parent" /> app:layout_constraintTop_toBottomOf="parent" />
<ImageButton <ImageButton
android:id="@+id/btn_clear" android:id="@+id/btn_clear"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -36,21 +35,20 @@ ...@@ -36,21 +35,20 @@
android:background="?attr/actionBarItemBackground" android:background="?attr/actionBarItemBackground"
android:contentDescription="@string/search_clear" android:contentDescription="@string/search_clear"
android:padding="@dimen/all_spacing" android:padding="@dimen/all_spacing"
android:src="@mipmap/ic_clear" android:src="@mipmap/ic_clear"
android:visibility="@{keywordLength>0?View.VISIBLE:View.GONE}" android:visibility="@{keywordLength>0?View.VISIBLE:View.GONE}"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintRight_toRightOf="@id/et_search" app:layout_constraintRight_toRightOf="@id/et_search"
app:layout_constraintTop_toBottomOf="parent" /> app:layout_constraintTop_toBottomOf="parent" />
<TextView <TextView
android:id="@+id/tv_search" android:id="@+id/tv_search"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/actionBarItemBackground" android:background="?attr/actionBarItemBackground"
android:gravity="center" android:gravity="center"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin" android:paddingStart="@dimen/all_margin"
android:paddingEnd="@dimen/all_margin"
android:text="@string/search_action" android:text="@string/search_action"
android:textColor="@color/black_baozheng" android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_body_size" android:textSize="@dimen/all_body_size"
......
app/src/main/res/values-en/strings.xml 0 → 100644
View file @ f667a07e
This diff is collapsed.
app/src/main/res/values-zh/strings.xml 0 → 100644
View file @ f667a07e
This diff is collapsed.
app/src/main/res/values/strings.xml
View file @ f667a07e
This diff is collapsed.
build.gradle
View file @ f667a07e
buildscript { buildscript {
repositories { repositories {
google()
jcenter() jcenter()
mavenCentral() mavenCentral()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.2' classpath 'com.android.tools.build:gradle:3.4.2'
classpath "io.realm:realm-gradle-plugin:4.0.0" classpath "io.realm:realm-gradle-plugin:5.8.0"
classpath 'com.billy.android:cc-register:1.0.8'
} }
} }
allprojects { allprojects {
repositories { repositories {
google()
jcenter() jcenter()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
google() maven { url "http://maven.landicorp.com/repository/releases/" }
maven { url "http://maven.landicorp.com/repository/ept-and-sdk/" }
} }
} }
task clean(type: Delete) { task clean(type: Delete) {
delete rootProject.buildDir delete rootProject.buildDir
} }
\ No newline at end of file
gradle/wrapper/gradle-wrapper.properties
View file @ f667a07e
#Wed Apr 18 18:01:23 CST 2018 #Fri May 10 17:57:27 CST 2019
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
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