Skip to content

S
supplier
Commit 5fe03d9f by Wyh
Options

7.11 更改檢測版本更新

parent deabfead
Showing with 46 additions and 25 deletions
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/contract/NewMainContract.java
......@@ -33,7 +33,7 @@ public interface NewMainContract {
//Model层定义接口,外部只需关心Model返回的数据,无需关心内部细节,即是否使用缓存
interface Model extends IModel {
Observable<CheckVersionRequest> checkAppVersion(RequestBody requestBody);
Observable<CheckVersionRequest> checkAppVersion(String version);
Observable<Object> loginOut(RequestBody requestBody);
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/NewMainModel.java
......@@ -51,9 +51,9 @@ public class NewMainModel extends BaseModel implements NewMainContract.Model {
}
@Override
public Observable<CheckVersionRequest> checkAppVersion(RequestBody requestBody) {
public Observable<CheckVersionRequest> checkAppVersion(String version) {
return mRepositoryManager.obtainRetrofitService(MainService.class)
.checkAppVersion(requestBody);
.checkAppVersion(version);
}
@Override
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/service/MainService.java
......@@ -6,8 +6,10 @@ import io.reactivex.Observable;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import okhttp3.RequestBody;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.Headers;
import retrofit2.http.POST;
import retrofit2.http.Query;
/**
* Created by Wyh on 2020/2/22.
......@@ -18,8 +20,8 @@ public interface MainService {
Observable<Object> loginOut(@Body RequestBody requestBody);
@Headers({"Domain-Name: update_version"})
@POST("system/checkAppVersion" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<CheckVersionRequest> checkAppVersion(@Body RequestBody requestBody);
@GET("system/checkAppVersionGsa" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
Observable<CheckVersionRequest> checkAppVersion(@Query("version") String version);
@Headers({"Domain-Name: update_version"})
@POST("restaurant/clearHeartbeat" + RetrofitUrlManager.IDENTIFICATION_PATH_SIZE + 2)
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/NewMainPresenter.java
......@@ -73,11 +73,11 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
}
public void checkAppVersion() {
RequestBody requestBody = new FormBody.Builder()
.add("version", DeviceUtils.getVersionName(mApplication) + "|" + DeviceUtils.getVersionCode(mApplication))
.add("type", "2")
.build();
mModel.checkAppVersion(requestBody)
// RequestBody requestBody = new FormBody.Builder()
// .add("version", )
// .add("type", "2")
// .build();
mModel.checkAppVersion(DeviceUtils.getVersionName(mApplication) + "|" + DeviceUtils.getVersionCode(mApplication))
.subscribeOn(Schedulers.io())
.subscribeOn(AndroidSchedulers.mainThread())
.observeOn(AndroidSchedulers.mainThread())
......@@ -98,7 +98,7 @@ public class NewMainPresenter extends BasePresenter<NewMainContract.Model, NewMa
int operate = info.getOperate();
if (operate == 2 || operate == 3 || operate == 4 || operate == 5) {
String updatePath = info.getUpdatePath();
if (!TextUtils.isEmpty("updatePath") && !updatePath.equals("null")) {
if (!TextUtils.isEmpty(updatePath) && !updatePath.equals("null")) {
updateAPK(operate, updatePath);
} else {
if (operate == 3) {
......
main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
......@@ -195,7 +195,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_password, "修改密碼"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "設置"));
}
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "查看日誌"));
// mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "查看日誌"));
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_settlement_report, "清機"));
if (BuildConfig.DEBUG) {
mainSideMenuBeans.add(new MainSideMenuBean(R.drawable.ic_setting, "切換環境"));
......@@ -249,19 +249,19 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
// if (!BuildConfig.DEBUG) {
functions.add(new Function((long) 150, 0, 5, "點餐", 0, 0));
functions.add(new Function((long) 138, 150, 5, "餐檯模式", R.drawable.ic_dining_table_mode, 0));
// functions.add(new Function((long) 138, 150, 5, "餐檯模式", R.drawable.ic_dining_table_mode, 0));
functions.add(new Function((long) 139, 150, 5, "外送/自取", R.drawable.ic_delivery_mode, 0));
functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model_close, 0));
functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
// functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model_close, 0));
// functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
functions.add(new Function((long) 151, 0, 5, "管理", 0, 0));
// functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
// functions.add(new Function((long) 142, 151, 5, "外賣接單", R.drawable.ic_takeaway_orders, 0));
functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0));
// functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0));
functions.add(new Function((long) 144, 151, 5, "打印管理", R.drawable.ic_print_management, 0));
//// functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management_close, 1));
//// functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management_close, 1));
functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0));
// functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0));
functions.add(new Function((long) 152, 0, 5, "員工", 0, 0));
functions.add(new Function((long) 147, 152, 5, "員工管理", R.drawable.ic_staff_management_close, 1));
......
other_order_mode/src/main/res/layout/layout_more_popup.xml
......@@ -47,7 +47,9 @@
android:textColor="@color/theme_333_color"
android:textSize="@dimen/dp_14" />
<include layout="@layout/include_horizontal_color_ccc_dividing_line" />
<include
android:visibility="gone"
layout="@layout/include_horizontal_color_ccc_dividing_line" />
<com.qmuiteam.qmui.alpha.QMUIAlphaTextView
android:id="@+id/tv_check_log"
......@@ -57,6 +59,7 @@
android:paddingLeft="@dimen/dp_20"
android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_20"
android:visibility="gone"
android:paddingBottom="@dimen/dp_10"
android:text="查看日誌"
android:textColor="@color/theme_333_color"
......
print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java
......@@ -26,14 +26,16 @@ public class PrintTestActivity extends AppCompatActivity implements PrintSocketH
PrinterDeviceBean printerDeviceBean = new PrinterDeviceBean("192.168.1.218", 9100, "400");
List<PrintInfoBean> printInfoBeans = new ArrayList<>();
printInfoBeans.add(new PrintInfoBean(new String[]{"正式測試品牌"}, new double[]{1}, new String[]{"tw"}));
printInfoBeans.add(new PrintInfoBean(new String[]{"純屬餐廳"}, new double[]{1}, new String[]{"tw"}));
printInfoBeans.add(new PrintInfoBean(new String[]{"測試一行多少個字測試一行多少個字測試一"}, new double[]{2}, new String[]{"tw"}));
printInfoBeans.add(new PrintInfoBean(new String[]{"asdfskjflsjflsjlfjslfjsldjflsjfsd"}, new double[]{2}, new String[]{"tw"}));
printInfoBeans.add(new PrintInfoBean(new String[]{getLineBorder("自取", 2)}, new Boolean[]{true}, new double[]{2}, new String[]{"tw"}));
printInfoBeans.add(new PrintInfoBean(new String[]{"貨到付款"}, new Boolean[]{true}, new double[]{2}, new String[]{"tw"}));
printInfoBeans.add(new PrintInfoBean(new String[]{"07-08（週三）立即"}, new double[]{2}, new String[]{"tw"}));
printInfoBeans.add(new PrintInfoBean(new String[]{getLineBorder("", 1)}, new String[]{"tw"}));
// printInfoBeans.add(new PrintInfoBean(new String[]{"純屬餐廳"}, new double[]{1}, new String[]{"tw"}));
//
// printInfoBeans.add(new PrintInfoBean(new String[]{getLineBorder("自取", 2)}, new Boolean[]{true}, new double[]{2}, new String[]{"tw"}));
//
// printInfoBeans.add(new PrintInfoBean(new String[]{"貨到付款"}, new Boolean[]{true}, new double[]{2}, new String[]{"tw"}));
// printInfoBeans.add(new PrintInfoBean(new String[]{"07-08（週三）立即"}, new double[]{2}, new String[]{"tw"}));
// printInfoBeans.add(new PrintInfoBean(new String[]{getLineBorder("", 1)}, new String[]{"tw"}));
findViewById(R.id.btn_test).setOnClickListener(view -> {
//打印測試
......@@ -87,4 +89,18 @@ public class PrintTestActivity extends AppCompatActivity implements PrintSocketH
}
return builder.toString();
}
public static int getChineseValueLength(String value) {
int valueLength = 0;
String chinese = "[\u4e00-\u9fa5]";
for (int i = 0; i < value.length(); i++) {
String temp = value.substring(i, i + 1);
if (temp.matches(chinese)) {
valueLength += 1.5;
} else {
valueLength += 1;
}
}
return valueLength;
}
}
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