Jelajahi Sumber

1. UI 수정.
2. 예외처리 추가.

aaron 8 tahun lalu
induk
melakukan
ebba3227db

+ 3 - 0
onecable/src/main/java/com/ntels/onecable/view/rules/FragmentRules.java

@@ -755,6 +755,9 @@ public class FragmentRules extends Fragment implements View.OnClickListener,
                     intent.putExtra(Constants.EXTRA_CALL_TYPE, "2");
                     intent.putExtra(Constants.EXTRA_MEMBER_RULE_ID, homegrpRuleId);
                     mUtil.callActivityForResult(mActivity, intent, Constants.ACT_RULES_EDIT);
+                } else {
+                    comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_G_RULES),
+                            Constants.HANDLER_DELAY_MILLIS);
                 }
                 break;
             default:

+ 3 - 0
onecable/src/main/java/com/ntels/onecable/view/rules/RulesDetail.java

@@ -537,6 +537,9 @@ public class RulesDetail extends CustomActivity implements View.OnClickListener,
                     intent.putExtra(Constants.EXTRA_CALL_TYPE, "2");
                     intent.putExtra(Constants.EXTRA_MEMBER_RULE_ID, ruleId);
                     mUtil.callActivityForResult(mActivity, intent, Constants.ACT_RULES_EDIT);
+                } else {
+                    comHandler.sendMessageDelayed(comHandler.obtainMessage(MSG_COM_G_RULES_HOMEGRP_RULE_ID),
+                            Constants.HANDLER_DELAY_MILLIS);
                 }
                 break;
             default:

+ 5 - 1
onecable/src/main/java/com/ntels/onecable/view/rules/RulesEdit.java

@@ -360,7 +360,11 @@ public class RulesEdit extends CustomActivity implements View.OnClickListener,
                 }
                 break;
             case R.id.llBtn2:
-                onBackPressed();
+//                onBackPressed();
+                mIntent = new Intent();
+                mIntent.putExtra(Constants.EXTRA_RELOAD_FLAG, true);
+                this.setResult(RESULT_OK, mIntent);
+                finish();
                 break;
             case R.id.llTriggerTitle:
                 if (!view.isSelected()) {

+ 3 - 0
onecable/src/main/java/com/ntels/onecable/view/rules/RulesThingsSelect.java

@@ -539,6 +539,9 @@ public class RulesThingsSelect extends CustomActivity implements View.OnClickLis
               break;
             }
           }
+          if (devicesPosition < 0) {
+            callDevicesList();
+          }
         }
       } else {
         JSONObject joResult = new JSONObject(result.getContent());

+ 3 - 2
onecable/src/main/res/layout/dialog_spinner_main1_row1.xml

@@ -24,11 +24,12 @@
                 android:layout_width="60dp"
                 android:layout_height="60dp"
                 android:duplicateParentState="true"
-                android:layout_marginRight="5dp"/>
+                android:layout_marginRight="-20dp"/>
 
         <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="25dp"
                 android:duplicateParentState="true"
                 android:layout_weight="1"
                 android:orientation="vertical">
@@ -48,7 +49,7 @@
                     android:id="@+id/tvBody2"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
+                    android:layout_marginTop="8dp"
                     android:duplicateParentState="true"
                     android:gravity="center_vertical"
                     android:includeFontPadding="false"