Commit a3de4986 by han xu

update 14

parent e73ef2ea
...@@ -31,6 +31,5 @@ ...@@ -31,6 +31,5 @@
<option name="resolveExternalAnnotations" value="false" /> <option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
<option name="offlineMode" value="true" />
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -68,8 +68,8 @@ android { ...@@ -68,8 +68,8 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
dataBinding { buildFeatures {
enabled = true dataBinding = true
} }
lintOptions { lintOptions {
......
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.compile_sdk_version = 30 ext.compile_sdk_version = 31
ext.build_tools_version = "29.0.2" ext.build_tools_version = "29.0.2"
ext.min_sdk_version = 21 ext.min_sdk_version = 21
ext.target_sdk_version = 30 ext.target_sdk_version = 31
ext.version_code = 323 ext.version_code = 325
ext.verson_name = "3.2.3" ext.verson_name = "3.2.5"
ext.gradle_version = '4.0.1' ext.gradle_version = '4.1.1'
ext.isReleaseMinify = false ext.isReleaseMinify = false
ext.isDebugMinify = false ext.isDebugMinify = false
ext.arouter_api_version = '1.3.1' ext.arouter_api_version = '1.3.1'
......
#Tue Jan 16 09:59:38 CST 2018 #Tue Aug 20 01:14:01 CST 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
...@@ -26,7 +26,7 @@ public interface CreateOrderContract { ...@@ -26,7 +26,7 @@ public interface CreateOrderContract {
boolean checkParam(); boolean checkParam();
HashMap<String, Object> getParams(); HashMap<String, Object> getActParams();
ArrayList<String> getImgs(); ArrayList<String> getImgs();
......
...@@ -430,7 +430,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter { ...@@ -430,7 +430,7 @@ public class CreateOrderPresenter extends CreateOrderContract.Presenter {
} }
private RequestBody getBody() { private RequestBody getBody() {
HashMap<String, Object> params = mView.getParams(); HashMap<String, Object> params = mView.getActParams();
if (params == null) { if (params == null) {
return null; return null;
} }
......
...@@ -273,7 +273,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti ...@@ -273,7 +273,7 @@ public class CreateOrderActivity extends BaseActivity<CreateOrderPresenter, Acti
} }
@Override @Override
public HashMap<String, Object> getParams() { public HashMap<String, Object> getActParams() {
try { try {
String d = UtilsDate.changeFormat(mBind.dayTime.getText().toString().trim(), LONG_DATE, LONG_DATE_FORMAT); String d = UtilsDate.changeFormat(mBind.dayTime.getText().toString().trim(), LONG_DATE, LONG_DATE_FORMAT);
mTime = d + " " + mBind.hourTime.getText().toString().trim() + ":00"; mTime = d + " " + mBind.hourTime.getText().toString().trim() + ":00";
......
...@@ -16,7 +16,7 @@ import java.util.HashMap; ...@@ -16,7 +16,7 @@ import java.util.HashMap;
public interface MultipleProcessContract { public interface MultipleProcessContract {
interface View extends BaseView { interface View extends BaseView {
HashMap<String, Object> getParams(); HashMap<String, Object> getActParams();
void paySuccess(OrderDetail detail); void paySuccess(OrderDetail detail);
......
...@@ -173,7 +173,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter ...@@ -173,7 +173,7 @@ public class MultipleProcessPresenter extends MultipleProcessContract.Presenter
@Override @Override
public void processOrder() { public void processOrder() {
mView.showDialog(); mView.showDialog();
HashMap<String, Object> params = mView.getParams(); HashMap<String, Object> params = mView.getActParams();
params.put("engineerId", mAccountId); params.put("engineerId", mAccountId);
params.put("id", mSpus.get(0).getOrderId()); params.put("id", mSpus.get(0).getOrderId());
if (mImages.size() > 0) { if (mImages.size() > 0) {
......
...@@ -363,7 +363,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent ...@@ -363,7 +363,7 @@ public class MultipleProcessActivity extends BaseActivity<MultipleProcessPresent
} }
@Override @Override
public HashMap<String, Object> getParams() { public HashMap<String, Object> getActParams() {
String doorPrice = mMaterialsPrice.getText().toString().trim(); String doorPrice = mMaterialsPrice.getText().toString().trim();
String servicePrice = mServerPrice.getText().toString().trim(); String servicePrice = mServerPrice.getText().toString().trim();
if (TextUtils.isEmpty(doorPrice)) if (TextUtils.isEmpty(doorPrice))
......
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 sign in to comment