Vcare v1.8.0 Enhancement & CR production R2(terminal feature)

app/build/intermediates/manifests/full/debug/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="id.co.visionet.crm_multibank"
     android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionName="1.8.0" >
 
     <uses-sdk
         android:minSdkVersion="19"

app/src/main/java/id/co/visionet/crm_multibank/activity/DetailIncident.java

@@ -587,7 +587,6 @@ public class DetailIncident extends AppCompatActivity implements TerminalFeature
         wk = j;
         Detailreason = "";
 
-
         workOrder = mRealm.where(WorkOrder.class).equalTo("TaskId", j).findFirst();
         int a = workOrder.getWorkActivityCode();
         final String merchantid = workOrder.getMerchantId();
@@ -599,15 +598,12 @@ public class DetailIncident extends AppCompatActivity implements TerminalFeature
             final List<String> DetailValue = new ArrayList<String>();
             final List<Integer> DetailId = new ArrayList<Integer>();
             final StringBuilder stringdynamicoptions = new StringBuilder();
+
             for(int i=0;i<dynamicFormModel.size();i++) {
                 ReasonCode.add(dynamicFormModel.get(i).getValue());
                 ReasonDetail.add(dynamicFormModel.get(i).getType_Detail());
                 DetailValue.add(dynamicFormModel.get(i).getDetail_Value());
                 DetailId.add(dynamicFormModel.get(i).getID());
-
-                System.out.println(ReasonCode.get(i));
-                System.out.println(ReasonDetail.get(i));
-                System.out.println(DetailValue.get(i));
             }
             String[] strings = new String[ReasonCode.size()];
             strings = ReasonCode.toArray(strings);
@@ -3875,6 +3871,7 @@ public class DetailIncident extends AppCompatActivity implements TerminalFeature
         workOrder.setAddress1(workOrder1.getAddress1());
         workOrder.setAddress2(workOrder1.getAddress2());
         workOrder.setWorkActivity(workOrder1.getWorkActivity());
+        workOrder.setWorkActivityCode(workOrder1.getWorkActivityCode());
         workOrder.setExpectedCompletionDate(workOrder1.getExpectedCompletionDate());
         workOrder.setCaseType(workOrder1.getCaseType());
         workOrder.setActualTargetDate(workOrder1.getActualTargetDate() == null ? "" : workOrder1.getActualTargetDate());
@@ -3996,7 +3993,6 @@ public class DetailIncident extends AppCompatActivity implements TerminalFeature
         });
     }
 
-
     private void isreceive() {
         if ((android.provider.Settings.Global.getInt(getContentResolver(), android.provider.Settings.Global.AUTO_TIME, 0)) == 1) {
             progressDialog.setMessage("Please wait...");
@@ -4056,7 +4052,6 @@ public class DetailIncident extends AppCompatActivity implements TerminalFeature
                 final WorkOrder workOrder = mRealm.where(WorkOrder.class).equalTo("TaskId", taskId).findFirst();
 
                 workOrder1.setTaskId(workOrder.getTaskId());
-                workOrder1.setWorkActivityCode(workOrder.getWorkActivityCode());
                 workOrder1.setMerchantId(workOrder.getMerchantId());
                 workOrder1.setTicketNo(workOrder.getTicketNo());
                 workOrder1.setTaskNo(workOrder.getTaskNo());
@@ -4064,6 +4059,7 @@ public class DetailIncident extends AppCompatActivity implements TerminalFeature
                 workOrder1.setAddress1(workOrder.getAddress1());
                 workOrder1.setAddress2(workOrder.getAddress2());
                 workOrder1.setWorkActivity(workOrder.getWorkActivity());
+                workOrder1.setWorkActivityCode(workOrder.getWorkActivityCode());
                 workOrder1.setExpectedCompletionDate(workOrder.getExpectedCompletionDate());
                 workOrder1.setCaseType(workOrder.getCaseType());
                 workOrder1.setCaseTypeCode(workOrder.getCaseTypeCode());
@@ -4198,27 +4194,32 @@ public class DetailIncident extends AppCompatActivity implements TerminalFeature
                                         if (workOrder.getWorkActivityCode() == 3) {
                                             if(workOrder.getAssetList().get(2).getAsset().size()>0 && workOrder.getAssetList().get(0).getAsset().size() == 0 && workOrder.getAssetList().get(1).getAsset().size() == 0){
                                                 llTaskParameter.setVisibility(View.VISIBLE);
+                                                setRecyclerView(1);
                                                 textCapture.setVisibility(View.GONE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                             }
                                             else if (workOrder.getAssetList().get(0).getAsset().size() == 0 || workOrder.getAssetList().get(1).getAsset().size() == 0) {
                                                 llTaskParameter.setVisibility(View.GONE);
+                                                setRecyclerView(1);
                                                 textCapture.setVisibility(View.VISIBLE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                                 textCapture.setText("SPK/Case task is not valid,Please contact your project admin");
                                             } else {
                                                 llTaskParameter.setVisibility(View.VISIBLE);
+                                                setRecyclerView(1);
                                                 textCapture.setVisibility(View.GONE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                             }
                                         } else {
                                             if (workOrder.getAssetList().get(0).getAsset().size() == 0 && workOrder.getAssetList().get(1).getAsset().size() == 0 && workOrder.getAssetList().get(2).getAsset().size() == 0) {
                                                 llTaskParameter.setVisibility(View.GONE);
+                                                setRecyclerView(1);
                                                 textCapture.setVisibility(View.VISIBLE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                                 textCapture.setText("SPK/Case task is not valid,Please contact your project admin");
                                             } else {
                                                 llTaskParameter.setVisibility(View.VISIBLE);
+                                                setRecyclerView(1);
                                                 textCapture.setVisibility(View.GONE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                             }

app/src/main/java/id/co/visionet/crm_multibank/activity/DetailRollout.java

@@ -615,16 +615,10 @@ public class DetailRollout extends AppCompatActivity implements TerminalFeatureA
                 ReasonDetail.add(dynamicFormModel.get(i).getType_Detail());
                 DetailValue.add(dynamicFormModel.get(i).getDetail_Value());
                 DetailId.add(dynamicFormModel.get(i).getID());
-
-                System.out.println(ReasonCode.get(i));
-                System.out.println(ReasonDetail.get(i));
-                System.out.println(DetailValue.get(i));
             }
 
             String[] strings = new String[ReasonCode.size()];
             strings = ReasonCode.toArray(strings);
-
-
             String[] detailvalues = new String[DetailValue.size()];
 
             workOrder = mRealm.where(WorkOrder.class).equalTo("TaskId", j).findFirst();
@@ -3975,6 +3969,7 @@ public class DetailRollout extends AppCompatActivity implements TerminalFeatureA
         workOrder.setAddress1(workOrder1.getAddress1());
         workOrder.setAddress2(workOrder1.getAddress2());
         workOrder.setWorkActivity(workOrder1.getWorkActivity());
+        workOrder.setWorkActivityCode(workOrder1.getWorkActivityCode());
         workOrder.setExpectedCompletionDate(workOrder1.getExpectedCompletionDate());
         workOrder.setCaseType(workOrder1.getCaseType());
         workOrder.setActualTargetDate(workOrder1.getActualTargetDate() == null ? "" : workOrder1.getActualTargetDate());
@@ -4164,6 +4159,7 @@ public class DetailRollout extends AppCompatActivity implements TerminalFeatureA
                 workOrder1.setAddress1(workOrder.getAddress1());
                 workOrder1.setAddress2(workOrder.getAddress2());
                 workOrder1.setWorkActivity(workOrder.getWorkActivity());
+                workOrder1.setWorkActivityCode(workOrder.getWorkActivityCode());
                 workOrder1.setExpectedCompletionDate(workOrder.getExpectedCompletionDate());
                 workOrder1.setCaseType(workOrder.getCaseType());
                 workOrder1.setCaseTypeCode(workOrder.getCaseTypeCode());
@@ -4299,27 +4295,32 @@ public class DetailRollout extends AppCompatActivity implements TerminalFeatureA
                                         if (workOrder.getWorkActivityCode() == 3) {
                                             if(workOrder.getAssetList().get(2).getAsset().size()>0 && workOrder.getAssetList().get(0).getAsset().size() == 0 && workOrder.getAssetList().get(1).getAsset().size() == 0){
                                                 llTaskParameter.setVisibility(View.VISIBLE);
+                                                setRecyclerView(2);
                                                 textCapture.setVisibility(View.GONE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                             }
                                             else if (workOrder.getAssetList().get(0).getAsset().size() == 0 || workOrder.getAssetList().get(1).getAsset().size() == 0) {
                                                 llTaskParameter.setVisibility(View.GONE);
+                                                setRecyclerView(2);
                                                 textCapture.setVisibility(View.VISIBLE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                                 textCapture.setText("SPK/Case task is not valid,Please contact your project admin");
                                             } else {
                                                 llTaskParameter.setVisibility(View.VISIBLE);
+                                                setRecyclerView(2);
                                                 textCapture.setVisibility(View.GONE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                             }
                                         } else {
                                             if (workOrder.getAssetList().get(0).getAsset().size() == 0 && workOrder.getAssetList().get(1).getAsset().size() == 0 && workOrder.getAssetList().get(2).getAsset().size() == 0) {
                                                 llTaskParameter.setVisibility(View.GONE);
+                                                setRecyclerView(2);
                                                 textCapture.setVisibility(View.VISIBLE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                                 textCapture.setText("SPK/Case task is not valid,Please contact your project admin");
                                             } else {
                                                 llTaskParameter.setVisibility(View.VISIBLE);
+                                                setRecyclerView(2);
                                                 textCapture.setVisibility(View.GONE);
                                                 btnCheckIn.setVisibility(View.GONE);
                                             }

app/src/main/java/id/co/visionet/crm_multibank/activity/InitActivity.java

@@ -143,22 +143,22 @@ public class InitActivity extends AppCompatActivity {
             if (compare < 0) {
                 etImei.setText(imei1);
                 //etImei.setHint(imei1);
-                //etImei.setEnabled(false);
+                etImei.setEnabled(false);
             } else {
                 etImei.setText(imei2);
                 //etImei.setHint(imei2);
-                //etImei.setEnabled(false);
+                etImei.setEnabled(false);
             }
             if (imei2.equals("")) {
                 etImei.setText(imei1);
                 //etImei.setHint(imei1);
-                //etImei.setEnabled(false);
+                etImei.setEnabled(false);
             }
             if (etImei.getText().toString().equalsIgnoreCase("")) {
                 TelephonyManager telephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
                 //etImei.setHint(telephonyManager.getDeviceId());
                 etImei.setText(telephonyManager.getDeviceId());
-                //etImei.setEnabled(false);
+                etImei.setEnabled(false);
             }
         }
     }
@@ -172,7 +172,7 @@ public class InitActivity extends AppCompatActivity {
                 TelephonyManager telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
                 //etImei.setHint(telephonyManager.getDeviceId());
                 etImei.setText(telephonyManager.getDeviceId());
-                //etImei.setEnabled(false);
+                etImei.setEnabled(false);
             }
         }
     }