songjunekeun před 5 roky
rodič
revize
1702088f29

+ 9 - 4
.idea/gradle.xml

@@ -1,15 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="delegatedBuild" value="false" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>

+ 1 - 1
app/build.gradle

@@ -97,7 +97,7 @@ android {
             applicationIdSuffix ".chilgok_new"
             buildConfigField "String", "originalPackageName", "\"com.dbs.mplus.knuh\""
 //            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema032.knuh.kr:8091/\""
-            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema032.knuh.kr:8096/\""
+            buildConfigField "String", "CONSENT_SERVER_URL", "\"https://ema031.knuh.kr:8096/\""
             buildConfigField "String", "CONSENT_EFORM_SERVER_URL", "\"https://ema032.knuh.kr:8090/eformservice.aspx\""
             buildConfigField "String", "INST_CD", "\"032\""
             manifestPlaceholders = [appLabel: "칠곡운영"]

+ 1 - 3
app/src/main/java/com/dbs/mplus/knuh/MainActivity.java

@@ -69,15 +69,13 @@ public class MainActivity extends AppCompatActivity {
     CallBack callBack = new CallBack() {
       @Override
       public void result(final SoapObject result) {
-        Log.e(TAG, "result --- > " + result);
-        Log.e(TAG, "result --- > " + result.getPropertyCount());
         runOnUiThread(new Runnable() {
           @Override
           public void run() {
             if (result == null || result.getPropertyCount() == 0) {
 //              ConsentConfig.SETTING_DATA.put("SESSION_TIME", "0");
               csAlert.show();
-              csAlert.setContent("기본 정보 설정에 실패하였습니다. \n다시 시도해주세요.", ConsentConfig.ALERT_BTN_TYPE);
+              csAlert.setContent(getString(R.string.baseDataError), ConsentConfig.ALERT_BTN_TYPE);
               csAlert.btnConfirm2.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {

+ 3 - 0
app/src/main/res/layout/activity_left.xml

@@ -203,6 +203,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
                     android:spinnerMode="dropdown"
+                    android:dropDownWidth="250dp"
                     android:layout_marginLeft="4dp"
                     android:overlapAnchor="false">
                 </Spinner>
@@ -228,6 +229,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
                     android:spinnerMode="dropdown"
+                    android:dropDownWidth="250dp"
                     android:layout_marginLeft="4dp"
                     android:overlapAnchor="false" />
             </LinearLayout>
@@ -243,6 +245,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="35dp"
                     android:spinnerMode="dropdown"
+                    android:dropDownWidth="250dp"
                     android:layout_marginLeft="4dp"
                     android:overlapAnchor="false"/>
             </LinearLayout>

+ 1 - 0
app/src/main/res/layout/activity_search_fragment.xml

@@ -43,6 +43,7 @@
                 android:layout_height="35dp"
                 android:layout_marginLeft="8dp"
                 android:spinnerMode="dropdown"
+                android:dropDownWidth="250dp"
                 android:overlapAnchor="false"/>
         </LinearLayout>
     </LinearLayout>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -121,6 +121,7 @@
     <string name="tempHint">직접입력은 100자 까지 입력 가능합니다.</string>
     <string name="deleteReasonStr">사유를 입력해주세요.</string>
 
+    <string name="baseDataError">기본 정보 설정에 실패하였습니다. \n다시 시도해주세요.</string>
     <string name="networkError">네트워크에 연결되어 있지 않습니다</string>
     <string name="rootingDeviceMsg">루팅된 디바이스 입니다. 루팅된 디바이스는 사용할 수 없습니다.</string>
     <string name="toDayDupConsentMsg">이미 받은 동의서 입니다 \n 계속 진행하시겠습니까?</string>