Merge remote-tracking branch 'origin/master'

# Conflicts:
#	onecable_admin/src/main/java/com/ntels/onecable/admin/view/Main.java

onecable_admin/src/main/java/com/ntels/onecable/admin/common/db/DatabaseOpenHelper.java

@@ -24,7 +24,7 @@ import android.database.sqlite.SQLiteOpenHelper;
  */
 public class DatabaseOpenHelper extends SQLiteOpenHelper {
 
-    private static final String DB_NAME = "KneetAdim.db";
+    private static final String DB_NAME = "KneetAdmin.db";
 
     private static int DB_VERSION = 1;
 

onecable_admin/src/main/java/com/ntels/onecable/admin/common/util/Util.java

@@ -150,7 +150,7 @@ public class Util {
     private static final String TAG = Util.class.getSimpleName();
         public Activity mActivity;
     //	public String			TAG				= "com.show.kt";
-    public String prefs_name = "custom_prefs";
+    public String prefs_name = "kneet_admin_prefs";
     public InputFilter filterAlphaNum = new InputFilter() {
         @Override
         public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {

onecable_admin/src/main/java/com/ntels/onecable/admin/view/Main.java

@@ -50,7 +50,7 @@ import android.view.View;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import static com.ntels.onecable.admin.R.id.btnDelay;
+import static com.ntels.onecable.admin.R.id.btnCustomerConnect;
 import static com.ntels.onecable.admin.common.Constants.EXTRA_ERROR_CODE;
 import static com.ntels.onecable.admin.common.Constants.EXTRA_RESULT_STATE;
 import static com.ntels.onecable.admin.common.broadcast.DefaultLocalBroadCast.INTENT_NAME_TYPE;
@@ -343,7 +343,7 @@ public class Main extends CustomActivity implements View.OnClickListener, Custom
         }
 
         // 고객관련
-        mUtil.getView(mActivity, btnDelay).setOnClickListener(this);
+        mUtil.getView(mActivity, R.id.btnDelay).setOnClickListener(this);
         mUtil.getView(mActivity, R.id.btnDisconnect).setOnClickListener(this);
         mUtil.getView(mActivity, R.id.btnSelectContract).setOnClickListener(this);
     }
@@ -382,9 +382,9 @@ public class Main extends CustomActivity implements View.OnClickListener, Custom
                 mCustomDialog.msgAlert(mActivity, Constants.MSG701, R.string.MSG_TITLE_000);
                 break;
             }
-            case btnDelay: {
+            case R.id.btnDelay: {
                 if (mAppConfig.getIsCustomerConn()) {
-                    mUtil.getView(mActivity, btnDelay).setEnabled(false);
+                    mUtil.getView(mActivity, R.id.btnCustomerConnect).setEnabled(false);
                     mIntent = new Intent(mActivity, CustomerConnection.class);
                     mIntent.putExtra(Constants.EXTRA_CALL_TYPE, "1");
                     mIntent.putExtra(Constants.KEY_CUST_ID, mCustId);
@@ -394,7 +394,7 @@ public class Main extends CustomActivity implements View.OnClickListener, Custom
                     mIntent.putExtra(Constants.EXTRA_SPINNER_LIST2, mCustIdValueList);
                     mIntent.putExtra(Constants.EXTRA_SPINNER_LIST3, mCustIdMemberList);
                     mUtil.callActivityForResultNoAnim(mActivity, mIntent, Constants.ACT_CUSTOMER_CONNECTION1);
-                    mUtil.getView(mActivity, btnDelay).setEnabled(true);
+                    mUtil.getView(mActivity, btnCustomerConnect).setEnabled(true);
 
                 }
                 break;