[최진오]

리스트 그림자 없앰 => 심운영부장 요청
장치 리스트 및 상세 수정

onecable/src/main/java/com/ntels/onecable/common/widget/CustomActivity.java

@@ -229,7 +229,8 @@ public class CustomActivity extends AppCompatActivity {
         super.onStart();
         Dlog.v("onStart");
         GoogleAnalytics.getInstance(this).reportActivityStart(this);
-
+        LocalBroadcastManager.getInstance(this).registerReceiver(mKneetMessageReceiver, new IntentFilter(KneetMessageLocalBroadCast
+                .INTENT_ACTION));
         if (mIsWebSocket) {
 //            if (mWebSocketService == null) {
                 Intent intent = new Intent(this, WebSocketService.class);
@@ -252,8 +253,6 @@ public class CustomActivity extends AppCompatActivity {
         //		LocalBroadcastManager.getInstance(this).registerReceiver(mPushMessageReceiver, new IntentFilter(PushMessageLocalBroadCast
         // .INTENT_ACTION));
 
-        LocalBroadcastManager.getInstance(this).registerReceiver(mKneetMessageReceiver, new IntentFilter(KneetMessageLocalBroadCast
-                .INTENT_ACTION));
         if (!mIsPermissionCheckLogic) {
             mIsPermission = false;
             checkPermissionInit();

onecable/src/main/java/com/ntels/onecable/view/things/FragmentThingsAdapter.java

@@ -294,11 +294,11 @@ public class FragmentThingsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                         if (contentValue.equals(select)) {
                             itemViewHolerView.ivRowIcon.setBackgroundResource(R.drawable.img_thing_icon_bg_default);
                             itemViewHolerView.tvRowControl.setTextColor(mUtil.getColor(context, R.color.color_text_01));
-                            itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_onoff_on);
+                            itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_onoff_off);
                         } else {
                             itemViewHolerView.ivRowIcon.setBackgroundResource(R.drawable.img_thing_icon_bg_active);
                             itemViewHolerView.tvRowControl.setTextColor(mUtil.getColor(context, R.color.color_text_02));
-                            itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_onoff_off);
+                            itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_onoff_on);
                         }
 
                         itemViewHolerView.btnRowControl.setOnClickListener(new View.OnClickListener() {
@@ -332,26 +332,29 @@ public class FragmentThingsAdapter extends RecyclerView.Adapter<RecyclerView.Vie
                         if (contentValue.equals(select)) {
                             itemViewHolerView.ivRowIcon.setBackgroundResource(R.drawable.img_thing_icon_bg_default);
                             itemViewHolerView.tvRowControl.setTextColor(mUtil.getColor(context, R.color.color_text_01));
+                            itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_onoff_off);
+                            itemViewHolerView.btnRowControl.setEnabled(false);
                         } else {
                             itemViewHolerView.ivRowIcon.setBackgroundResource(R.drawable.img_thing_icon_bg_active);
                             itemViewHolerView.tvRowControl.setTextColor(mUtil.getColor(context, R.color.color_text_02));
-                        }
-
 //                        itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_lockunlock_lock);
-                        itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_onoff_off);
-                        itemViewHolerView.btnRowControl.setOnClickListener(new View.OnClickListener() {
-                            int tag = 0;
-                            private Intent intent;
+                            itemViewHolerView.btnRowControl.setEnabled(true);
+                            itemViewHolerView.btnRowControl.setBackgroundResource(R.drawable.img_things_list_btn_onoff_on);
+                            itemViewHolerView.btnRowControl.setOnClickListener(new View.OnClickListener() {
+                                int tag = 0;
+                                private Intent intent;
 
-                            @Override
-                            public void onClick(View view) {
+                                @Override
+                                public void onClick(View view) {
+
+                                    tag = (int) view.getTag();
+                                    setHttpValue("CLOSE");
+                                    vLoding.setVisibility(View.VISIBLE);
+                                    adapterCallback.onCallAction(3, tag);
+                                }
+                            });
+                        }
 
-                                tag = (int) view.getTag();
-                                setHttpValue("CLOSE");
-                                vLoding.setVisibility(View.VISIBLE);
-                                adapterCallback.onCallAction(3, tag);
-                            }
-                        });
                         break;
                     // SENSOR_MULTILEVEL
                     case Constants.CMDCLS_TYPE_ID_12001:

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDetail.java

@@ -546,7 +546,7 @@ public class ThingsDetail extends CustomActivity implements View.OnClickListener
 //                        mUtil.getImageId(mActivity, "img_" + deviceclassTypeId + "_rule"));
 
                 // 장치명
-                String prd_name = mUtil.null2string(joResult.get(Constants.KEY_PRD_USER_NAME));
+                String prd_name = mUtil.null2string(joResult.get(Constants.KEY_PRD_NAME));
                 String prdUserName = mUtil.null2string(joResult.get(Constants.KEY_PRD_USER_NAME));
                 deviceName = !prdUserName.equals("") ? prdUserName : prd_name;
                 mUtil.getTextView(mToolbar, R.id.tvToolbarTitle1).setText(deviceName);

onecable/src/main/java/com/ntels/onecable/view/things/ThingsDetailVpAdapter.java

@@ -59,7 +59,7 @@ class ThingsDetailVpAdapter extends PagerAdapter {
      * @param alval           data
      * @param adapterCallback 콜백 object
      */
-    ThingsDetailVpAdapter(final Context context, String deviceId,  ArrayList<HashMap<String, Object>> alval,
+    ThingsDetailVpAdapter(final Context context, String deviceId, ArrayList<HashMap<String, Object>> alval,
                           ListInterface adapterCallback) {
 
         this.mContext = context;
@@ -294,25 +294,49 @@ class ThingsDetailVpAdapter extends PagerAdapter {
             case Constants.CMDCLS_TYPE_ID_17001:
             case Constants.CMDCLS_TYPE_ID_17002:
             case Constants.CMDCLS_TYPE_ID_17005:
-                mUtil.getView(childView, R.id.btnRowBody1_Contents_On).setVisibility(View.VISIBLE);
-                mUtil.getTextView(childView, R.id.btnRowBody1_Contents_On).setText(
-                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" + httpCmdclsTypeId + "_ON"));
 
-                mUtil.getView(childView, R.id.btnRowBody1_Contents_Off).setVisibility(View.VISIBLE);
-                mUtil.getTextView(childView, R.id.btnRowBody1_Contents_Off).setText(
-                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" + httpCmdclsTypeId + "_OFF"));
+//                mUtil.getView(childView, R.id.llRowBody1_Control).setVisibility(View.GONE);
+//                mUtil.getTextView(childView, R.id.tvRowBody1_Title).setText(tempValue);
+//                if ("OFF".equals(httpOnlineState) || mAppConfig.getSelectCtrtGroupHomehubOnlineState(mDeviceId).equals("OFF")) {
+//                    setDispOffline(childView, R.drawable.img_things_detail_05_00_valve_state_offline);
+//                } else {
+//                    if (httpContentValue.equals(select)) {
+//                        mUtil.getView(childView, R.id.ivRowBody1_Icon).setBackgroundResource(
+//                                R.drawable.img_things_detail_05_02_valve_state_unlocked);
+//                        mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_01));
+//                    } else {
+//                        mUtil.getView(childView, R.id.llRowBody1_Control).setVisibility(View.VISIBLE);
+//                        mUtil.getView(childView, R.id.btnRowBody1_Contents_Off).setVisibility(View.VISIBLE);
+//                        mUtil.getView(childView, R.id.ivRowBody1_Icon).setBackgroundResource(
+//                                R.drawable.img_things_detail_05_01_valve_state_locked);
+//                        mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_02));
+//                    }
+//                }
+//
+
+
+
+//                mUtil.getView(childView, R.id.btnRowBody1_Contents_On).setVisibility(View.VISIBLE);
+//                mUtil.getTextView(childView, R.id.btnRowBody1_Contents_On).setText(
+//                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" + httpCmdclsTypeId + "_ON"));
+
+//                mUtil.getView(childView, R.id.btnRowBody1_Contents_Off).setVisibility(View.VISIBLE);
+//                mUtil.getTextView(childView, R.id.btnRowBody1_Contents_Off).setText(
+//                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" + httpCmdclsTypeId + "_OFF"));
 
                 mUtil.getTextView(childView, R.id.tvRowBody1_Title).setText(tempValue);
+
                 if ("OFF".equals(httpOnlineState) || mAppConfig.getSelectCtrtGroupHomehubOnlineState(mDeviceId).equals("OFF")) {
                     setDispOffline(childView, R.drawable.img_things_detail_06_00_plug_state_offline);
                 } else {
                     if (httpContentValue.equals(select)) {
+                        mUtil.getView(childView, R.id.btnRowBody1_Contents_On).setVisibility(View.VISIBLE);
                         mUtil.getView(childView, R.id.ivRowBody1_Icon).setBackgroundResource(
                                 R.drawable.img_things_detail_06_01_plug_state_off);
                         mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_01));
                     } else {
+                        mUtil.getView(childView, R.id.btnRowBody1_Contents_Off).setVisibility(View.VISIBLE);
                         mUtil.getView(childView, R.id.ivRowBody1_Icon).setBackgroundResource(
-
                                 R.drawable.img_things_detail_06_02_plug_state_on);
                         mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_02));
                     }
@@ -400,13 +424,11 @@ class ThingsDetailVpAdapter extends PagerAdapter {
                 //사이렌
                 mUtil.getView(childView, R.id.btnRowBody1_Contents_On).setVisibility(View.VISIBLE);
                 mUtil.getTextView(childView, R.id.btnRowBody1_Contents_On).setText(
-                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" +
-                                httpCmdclsTypeId + "_ON"));
+                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" + httpCmdclsTypeId + "_ON"));
 
                 mUtil.getView(childView, R.id.btnRowBody1_Contents_Off).setVisibility(View.VISIBLE);
                 mUtil.getTextView(childView, R.id.btnRowBody1_Contents_Off).setText(
-                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" +
-                                httpCmdclsTypeId + "_OFF"));
+                        mUtil.getStringValues(mContext, "CMDCLS_TYPE_ID_" + httpCmdclsTypeId + "_OFF"));
 
                 mUtil.getTextView(childView, R.id.tvRowBody1_Title).setText(tempValue);
                 if ("OFF".equals(httpOnlineState) || mAppConfig.getSelectCtrtGroupHomehubOnlineState(mDeviceId).equals("OFF")) {
@@ -451,7 +473,8 @@ class ThingsDetailVpAdapter extends PagerAdapter {
                 break;
             case Constants.CMDCLS_TYPE_ID_36002:
                 //가스락
-                mUtil.getView(childView, R.id.btnRowBody1_Contents_Off).setVisibility(View.VISIBLE);
+
+                mUtil.getView(childView, R.id.llRowBody1_Control).setVisibility(View.GONE);
                 mUtil.getTextView(childView, R.id.tvRowBody1_Title).setText(tempValue);
                 if ("OFF".equals(httpOnlineState) || mAppConfig.getSelectCtrtGroupHomehubOnlineState(mDeviceId).equals("OFF")) {
                     setDispOffline(childView, R.drawable.img_things_detail_05_00_valve_state_offline);
@@ -461,6 +484,8 @@ class ThingsDetailVpAdapter extends PagerAdapter {
                                 R.drawable.img_things_detail_05_02_valve_state_unlocked);
                         mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_01));
                     } else {
+                        mUtil.getView(childView, R.id.llRowBody1_Control).setVisibility(View.VISIBLE);
+                        mUtil.getView(childView, R.id.btnRowBody1_Contents_Off).setVisibility(View.VISIBLE);
                         mUtil.getView(childView, R.id.ivRowBody1_Icon).setBackgroundResource(
                                 R.drawable.img_things_detail_05_01_valve_state_locked);
                         mUtil.getTextView(childView, R.id.tvRowBody1_Title).setTextColor(Util.getColor(mContext, R.color.color_text_02));

onecable/src/main/res/layout/fragment_homemember.xml

@@ -36,6 +36,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:padding="4dp"
+                        android:overScrollMode="never"
                         android:clipToPadding="false"/>
             </android.support.v4.widget.SwipeRefreshLayout>
 

onecable/src/main/res/layout/fragment_rules.xml

@@ -53,7 +53,7 @@
                         android:id="@+id/rcvList"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-
+                        android:overScrollMode="never"
                         android:clipToPadding="false"/>
             </android.support.v4.widget.SwipeRefreshLayout>
         </LinearLayout>

onecable/src/main/res/layout/fragment_things.xml

@@ -73,6 +73,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:padding="4dp"
+                        android:overScrollMode="never"
                         android:background="@drawable/color_body_01"
                         android:clipToPadding="false"/>
             </android.support.v4.widget.SwipeRefreshLayout>

onecable/src/main/res/layout/homemember_add.xml

@@ -400,6 +400,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:paddingTop="4dp"
+                    android:overScrollMode="never"
                     android:background="@drawable/color_popup_bg_body"
                     android:clipToPadding="false"/>
         </LinearLayout>

onecable/src/main/res/layout/invitation_list.xml

@@ -44,6 +44,7 @@
         android:id="@+id/rcvList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:overScrollMode="never"
         android:clipToPadding="false"/>
   </android.support.v4.widget.SwipeRefreshLayout>
 

onecable/src/main/res/layout/message_center.xml

@@ -36,6 +36,7 @@
                         android:id="@+id/rcvList"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:overScrollMode="never"
                         android:clipToPadding="false"/>
             </android.support.v4.widget.SwipeRefreshLayout>
 

onecable/src/main/res/layout/notice.xml

@@ -36,6 +36,7 @@
                         android:id="@+id/rcvList"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
+                        android:overScrollMode="never"
                         android:clipToPadding="false"/>
             </android.support.v4.widget.SwipeRefreshLayout>
 

onecable/src/main/res/layout/row_things_list.xml

@@ -41,7 +41,7 @@
                 android:layout_alignParentLeft="true"
                 android:includeFontPadding="false"
                 android:singleLine="true"
-                android:text="스마트 플러그"
+                android:text="asdfas"
                 android:textColor="@color/color_text_01"
                 android:textSize="@dimen/size_font_04"/>
 

onecable/src/main/res/layout/rules_things_select.xml

@@ -68,7 +68,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-
+                        android:overScrollMode="never"
                         android:clipToPadding="false"/>
 
             </LinearLayout>

onecable/src/main/res/layout/setting_password_change.xml

@@ -187,6 +187,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:paddingTop="4dp"
+              android:overScrollMode="never"
               android:background="@drawable/color_popup_bg_body"
               android:clipToPadding="false"/>
     </LinearLayout>

onecable/src/main/res/layout/setting_password_check.xml

@@ -168,6 +168,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:paddingTop="4dp"
+              android:overScrollMode="never"
               android:background="@drawable/color_popup_bg_body"
               android:clipToPadding="false"/>
     </LinearLayout>

onecable/src/main/res/layout/things_device_netatmo_camera_list.xml

@@ -72,6 +72,7 @@
                 android:id="@+id/rvCameraList"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:overScrollMode="never"
                 android:layout_marginTop="40dp"
                 android:minHeight="165dp"/>
             <TextView

onecable/src/main/res/layout/things_homehub_register.xml

@@ -26,6 +26,7 @@
             android:id="@+id/rvHomhubList"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:overScrollMode="never"
             android:visibility="gone"/>
 
         <View style="@style/width_section"