Merge branch 'master' into jmRyu

.idea/misc.xml

@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK" />
 </project>

app/src/main/java/com/dbs/mplus/knuh/activity/ConsentActivity.java

@@ -14,6 +14,7 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
@@ -99,6 +100,9 @@ public class ConsentActivity extends AppCompatActivity {
   public AppCompatRadioButton radioButton3;
   public AppCompatRadioButton radioButton4;
   public AppCompatRadioButton radioButton5;
+
+  public EditText etPatientId;
+  public LinearLayout patientSearchLayout;
   /** left Menu **/
 
   /** Right Menu **/
@@ -254,6 +258,10 @@ public class ConsentActivity extends AppCompatActivity {
 //    radioBtn4     = (RadioButton) findViewById(R.id.radioBtn4);
 //    radioBtn5     = (RadioButton) findViewById(R.id.radioBtn5);
     radioLayout = (RelativeLayout) findViewById(R.id.radioLayout);
+
+    etPatientId = (EditText) findViewById(R.id.etPatientId);
+    patientSearchLayout = (LinearLayout) findViewById(R.id.patientSearchLayout);
+
     leftMenu.setRadioGroupDraw(indexPage);
 
     if (!indexPage.equals("I")) {
@@ -264,6 +272,7 @@ public class ConsentActivity extends AppCompatActivity {
 
     dateLayout.setOnClickListener(leftMenu.onClickListener);
     radioGroup.setOnCheckedChangeListener(leftMenu.onCheckedChangeListener);
+    patientSearchLayout.setOnClickListener(leftMenu.onClickListener);
 
     leftMenu.getWardList();
     leftMenu.getDeptList();
@@ -352,9 +361,9 @@ public class ConsentActivity extends AppCompatActivity {
   protected void onDestroy() {
     if (tapClick == false) {
       try {
-        SignWrapper.getInstance().deleteAll();
-        Util.clearPreference(mContext, "userInfo");
-        Util.clearPreference(mContext, "sessionTime");
+//        SignWrapper.getInstance().deleteAll();
+//        Util.clearPreference(mContext, "userInfo");
+//        Util.clearPreference(mContext, "sessionTime");
       } catch (Exception e) {
       }
     }

app/src/main/java/com/dbs/mplus/knuh/activity/LoginActivity.java

@@ -8,12 +8,15 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.dbs.mplus.knuh.BuildConfig;
@@ -100,6 +103,7 @@ public class LoginActivity extends AppCompatActivity {
 
   private void setEvent() {
     btnLogin.setOnClickListener(onClickListener);
+    etPasswd.setOnEditorActionListener(onEditorActionListener);
     certCheck.setOnCheckedChangeListener(onCheckedChangeListener);
   }
 
@@ -118,6 +122,23 @@ public class LoginActivity extends AppCompatActivity {
     }
   };
 
+  private EditText.OnEditorActionListener onEditorActionListener = new EditText.OnEditorActionListener() {
+    @Override
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+      if (actionId == EditorInfo.IME_ACTION_DONE) {
+        if (v == etPasswd) {
+          if (Util.checkNetwork(mContext) == true) {
+            loginEvent();
+          } else {
+            ntError.show();
+            loadingProgress.dismiss();
+          }
+        }
+      }
+      return false;
+    }
+  };
+
   private CheckBox.OnCheckedChangeListener onCheckedChangeListener = new CompoundButton.OnCheckedChangeListener() {
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

app/src/main/java/com/dbs/mplus/knuh/activity/activityEvent/LeftMenu.java

@@ -73,10 +73,11 @@ public class LeftMenu {
       radioStr4 = mContext.getString(R.string.noWrite);
 
     } else if (indexPage.equals("O")) {
-      radioStr1 = mContext.getString(R.string.accept);
-      radioStr2 = mContext.getString(R.string.waiting);
-      radioStr3 = mContext.getString(R.string.complete);
-      radioStr4 = mContext.getString(R.string.noWrite);
+      radioStr1 = mContext.getString(R.string.all);
+      radioStr2 = mContext.getString(R.string.accept);
+      radioStr3 = mContext.getString(R.string.waiting);
+      radioStr4 = mContext.getString(R.string.complete);
+      radioStr5 = mContext.getString(R.string.noWrite);
     } else if (indexPage.equals("ER")) {
       radioStr1 = mContext.getString(R.string.stay);
       radioStr2 = mContext.getString(R.string.discharge);
@@ -94,7 +95,7 @@ public class LeftMenu {
       radioStr3 = mContext.getString(R.string.emergency);
     }
 
-    if (indexPage.equals("OP")) {
+    if (indexPage.equals("O") || indexPage.equals("OP")) {
       instance.radioParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
       instance.radioButton1 = new AppCompatRadioButton(mContext);
       instance.radioButton1.setText(radioStr1);
@@ -185,7 +186,11 @@ public class LeftMenu {
     @Override
     public void onClick(View v) {
       if (instance.dateLayout == v) {
+        //진료 일자 선택
         dateDialog.show();
+      } else if (instance.patientSearchLayout == v) {
+        //등록번호 검색 input 옆의 조회 버튼
+        getPatientList();
       }
     }
   };
@@ -388,4 +393,26 @@ public class LeftMenu {
 
     }
   };
+
+  private void getPatientList() {
+    CallBack callBack = new CallBack() {
+      @Override
+      public void result(SoapObject result) {
+        Log.e(TAG, "getPatientList result -- > " + result);
+      }
+
+      @Override
+      public void stop() {
+
+      }
+
+      @Override
+      public void error() {
+
+      }
+    };
+
+    HashMap<String, String> mData = new HashMap<String, String>();
+//    Util.callHttp(mContext, ConsentConfig.HOST_HOSPITAL, ConsentConfig.GET_PATIENT_LIST, mData, callBack);
+  }
 }

app/src/main/java/com/dbs/mplus/knuh/util/ConsentConfig.java

@@ -3,14 +3,15 @@ package com.dbs.mplus.knuh.util;
 import com.dbs.mplus.knuh.BuildConfig;
 
 public class ConsentConfig {
-  public static final String ALERT_BTN_TYPE                = "SINGLE";
-  public static final String RETURN_NULL                   = "anyType{}";
+  public static final String ALERT_BTN_TYPE   = "SINGLE";
+  public static final String RETURN_NULL      = "anyType{}";
 
-  public static final String HOST_HOSPITAL   = BuildConfig.CONSENT_SERVER_URL + "HospitalSvc.asmx";
-  public static final String DO_LOGIN        = "doLogin"; // 모바일 로그인 api
-  public static final String GET_WARD_LIST   = "GetWardList"; // 병동 리스트
-  public static final String GET_DEPT_LIST   = "GetDeptList"; // 진료과 리스트
-  public static final String GET_DOCTOR_LIST = "GetDoctorList"; // 진료의 리스트
+  public static final String HOST_HOSPITAL    = BuildConfig.CONSENT_SERVER_URL + "HospitalSvc.asmx";
+  public static final String DO_LOGIN         = "doLogin"; // 모바일 로그인 api
+  public static final String GET_WARD_LIST    = "GetWardList"; // 병동 리스트
+  public static final String GET_DEPT_LIST    = "GetDeptList"; // 진료과 리스트
+  public static final String GET_DOCTOR_LIST  = "GetDoctorList"; // 진료의 리스트
+  public static final String GET_PATIENT_LIST = "GetPatientList"; // 환자 리스트 조회
 
   public final static int CONNECT_TIMEOUT   = 5000;
   public final static String CERTIFICATE_IP = "192.168.100.191";

app/src/main/res/layout/activity_left.xml

@@ -314,10 +314,10 @@
                 android:layout_gravity="center"
                 android:background="@drawable/shape_item">
                 <EditText
-                    android:id="@+id/etNumber"
+                    android:id="@+id/etPatientId"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:hint="등록번호 검색"
+                    android:hint="@string/patientIdSearch"
                     android:layout_weight="1"
                     android:layout_marginLeft="5dp"
                     android:singleLine="true"
@@ -345,7 +345,8 @@
                         android:layout_marginRight="5dp"
                         android:textSize="14sp"
                         android:gravity="center"
-                        android:text="조회" />
+                        android:textColor="@color/black"
+                        android:text="@string/inquiry" />
                 </LinearLayout>
             </LinearLayout>
 

app/src/main/res/layout/activity_search_fragment.xml

@@ -59,7 +59,7 @@
                 app:theme="@style/EditTextStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:hint="@string/patientIdSearch"
+                android:hint="@string/searchText"
                 android:layout_weight="1"
                 android:layout_marginLeft="5dp"
                 android:singleLine="true"

app/src/main/res/values/strings.xml

@@ -64,8 +64,9 @@
     <string name="temp">임시</string>
     <string name="cert">인증</string>
     <string name="check">확인</string>
+    <string name="patientIdSearch">등록번호 검색</string>
 
-    <string name="patientIdSearch">검색어를 입력해주세요.</string>
+    <string name="searchText">검색어를 입력해주세요.</string>
     <string name="emptyMarker">즐겨찾기 목록이 없습니다.</string>
     <string name="emptyHistory">조회된 이력이 없습니다.</string>
     <string name="searchPatient">조회된 환자 목록이 없습니다</string>