Commit 3065ed8a by Yu_Tung

version 1.0.7 20200812

parent 830961c1
...@@ -9,7 +9,7 @@ android { ...@@ -9,7 +9,7 @@ android {
targetSdkVersion 29 targetSdkVersion 29
versionCode 1 versionCode 1
versionName "1.0.6" versionName "1.0.8"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
......
...@@ -333,27 +333,69 @@ public class MainPresenter<V extends MainContract.View> implements MainContract. ...@@ -333,27 +333,69 @@ public class MainPresenter<V extends MainContract.View> implements MainContract.
@Override @Override
public String onJudgmentPath(String pathCompany, String pathFactoryArea, String pathFactoryClass, String pathClass, String pathShootType) { public String onJudgmentPath(String pathCompany, String pathFactoryArea, String pathFactoryClass, String pathClass, String pathShootType) {
String path = ""; String path = "";
if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "SOP導讀".equals(pathShootType)) { String SOP1 = "1_SOP導讀";
path = "/仁武氯乙烯廠製造一課/1_SOP導讀"; String SOP2 = "2_SOP審視修訂";
} else if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "SOP審視會議".equals(pathShootType)) { String SOP3 = "3_SOP落實度查核";
path = "/仁武氯乙烯廠製造一課/2_SOP審視修訂";
} else if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DA".equals(pathClass)) { if ("SOP導讀".equals(pathShootType)){
path = "/仁武氯乙烯廠製造一課/3_SOP落實度查核/DA"; path = "/" + pathFactoryClass + "/" + SOP1 + "/" + pathClass;
} else if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DB".equals(pathClass)) { }else if ("SOP審視會議".equals(pathShootType)){
path = "/仁武氯乙烯廠製造一課/3_SOP落實度查核/DB"; path = "/" + pathFactoryClass + "/" + SOP2 +"/";
} else if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DC".equals(pathClass)) { }else if ("落實度查核".equals(pathShootType)){
path = "/仁武氯乙烯廠製造一課/3_SOP落實度查核/DC"; path = "/" + pathFactoryClass + "/" + SOP3 + "/" + pathClass;
} else if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DD".equals(pathClass)) {
path = "/仁武氯乙烯廠製造一課/3_SOP落實度查核/DD";
} else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "SOP導讀".equals(pathShootType)) {
path = "/仁武氯乙烯廠製造二課/1_SOP導讀/"+pathClass;
} else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "SOP審視會議".equals(pathShootType)) {
path = "/仁武氯乙烯廠製造二課/2_SOP審視修訂";
}
else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType)) {
path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/"+pathClass;
} }
// if (pathFactoryArea.equals("仁武")){
// if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "SOP導讀".equals(pathShootType)) {
// 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) && "SOP導讀".equals(pathShootType)) {
// path = "/仁武氯乙烯廠製造二課/1_SOP導讀/"+pathClass;
// } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "SOP審視會議".equals(pathShootType)) {
// path = "/仁武氯乙烯廠製造二課/2_SOP審視修訂";
// }
// else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType)) {
// path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/"+pathClass;
// }
// }else if (pathFactoryArea.equals("麥寮")){
// if ("SOP導讀".equals(pathShootType)){
// path = pathFactoryClass+"/1_SOP導讀/"+pathClass;
// }else if ("SOP審視會議".equals(pathShootType)){
// path = pathFactoryClass + "/2_SOP審視修訂";
// }else if ("落實度查核".equals(pathShootType)){
// path = pathFactoryClass + "/3_SOP落實度查核/" + pathClass;
// }
// }
// if ("仁武氯乙烯廠製造一課".equals(pathFactoryClass) && "SOP導讀".equals(pathShootType)) {
// 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) && "SOP導讀".equals(pathShootType)) {
// path = "/仁武氯乙烯廠製造二課/1_SOP導讀/"+pathClass;
// } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "SOP審視會議".equals(pathShootType)) {
// path = "/仁武氯乙烯廠製造二課/2_SOP審視修訂";
// }
// else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType)) {
// path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/"+pathClass;
// }
// else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DA".equals(pathClass)) { // else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DA".equals(pathClass)) {
// path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DA"; // path = "/仁武氯乙烯廠製造二課/3_SOP落實度查核/DA";
// } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DB".equals(pathClass)) { // } else if ("仁武氯乙烯廠製造二課".equals(pathFactoryClass) && "落實度查核".equals(pathShootType) && "DB".equals(pathClass)) {
......
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