提交 12b23bde authored 作者: flexiblexd@163.com's avatar flexiblexd@163.com

1.修改bug

上级 731cbfc7
...@@ -6,17 +6,19 @@ android { ...@@ -6,17 +6,19 @@ android {
applicationId "com.wd.workoffice" applicationId "com.wd.workoffice"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 5 versionCode 8
versionName "1.0.5" versionName "1.0.8"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders = [ manifestPlaceholders = [
JPUSH_PKGNAME: applicationId, JPUSH_PKGNAME: applicationId,
JPUSH_APPKEY : "376831354e7055c58a957394", //JPush上注册的包名对应的appkey.1e9761959c929c9c0302f414 JPUSH_APPKEY : "376831354e7055c58a957394", //JPush上注册的包名对应的appkey.1e9761959c929c9c0302f414
JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可.
] ]
} }
lintOptions {
checkReleaseBuilds false
abortOnError false
}
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
......
...@@ -22,7 +22,7 @@ import retrofit2.http.Query; ...@@ -22,7 +22,7 @@ import retrofit2.http.Query;
**/ **/
public interface MesApiService { public interface MesApiService {
String DOMAIN = Config.DEBUG ? "http://192.168.3.32/" : "http://114.116.55.221/"; String DOMAIN = Config.DEBUG ? "http://192.168.3.32/" : "http://124.129.27.194:81/";
/** /**
......
...@@ -10,7 +10,6 @@ import android.widget.TextView; ...@@ -10,7 +10,6 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.gson.JsonObject;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
......
...@@ -115,6 +115,8 @@ public class MesReportActivity extends WorkBaseActivity { ...@@ -115,6 +115,8 @@ public class MesReportActivity extends WorkBaseActivity {
topAdapter.bindToRecyclerView(rvTop); topAdapter.bindToRecyclerView(rvTop);
proBadAdapter.bindToRecyclerView(rvProBad); proBadAdapter.bindToRecyclerView(rvProBad);
param = WorkUtils.simpleParam(); param = WorkUtils.simpleParam();
param.put("beginDate", TimeUtils.getNowString());
param.put("endDate", TimeUtils.getNowString());
badParam = WorkUtils.simpleParam(); badParam = WorkUtils.simpleParam();
badParam.put("beginDate", TimeUtils.getNowString()); badParam.put("beginDate", TimeUtils.getNowString());
badParam.put("endDate", TimeUtils.getNowString()); badParam.put("endDate", TimeUtils.getNowString());
......
...@@ -75,9 +75,10 @@ public class WorkUtils { ...@@ -75,9 +75,10 @@ public class WorkUtils {
String domain = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/%s/" : "http://zwang.bat100.net.cn:8000/%s/"; String domain = Config.DEBUG ? "http://zwang.bat100.net.cn:8000/%s/" : "http://zwang.bat100.net.cn:8000/%s/";
String loginType = TextUtils.isEmpty(DataKeeper.getInstance().getBatLoginType()) ? BatLoginType.GK.getCode() : DataKeeper.getInstance().getBatLoginType(); String loginType = TextUtils.isEmpty(DataKeeper.getInstance().getBatLoginType()) ? BatLoginType.GK.getCode() : DataKeeper.getInstance().getBatLoginType();
return "http://pre-release.bat100.net.cn:9001/"; // return "http://pre-release.bat100.net.cn:9001/";
// return "http://192.168.43.20:9003/"; // return "http://192.168.43.20:9003/";
// return "http://192.168.1.155:9003/";
return "http://zwang.bat100.net.cn/api/";
// return String.format(domain, loginType); // return String.format(domain, loginType);
} }
......
...@@ -67,5 +67,5 @@ ...@@ -67,5 +67,5 @@
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data" android:id="@+id/rv_data"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论