Skip to content

S
supplier
Commit 02ccf7de by Wyh
Options

1、合併代碼 

Signed-off-by: Wyh <1239658231>
parent ecc42b4a
Showing with 19 additions and 128 deletions
base-module/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
...@@ -7,7 +7,9 @@ import android.content.pm.PackageManager; ...@@ -7,7 +7,9 @@ import android.content.pm.PackageManager;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Build; import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.billy.cc.core.component.CC; import com.billy.cc.core.component.CC;
import com.dianping.logan.Logan; import com.dianping.logan.Logan;
import com.dianping.logan.OnLoganProtocolStatus; import com.dianping.logan.OnLoganProtocolStatus;
...@@ -22,6 +24,7 @@ import com.elvishew.xlog.printer.Printer; ...@@ -22,6 +24,7 @@ import com.elvishew.xlog.printer.Printer;
import com.elvishew.xlog.printer.file.FilePrinter; import com.elvishew.xlog.printer.file.FilePrinter;
import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy; import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy;
import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator; import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator;
import com.gingersoft.gsa.cloud.account.user.UserConstans;
import com.gingersoft.gsa.cloud.base.BuildConfig; import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.R; import com.gingersoft.gsa.cloud.base.R;
import com.gingersoft.gsa.cloud.base.utils.AidlUtil; import com.gingersoft.gsa.cloud.base.utils.AidlUtil;
...@@ -31,11 +34,13 @@ import com.gingersoft.gsa.cloud.base.utils.log.LogUtil; ...@@ -31,11 +34,13 @@ import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
import com.gingersoft.gsa.cloud.base.utils.other.SPUtils; import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.base.utils.xlog.MyBackupStrategy; import com.gingersoft.gsa.cloud.base.utils.xlog.MyBackupStrategy;
import com.gingersoft.gsa.cloud.config.DoraemonKitConfig; import com.gingersoft.gsa.cloud.config.DoraemonKitConfig;
import com.gingersoft.gsa.cloud.config.LoganConfig;
import com.gingersoft.gsa.cloud.config.expandconfig.ExpandInfoSetting;
import com.gingersoft.gsa.cloud.config.expandconfig.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandconfig.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.constans.PrintConstans; import com.gingersoft.gsa.cloud.constans.PrintConstans;
import com.gingersoft.gsa.cloud.account.user.UserConstans;
import com.gingersoft.gsa.cloud.database.DaoManager; import com.gingersoft.gsa.cloud.database.DaoManager;
import com.gingersoft.gsa.cloud.config.LoganConfig;
import com.gingersoft.gsa.cloud.logan.LoganManager; import com.gingersoft.gsa.cloud.logan.LoganManager;
import com.gingersoft.gsa.cloud.ui.loadsir.CustomCallback; import com.gingersoft.gsa.cloud.ui.loadsir.CustomCallback;
import com.gingersoft.gsa.cloud.ui.loadsir.EmptyCallback; import com.gingersoft.gsa.cloud.ui.loadsir.EmptyCallback;
...@@ -52,15 +57,11 @@ import com.scwang.smartrefresh.layout.header.ClassicsHeader; ...@@ -52,15 +57,11 @@ import com.scwang.smartrefresh.layout.header.ClassicsHeader;
import java.io.File; import java.io.File;
import java.util.Locale; import java.util.Locale;
import java.util.logging.LogManager;
import me.jessyan.autosize.AutoSize; import me.jessyan.autosize.AutoSize;
import me.jessyan.autosize.AutoSizeConfig; import me.jessyan.autosize.AutoSizeConfig;
import me.jessyan.autosize.onAdaptListener; import me.jessyan.autosize.onAdaptListener;
import me.jessyan.retrofiturlmanager.RetrofitUrlManager; import me.jessyan.retrofiturlmanager.RetrofitUrlManager;
import com.gingersoft.gsa.cloud.config.expandconfig.UIStyleExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandconfig.FunctionExtendedConfiguration;
import com.gingersoft.gsa.cloud.config.expandconfig.ExpandInfoSetting;
/** /**
* Created by Wyh on 2019/12/21. * Created by Wyh on 2019/12/21.
...@@ -209,7 +210,6 @@ public class GsaCloudApplication extends BaseApplication { ...@@ -209,7 +210,6 @@ public class GsaCloudApplication extends BaseApplication {
.addCallback(new LoadingCallback()) .addCallback(new LoadingCallback())
.addCallback(new TimeoutCallback()) .addCallback(new TimeoutCallback())
.addCallback(new CustomCallback()) .addCallback(new CustomCallback())
.setDefaultCallback(LoadingCallback.class)//设置默认状态页
.commit(); .commit();
} }
......
base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
package com.gingersoft.gsa.cloud.base.utils.okhttpUtils; package com.gingersoft.gsa.cloud.base.utils.okhttpUtils;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.config.OkHttpConfig; import com.gingersoft.gsa.cloud.config.OkHttpConfig;
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.HeadersInterceptor; import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.HeadersInterceptor;
import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.LoggingInterceptor; import com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept.LoggingInterceptor;
import com.gingersoft.gsa.cloud.constans.AppConstans;
import com.gingersoft.gsa.cloud.constans.HttpsConstans; import com.gingersoft.gsa.cloud.constans.HttpsConstans;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import okhttp3.Call; import okhttp3.Call;
import okhttp3.Callback; import okhttp3.Callback;
import okhttp3.FormBody; import okhttp3.FormBody;
import okhttp3.Headers;
import okhttp3.Interceptor;
import okhttp3.MediaType; import okhttp3.MediaType;
import okhttp3.MultipartBody; import okhttp3.MultipartBody;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
...@@ -216,41 +214,6 @@ public class OkHttp3Utils { ...@@ -216,41 +214,6 @@ public class OkHttp3Utils {
} }
/** /**
* 添加请求头
*/
// public static class UserAgentIntercepter implements Interceptor {
//
// @Override
// public Response intercept(Chain chain) throws IOException {
// Request request = chain.request();
// Headers headers = request.headers();
//
// Headers.Builder builder = new Headers.Builder();
// for (int i = 0; i < headers.size(); i++) {
// builder.set(headers.name(i), headers.value(i));
// }
//
// builder.set("mobileVersion", android.os.Build.VERSION.RELEASE);//set表示name1是唯一的，会覆盖掉已经存在的，add不会覆盖已经存在的头，可以存在多个
// builder.set("mobielModel", android.os.Build.MODEL);
// builder.set("apptype", AppConstans.APP_TYPE);
// builder.set("appinfo", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()));
// builder.set("mobileId", "1");
//
// if (GsaCloudApplication.isLogin) {
// String token;
// int memberId = GsaCloudApplication.getMemberId();
// String loginToken = GsaCloudApplication.getLoginToken();
// token = Aes.aesEncrypt("9_" + memberId + "_" + System.currentTimeMillis() + "_" + loginToken);
// token = token.replaceAll("\r|\n", "");
// builder.set("token", token);
// }
// Request request1 = chain.request().newBuilder().headers(builder.build()).build();
// return chain.proceed(request1);
// }
// }request1
/**
* 心跳接口報錯，推送給相關人員 * 心跳接口報錯，推送給相關人員
* 版本,時間,RP_HD001,Gingersoft,GS1,26ErrorMsg:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx * 版本,時間,RP_HD001,Gingersoft,GS1,26ErrorMsg:xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
*/ */
......
base-module/src/main/java/com/gingersoft/gsa/cloud/config/globalconfig/applyOptions/intercept/HeadersInterceptor.java
package com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept; package com.gingersoft.gsa.cloud.config.globalconfig.applyOptions.intercept;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.BuildConfig;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes; import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.constans.AppConstans; import com.gingersoft.gsa.cloud.constans.AppConstans;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
...@@ -27,14 +28,17 @@ public class HeadersInterceptor implements Interceptor { ...@@ -27,14 +28,17 @@ public class HeadersInterceptor implements Interceptor {
builder.set("apptype", AppConstans.APP_TYPE); builder.set("apptype", AppConstans.APP_TYPE);
builder.set("appinfo", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext())); builder.set("appinfo", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()));
builder.set("mobileId", "1"); builder.set("mobileId", "1");
builder.set("uid", GsaCloudApplication.getMemberId() + "");
Headers headers = originalRequest.headers(); Headers headers = originalRequest.headers();
for (int i = 0; i < headers.size(); i++) { for (int i = 0; i < headers.size(); i++) {
builder.set(headers.name(i), headers.value(i)); builder.set(headers.name(i), headers.value(i));
} }
if (GsaCloudApplication.isLogin) { if (GsaCloudApplication.isLogin) {
builder.set("token", getToken()); builder.set("token", getToken());
} else if (BuildConfig.DEBUG) {
builder.set("uuid", "999");
builder.set("uid", "397");
} }
Request requestWithUserAgent = originalRequest.newBuilder() Request requestWithUserAgent = originalRequest.newBuilder()
.headers(builder.build()) .headers(builder.build())
.build(); .build();
......
base-module/src/main/java/com/gingersoft/gsa/cloud/logan/LoganManager.java
...@@ -6,7 +6,6 @@ import android.os.Looper; ...@@ -6,7 +6,6 @@ import android.os.Looper;
import android.util.Log; import android.util.Log;
import com.dianping.logan.Logan; import com.dianping.logan.Logan;
import com.dianping.logan.OnLoganProtocolStatus;
import com.dianping.logan.SendLogCallback; import com.dianping.logan.SendLogCallback;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication; import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.base.BuildConfig; import com.gingersoft.gsa.cloud.base.BuildConfig;
...@@ -15,7 +14,6 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils; ...@@ -15,7 +14,6 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
import com.gingersoft.gsa.cloud.config.LoganConfig; import com.gingersoft.gsa.cloud.config.LoganConfig;
import com.jess.arms.utils.ArmsUtils; import com.jess.arms.utils.ArmsUtils;
import com.jess.arms.utils.DeviceUtils; import com.jess.arms.utils.DeviceUtils;
import com.qmuiteam.qmui.util.QMUIDeviceHelper;
/** /**
* @author : bin * @author : bin
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/model/bean/UpdateOrderBean.kt
...@@ -5,7 +5,7 @@ class UpdateOrderBean { ...@@ -5,7 +5,7 @@ class UpdateOrderBean {
/** /**
* success : true * success : true
* sysTime : 1587095130753 * sysTime : 1587095130753
* data : {"msgs":"確認成功！","code":"1","selfUrl":"https://hktest.ricepon.com:64377/member-web/api/h5/orderNotify?type=6&restaurantId=4413643","jsonObject":{"code":200,"data":{"code":200,"msg":"success","data":{"username":{},"password":{},"token":{},"type":6,"data":"修改訂單狀態消息,參數：restaurantId=4413643"}}}} * data : {"msgs":"確認成功！","code":"1","selfUrl":"https://hktest.ricepon.com:64377/member-web/api/h5/orderNotify?type=6&restaurantId=4413643","jsonObject":{"code":200,"data":{"code":200,"msg":"success","data":{"username":{},"password":{},"":{},"type":6,"data":"修改訂單狀態消息,參數：restaurantId=4413643"}}}}
*/ */
var success: Boolean = false var success: Boolean = false
......
delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/data/network/ServiceCreator.kt
...@@ -100,35 +100,4 @@ object ServiceCreator { ...@@ -100,35 +100,4 @@ object ServiceCreator {
fun <T> createRootGSA(service: Class<T>): T = builderRootGSA.build().create(service) fun <T> createRootGSA(service: Class<T>): T = builderRootGSA.build().create(service)
/**
* 添加请求头
*/
// class UserAgentIntercepter : Interceptor {
// override fun intercept(chain: Interceptor.Chain): Response {
// val request = chain.request()
// val headers = request.headers()
//
// val builder = Headers.Builder()
// for (i in 0 until headers.size()) {
// builder.set(headers.name(i), headers.value(i))
// }
//
// builder.set("mobileVersion", android.os.Build.VERSION.RELEASE)//set表示name1是唯一的，会覆盖掉已经存在的，add不会覆盖已经存在的头，可以存在多个
// builder.set("mobielModel", android.os.Build.MODEL)
// builder.set("apptype", AppConstans.APP_TYPE)
// builder.set("appinfo", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()))
// builder.set("mobileId", "1")
//
// if (GsaCloudApplication.isLogin) {
// var token: String
// val memberId = GsaCloudApplication.getMemberId()
// val loginToken = GsaCloudApplication.getLoginToken()
// token = Aes.aesEncrypt("9_" + memberId + "_" + System.currentTimeMillis() + "_" + loginToken)
// token = token.replace("\r|\n".toRegex(), "")
// builder.set("token", token)
// }
// val request1 = chain.request().newBuilder().headers(builder.build()).build()
// return chain.proceed(request1)
// }
// }
} }
\ No newline at end of file
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/bean/TestLoginBean.java
...@@ -9,7 +9,7 @@ public class TestLoginBean { ...@@ -9,7 +9,7 @@ public class TestLoginBean {
/** /**
* success : true * success : true
* sysTime : 1.7506064484631255E7 * sysTime : 1.7506064484631255E7
* data : {"user":{"id":-2.59329254789086E7,"groupId":4.9519301404318124E7,"parentId":7.234733767439088E7,"merchantsId":-7.917127479317397E7,"userName":"Lorem ut in qui","mobile":"et non tempor ut","email":"est velit occaecat Excepteur ad","status":-2.4309450245410383E7,"createTime":"ea proident Excepteur","createBy":"Excepteur proident dolor anim","updateTime":"mag","updateBy":"nisi sed ut esse ex"},"token":"in"} * data : {"user":{"id":-2.59329254789086E7,"groupId":4.9519301404318124E7,"parentId":7.234733767439088E7,"merchantsId":-7.917127479317397E7,"userName":"Lorem ut in qui","mobile":"et non tempor ut","email":"est velit occaecat Excepteur ad","status":-2.4309450245410383E7,"createTime":"ea proident Excepteur","createBy":"Excepteur proident dolor anim","updateTime":"mag","updateBy":"nisi sed ut esse ex"},"":"in"}
*/ */
private boolean success; private boolean success;
......
login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/LoginOutActivity.java
package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity; package com.gingersoft.gsa.cloud.login.mvp.ui.activity.mvp.ui.activity;
import android.app.Activity; import android.app.Activity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.widget.TextView; import android.widget.TextView;
import androidx.annotation.Nullable;
import com.gingersoft.gsa.cloud.base.utils.JsonUtils; import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
import com.gingersoft.gsa.cloud.login.R; import com.gingersoft.gsa.cloud.login.R;
import com.gingersoft.gsa.cloud.login.mvp.bean.TestLoginBean; import com.gingersoft.gsa.cloud.login.mvp.bean.TestLoginBean;
import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
import com.google.gson.Gson;
import java.io.IOException;
import androidx.annotation.Nullable;
import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.FormBody;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
/** /**
* Created by Wyh on 2019/12/25. * Created by Wyh on 2019/12/25.
...@@ -40,37 +27,7 @@ public class LoginOutActivity extends Activity { ...@@ -40,37 +27,7 @@ public class LoginOutActivity extends Activity {
tv_json.setText(json); tv_json.setText(json);
findViewById(R.id.tv_gsa_user_loginout).setOnClickListener(v -> { findViewById(R.id.tv_gsa_user_loginout).setOnClickListener(v -> {
OkHttpClient okHttpClient = new OkHttpClient();
RequestBody requestBody = new FormBody.Builder()
.build();
// 加密token apptype_id_time_token
// app類型_用戶id_時間戳_登陸token
String head = Aes.aesEncrypt("9_" + loginBean.getData().getUser().getId() + "_" + System.currentTimeMillis() + "_" + loginBean.getData().getToken()).replaceAll("\r|\n", "");
Request request = new Request.Builder()
.addHeader("mobileId", "1")
.addHeader("mobielModel", "")
.addHeader("mobileVersion", "")
.addHeader("token", head)
.url("http://gingersoft.tpddns.cn:58201/ricepon-cloud-gsa/api/gsa/logout")
.post(requestBody)
.build();
okHttpClient.newCall(request).enqueue(new Callback() {
@Override
public void onFailure(Call call, IOException e) {
}
@Override
public void onResponse(Call call, Response response) throws IOException {
String json = response.body().string();
ToastUtils.show(LoginOutActivity.this, "登出");
Intent intent = new Intent(LoginOutActivity.this, LoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
}
});
}); });
} }
} }
table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/BillItemAdapter.java
...@@ -9,6 +9,7 @@ import android.widget.TextView; ...@@ -9,6 +9,7 @@ import android.widget.TextView;
import com.gingersoft.gsa.cloud.base.order.billItem.BillOrderMoney; import com.gingersoft.gsa.cloud.base.order.billItem.BillOrderMoney;
import com.gingersoft.gsa.cloud.base.order.billItem.BillItem; import com.gingersoft.gsa.cloud.base.order.billItem.BillItem;
import com.gingersoft.gsa.cloud.base.order.billItem.ServiceChargeItem;
import com.gingersoft.gsa.cloud.table.R; import com.gingersoft.gsa.cloud.table.R;
import com.gingersoft.gsa.cloud.table.R2; import com.gingersoft.gsa.cloud.table.R2;
import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity; import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
......
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