| 
					
				 | 
			
			
				@@ -28,6 +28,7 @@ import com.artncore.wallpadapi.Sdb_LivingRoomLightAPI; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.artncore.wallpadapi.WallPadAPI; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.util.LogUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import java.util.ArrayList; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.Calendar; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import java.util.List; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -162,6 +163,8 @@ public class MAIN extends WpadScreen { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //    private ShortcutManager mShortcutManager = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private boolean m_ElevatorDirectCall = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     boolean bNonInternetSupport = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    //jglee - 날씨 정보 DB 설정에 따라 보여주기 설정 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    boolean bWeather = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     int DEVICE_OPERATION_MODE = Common.MODE_NOMAL; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public MAIN(Context context, RelativeLayout layout, WallPadAPI wallpadapi, CallSubMenuScreen callAPK, int nDeviceOperationMode) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -222,6 +225,14 @@ public class MAIN extends WpadScreen { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             getWeatherInfo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             updateWeather(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //jglee - 날씨 정보 DB 설정에 따라 보여주기 설정 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(!bWeather) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(IMG_WEATHER!=null) IMG_WEATHER.setVisibility(View.INVISIBLE); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             displayNotificatoinIcon(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch (RuntimeException re) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             LogUtil.errorLogInfo("", TAG, re); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -240,6 +251,7 @@ public class MAIN extends WpadScreen { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             WallpadDeviceSet mWallpadDeviceSet = new WallpadDeviceSet(mContext); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             bNonInternetSupport = mWallpadDeviceSet.Get_NonInternetSupportUse(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            bWeather = mWallpadDeviceSet.Get_Weather(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mWallpadDeviceSet.closeDB(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Log.d(TAG, "[initScreen] bNonInternetSupport [" + bNonInternetSupport + "]"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -371,6 +383,8 @@ public class MAIN extends WpadScreen { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     private void getWeatherInfo() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //jglee - 날씨 정보 DB 설정에 따라 보여주기 설정 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(!bWeather) return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Log.i(TAG, "[getWeatherInfo] bNonInternetSupport = " + bNonInternetSupport); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (!bNonInternetSupport && !getIsSubWallpad()) { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -449,6 +463,9 @@ public class MAIN extends WpadScreen { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //            mIconInfoTable.printValue(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //jglee - 즐겨찾기 이슈 수정을 위해(실제 올라가있는 아이콘과 DB를 비교하기 위하여 생선된 변수 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ArrayList<WallpadStatusData.WidgetItem> listDelShortIcon = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             MainActivity.nShortcutCnt = MainActivity.MainScreenShortcutList.size(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (int i = 0; i < MainActivity.nShortcutCnt && i < MainActivity.nShortcutMax; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 Log.d(TAG, "[registerShortcutIcon] MainScreenShortcutList.get(" + i + ").idx() : " + MainActivity.MainScreenShortcutList.get(i).idx + ", MainScreenShortcutList.get(" + i + ").widgetID() : " + MainActivity.MainScreenShortcutList.get(i).widgetID); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -473,9 +490,58 @@ public class MAIN extends WpadScreen { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     TXT_SHORTCUT_NAME[i].setText(mIconInfo.getIconName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //여기서 이슈 발생 해당 아이콘 Table 에서 정보가 없음 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //여기서 다시 List 정리해서 해당 적용 필요 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if(listDelShortIcon == null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        listDelShortIcon = new ArrayList<WallpadStatusData.WidgetItem>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    Log.w(TAG, "Del Add Icon ID : " + MainActivity.MainScreenShortcutList.get(i).widgetID); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    listDelShortIcon.add(MainActivity.MainScreenShortcutList.get(i)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     Log.w(TAG, "[registerShortcutIcon] mIconInfo is null!!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            //여기서 List에 갯수가 남아 있으면 해당 아이콘 삭제를 진행 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(listDelShortIcon!=null && listDelShortIcon.size() != 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                for(int del_index = 0; del_index < listDelShortIcon.size() ; del_index++) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    int del_widget_id = listDelShortIcon.get(del_index).widgetID; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        if (MainActivity.MainScreenShortcutList != null) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            for (int i = 0; i < MainActivity.MainScreenShortcutList.size(); i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                if (MainActivity.MainScreenShortcutList.get(i).widgetID == del_widget_id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    //데이터 수집 앱 이름 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    IconInfoTable.IconInfo mIconInfo = mIconInfoTable.getIconInfoByID(MainActivity.MainScreenShortcutList.get(i).widgetID); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    if (!deleteShortcutDB(MainActivity.MainScreenShortcutList.get(i).idx)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                        Log.w(TAG, "[procDeleteShortcutPopupResult] deleteShortcutDB = false!!"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } catch (RuntimeException re) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        LogUtil.errorLogInfo("", TAG, re); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    catch (Exception e) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        Log.e(TAG, "[Exception] procDeleteShortcutPopupResult(boolean bDelete, int nShortcutID)"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        //e.printStackTrace(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        LogUtil.errorLogInfo("", TAG, e); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                //아이콘 재정렬 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                unRegisterWidgetIcon(getLayout()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                reOrderingShortcut(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                registerShortcutIcon(getLayout()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if(listDelShortIcon!=null) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                listDelShortIcon.clear(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            listDelShortIcon = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } catch (RuntimeException re) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             LogUtil.errorLogInfo("", TAG, re); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1022,6 +1088,8 @@ public class MAIN extends WpadScreen { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     public void updateWeather() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        //jglee - 날씨 정보 DB 설정에 따라 보여주기 설정 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if(!bWeather) return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Log.i(TAG, "[updateWeather] bNonInternetSupport = " + bNonInternetSupport); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (!bNonInternetSupport && !getIsSubWallpad()) { 
			 |