|
|
@@ -271,7 +271,9 @@ public class Login extends CustomActivity implements View.OnClickListener,
|
|
|
|
|
|
@Override public boolean handleMessage(Message msg) {
|
|
|
|
|
|
- iType = msg.what;
|
|
|
+ // TODO : 테스트 끝나면 주석 해제.
|
|
|
+ test_login();
|
|
|
+ /*iType = msg.what;
|
|
|
switch (msg.what) {
|
|
|
case MSG_COM_P_MEMBER_LOGIN:
|
|
|
send_P_member_login();
|
|
|
@@ -281,7 +283,7 @@ public class Login extends CustomActivity implements View.OnClickListener,
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
|
- }
|
|
|
+ }*/
|
|
|
return true;
|
|
|
}
|
|
|
}
|
|
|
@@ -320,6 +322,147 @@ public class Login extends CustomActivity implements View.OnClickListener,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 로그인 시 토큰이 변경되는 문제로 임시 사용
|
|
|
+ *
|
|
|
+ */
|
|
|
+ private void test_login() {
|
|
|
+ try {
|
|
|
+ //회원 번호
|
|
|
+ String sMEMBER_ID = "24";
|
|
|
+ //이메일 ID
|
|
|
+ String sEMAIL_ID = "super810910@gmail.com";
|
|
|
+ //서비스 ID
|
|
|
+ String sSERVICE_ID = "30001";
|
|
|
+ //국가 코드 (ex: KR)
|
|
|
+ String sCOUNTRY_CODE = "KR";
|
|
|
+ //타임존 ID
|
|
|
+ String sTIMEZONE_ID = "210";
|
|
|
+ //타임존 시간 (ex: +09:00)
|
|
|
+ String sTIMEZONE = "+09:00";
|
|
|
+ //언어 코드 (ex: en)
|
|
|
+ String sLANG = "ko";
|
|
|
+ //인증 토큰
|
|
|
+ String sAUTH_TOKEN = "EAEAihAcWyP9GN1hRz6x72EjIi5CnCZWsJrPhz0uLt5ltNjbqglfbeTEWzj4YgGXz/Jru/8uQQfVP5DvIiwr8qYOscQVwR98";
|
|
|
+
|
|
|
+ //회원이미지 추가
|
|
|
+ /*String sIMAGE_FILE_NAME = "";
|
|
|
+ if ( joResult.has(Constants.HTTP_image_file_name) ) {
|
|
|
+ sIMAGE_FILE_NAME = util.null2string(joResult.get(Constants.HTTP_image_file_name));
|
|
|
+ appConfig.setMy_Image_Url(sIMAGE_FILE_NAME);
|
|
|
+ }*/
|
|
|
+ //회원명
|
|
|
+ String sNICKNAME = "최낙훈";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_nickname) ) {
|
|
|
+ sNICKNAME = util.null2string(joResult.get(Constants.HTTP_nickname));
|
|
|
+ appConfig.setNickname(sNICKNAME);
|
|
|
+ }*/
|
|
|
+
|
|
|
+ String sHTTP_NEW_EMAIL_ID = "";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_new_email_id) ) {
|
|
|
+ sHTTP_NEW_EMAIL_ID = util.null2string(joResult.get(Constants.HTTP_new_email_id));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ String sHTTP_TEMP_PASSWORD_YN = "N";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_temp_password_yn) ) {
|
|
|
+ sHTTP_TEMP_PASSWORD_YN = util.null2string(joResult.get(Constants.HTTP_temp_password_yn));
|
|
|
+ }*/
|
|
|
+ appConfig.setTemp_Password_Yn(sHTTP_TEMP_PASSWORD_YN);
|
|
|
+
|
|
|
+ String sPUSH_TYPE_MODE_CHG_YN = "Y";
|
|
|
+ String sPUSH_TYPE_PRSNC_CHG_YN = "Y";
|
|
|
+
|
|
|
+ String sHTTP_invitations_count = "0";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_invitations_count) ) {
|
|
|
+ sHTTP_invitations_count = util.null2string(joResult.get(Constants.HTTP_invitations_count));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ String sHTTP_homegrp_id = "1";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_homegrp_id) ) {
|
|
|
+ sHTTP_homegrp_id = util.null2string(joResult.get(Constants.HTTP_homegrp_id));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ /*String sHTTP_homegrp_image_file_name = "";
|
|
|
+ if ( joResult.has(Constants.HTTP_homegrp_image_file_name) ) {
|
|
|
+ sHTTP_homegrp_image_file_name = util.null2string(joResult.get(Constants.HTTP_homegrp_image_file_name));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ String sHTTP_homegrp_name = "나의집";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_homegrp_name) ) {
|
|
|
+ sHTTP_homegrp_name = util.null2string(joResult.get(Constants.HTTP_homegrp_name));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ String sHTTP_grade_code = "MAS";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_grade_code) ) {
|
|
|
+ sHTTP_grade_code = util.null2string(joResult.get(Constants.HTTP_grade_code));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ String sHTTP_homehub_device_id = "D00000000001";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_homehub_device_id) ) {
|
|
|
+ sHTTP_homehub_device_id = util.null2string(joResult.get(Constants.HTTP_homehub_device_id));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ String sHTTP_homehub_online_state = "ON";
|
|
|
+ /*if ( joResult.has(Constants.HTTP_homehub_online_state) ) {
|
|
|
+ sHTTP_homehub_online_state = util.null2string(joResult.get(Constants.HTTP_homehub_online_state));
|
|
|
+ }*/
|
|
|
+
|
|
|
+ appConfig.setLogin_Member_Id(sMEMBER_ID);
|
|
|
+ appConfig.setLogin_Id(sEMAIL_ID);
|
|
|
+ if ( sHTTP_TEMP_PASSWORD_YN.equals("Y") ) {
|
|
|
+ appConfig.setLogin_Pass(sPass);
|
|
|
+ } else {
|
|
|
+ appConfig.setLogin_Pass("");
|
|
|
+ }
|
|
|
+ appConfig.setAutoLogin(bAutoLogin);
|
|
|
+ appConfig.setLogin(true);
|
|
|
+
|
|
|
+ //공통 변수 입력
|
|
|
+ appConfig.setAuth_Token(sAUTH_TOKEN);
|
|
|
+
|
|
|
+ //db 입력작업
|
|
|
+ SQLiteDatabase db = DatabaseOpenHelper.getInstance(act).getWritableDatabase();
|
|
|
+ String sSql = "";
|
|
|
+ sSql = "";
|
|
|
+ sSql = sqlManager.QryDelLoginInfo();
|
|
|
+ db.execSQL(sSql);
|
|
|
+
|
|
|
+ sSql = "";
|
|
|
+ Dlog.v("bAutoLogin =" + bAutoLogin);
|
|
|
+ sSql = sqlManager.QryInsertLoginInfo(sEMAIL_ID, sAUTH_TOKEN, bSaveId, bAutoLogin, appConfig.getManualNotView(), appConfig.getPush());
|
|
|
+ db.execSQL(sSql);
|
|
|
+ db.close();
|
|
|
+
|
|
|
+ appConfig.setPush_Type_Mode_Chg_Yn(sPUSH_TYPE_MODE_CHG_YN);
|
|
|
+ appConfig.setPush_Type_Prsnc_Chg_Yn(sPUSH_TYPE_PRSNC_CHG_YN);
|
|
|
+ appConfig.setInvitations_Count(sHTTP_invitations_count);
|
|
|
+ appConfig.setSelect_Homegrp_Id(sHTTP_homegrp_id);
|
|
|
+// appConfig.setSelect_Homegrp_Icon(sHTTP_homegrp_image_file_name);
|
|
|
+ appConfig.setSelect_Homegrp_Name(sHTTP_homegrp_name);
|
|
|
+ appConfig.setSelect_Homegrp_Grade_Code(sHTTP_grade_code);
|
|
|
+ appConfig.setSelect_Homegrp_Homehub_Device_Id(sHTTP_homehub_device_id);
|
|
|
+ appConfig.setSelect_Homegrp_Homehub_Online_State(sHTTP_homehub_online_state);
|
|
|
+
|
|
|
+ if ( util.str2int(sHTTP_invitations_count) > 0 ) {
|
|
|
+ Intent intent = new Intent(act, Invitation_List.class);
|
|
|
+ util.callActivityForResultNoAnim(act, intent, Constants.ACT_INVITATION_LIST);
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ setFinish();
|
|
|
+ } catch (Exception ex) {
|
|
|
+ ex.printStackTrace();
|
|
|
+ util.getView(act, R.id.llRoot).setVisibility(View.VISIBLE);
|
|
|
+ customDialog.MsgAlert(act, Constants.MSG807);
|
|
|
+ }
|
|
|
+
|
|
|
+ try {
|
|
|
+ util.getButton(act, R.id.btnLogin).setEnabled(true);
|
|
|
+ } catch (Exception ex) {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void result_P_member_login(Response rpResult) {
|
|
|
|
|
|
try {
|
|
|
@@ -344,7 +487,6 @@ public class Login extends CustomActivity implements View.OnClickListener,
|
|
|
String sLANG = util.null2string(joResult.get(Constants.HTTP_lang));
|
|
|
//인증 토큰
|
|
|
String sAUTH_TOKEN = util.null2string(joResult.get(Constants.HTTP_auth_token));
|
|
|
-
|
|
|
//회원이미지 추가
|
|
|
String sIMAGE_FILE_NAME = "";
|
|
|
if ( joResult.has(Constants.HTTP_image_file_name) ) {
|