From b88710f6753b39742efe0b9b3afef3fcf66c09ac Mon Sep 17 00:00:00 2001
From: Yu_Tung <liu0981654361@gmail.com>
Date: Wed, 15 Jul 2020 15:50:29 +0800
Subject: [PATCH] version_1.0.5 調整班別api的傳入參數
---
app/build.gradle | 2 +-
app/src/main/java/com/example/audiovisualrecord/ui/main/MainActivity.java | 8 +++++---
app/src/main/java/com/example/audiovisualrecord/ui/main/MainContract.java | 2 +-
app/src/main/java/com/example/audiovisualrecord/ui/main/MainPresenter.java | 25 +++++++++++++++----------
app/src/main/java/com/example/audiovisualrecord/utils/api/searchshift/SHIFTRequest.java | 15 ++++++++++++++-
5 files changed, 36 insertions(+), 16 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 5b494f3..d86533f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,7 +9,7 @@ android {
targetSdkVersion 29
versionCode 1
- versionName "1.0.4"
+ versionName "1.0.5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/src/main/java/com/example/audiovisualrecord/ui/main/MainActivity.java b/app/src/main/java/com/example/audiovisualrecord/ui/main/MainActivity.java
index 1ab21dd..d39ba25 100644
--- a/app/src/main/java/com/example/audiovisualrecord/ui/main/MainActivity.java
+++ b/app/src/main/java/com/example/audiovisualrecord/ui/main/MainActivity.java
@@ -497,7 +497,7 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
if (mChooseDeviceItemData.getProductionPlantId().equals("")) {
showDialogCaveatMessage(getResourceString(R.string.add_device_no_production_plant_error));
}
- mPresenter.onGetSHIFTData(mChooseDeviceItemData.getCompanyId(), mChooseDeviceItemData.getProductionPlantId());
+ mPresenter.onGetSHIFTData(mChooseDeviceItemData.getCompanyId(), mChooseDeviceItemData.getProductionPlantId(),mChooseDeviceItemData.getFactoryClassCode());
break;
case R.id.tv_shoottype:
@@ -574,6 +574,8 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
@Override
public void onUploadFile(final ArrayList<String> uriList, String type, final String sid) {
uploadPath = mPresenter.onJudgmentPath(pathCompany, pathFactoryArea, pathFactoryClass, pathClass, pathShootType);
+ Log.e("path",uploadPath);
+
dismissProgressDialog();
showProgressDialog(type);
@@ -742,8 +744,8 @@ public class MainActivity extends BaseActivity implements MainContract.View, Vie
changeFileName = editChangeName.getText().toString();
// Log.e("euu",changeFileName);
if (changeFileName.length() <= 0){
- Toast.makeText(MainActivity.this,"請輸入要更改的檔名",Toast.LENGTH_SHORT).show();
- changeFileNameCheckDialog(path,name);
+ Toast.makeText(MainActivity.this,"請輸入要更改的檔名",Toast.LENGTH_SHORT).show();
+ changeFileNameCheckDialog(path,name);
}else if(changeFileName.length()>0){
updateChangeFileName(changeFileName,path,name);
}
diff --git a/app/src/main/java/com/example/audiovisualrecord/ui/main/MainContract.java b/app/src/main/java/com/example/audiovisualrecord/ui/main/MainContract.java
index 1229292..423dc60 100644
--- a/app/src/main/java/com/example/audiovisualrecord/ui/main/MainContract.java
+++ b/app/src/main/java/com/example/audiovisualrecord/ui/main/MainContract.java
@@ -30,7 +30,7 @@ public interface MainContract {
void onGetComData();
void onGetPZData();
void onGetDPData(String CO, String PZ);
- void onGetSHIFTData(String CO, String PMFCT);
+ void onGetSHIFTData(String CO, String PMFCT,String DP);
void segVideo(String path,String name);
void onGetTYPEData(String CO,String PMFCT);
void onGetSid(ArrayList<String> uriList, String type);
diff --git a/app/src/main/java/com/example/audiovisualrecord/ui/main/MainPresenter.java b/app/src/main/java/com/example/audiovisualrecord/ui/main/MainPresenter.java
index 6e78ded..8146279 100644
--- a/app/src/main/java/com/example/audiovisualrecord/ui/main/MainPresenter.java
+++ b/app/src/main/java/com/example/audiovisualrecord/ui/main/MainPresenter.java
@@ -148,8 +148,8 @@ public class MainPresenter<V extends MainContract.View> implements MainContract.
}
@Override
- public void onGetSHIFTData(String CO, String PMFCT) {
- SHIFTRequest mSHIFTRequest = new SHIFTRequest(KEY_SEARCH_SHIFT, USER_ID, CO, PMFCT);
+ public void onGetSHIFTData(String CO, String PMFCT,String DP) {
+ SHIFTRequest mSHIFTRequest = new SHIFTRequest(KEY_SEARCH_SHIFT, USER_ID, CO, PMFCT,DP);
String url = view.getResourceString(R.string.api_on_getSHIFT);
compositeDisposable.add(api.getSHIFT(url, mSHIFTRequest)
.subscribeOn(schedulerProviderImp.io())
@@ -349,15 +349,20 @@ public class MainPresenter<V extends MainContract.View> implements MainContract.
path = "/仁武氯乙烯廠製造二課/1_SOP導讀";
} else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "SOP審視會議".equals(pathShootType)) {
path = "/仁武氯乙烯廠製造二課/2_SOP審視修訂";
- } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DA".equals(pathClass)) {
- path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DA";
- } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DB".equals(pathClass)) {
- path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DB";
- } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DC".equals(pathClass)) {
- path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DC";
- } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DD".equals(pathClass)) {
- path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DD";
}
+ else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType)) {
+ path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/"+pathClass;
+ }
+
+// else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DA".equals(pathClass)) {
+// path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DA";
+// } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DB".equals(pathClass)) {
+// path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DB";
+// } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DC".equals(pathClass)) {
+// path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DC";
+// } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DD".equals(pathClass)) {
+// path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DD";
+// }
return path;
}
diff --git a/app/src/main/java/com/example/audiovisualrecord/utils/api/searchshift/SHIFTRequest.java b/app/src/main/java/com/example/audiovisualrecord/utils/api/searchshift/SHIFTRequest.java
index 4dd114e..dae7600 100644
--- a/app/src/main/java/com/example/audiovisualrecord/utils/api/searchshift/SHIFTRequest.java
+++ b/app/src/main/java/com/example/audiovisualrecord/utils/api/searchshift/SHIFTRequest.java
@@ -16,11 +16,16 @@ public class SHIFTRequest {
@SerializedName("PMFCT")
@Expose
private String mPMFCT;
- public SHIFTRequest(String authorizedId, String idNo, String mCO, String mPMFCT) {
+ @SerializedName("DP")
+ @Expose
+ private String mDP;
+
+ public SHIFTRequest(String authorizedId, String idNo, String mCO, String mPMFCT,String mDP) {
this.authorizedId=authorizedId;
this.idNo=idNo;
this.mCO=mCO;
this.mPMFCT=mPMFCT;
+ this.mDP = mDP;
}
public String getAuthorizedId() {
@@ -54,4 +59,12 @@ public class SHIFTRequest {
public void setmPMFCT(String mPMFCT) {
this.mPMFCT = mPMFCT;
}
+
+ public String getmDP() {
+ return mDP;
+ }
+
+ public void setmDP(String mDP) {
+ this.mDP = mDP;
+ }
}
--
libgit2 0.26.0