|
|
@@ -1,24 +1,21 @@
|
|
|
package com.artncore.managersetting.ui.fragments;
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.List;
|
|
|
-
|
|
|
-import kr.co.icontrols.wallpadsupport.Version;
|
|
|
import android.app.Activity;
|
|
|
import android.os.Bundle;
|
|
|
-//import android.support.v4.app.Fragment;
|
|
|
-import androidx.fragment.app.Fragment;
|
|
|
-import androidx.core.view.MotionEventCompat;
|
|
|
import android.util.Log;
|
|
|
import android.view.LayoutInflater;
|
|
|
import android.view.MotionEvent;
|
|
|
import android.view.View;
|
|
|
-import android.view.ViewGroup;
|
|
|
import android.view.View.OnTouchListener;
|
|
|
+import android.view.ViewGroup;
|
|
|
import android.widget.ListView;
|
|
|
|
|
|
+import androidx.core.view.MotionEventCompat;
|
|
|
+import androidx.fragment.app.Fragment;
|
|
|
|
|
|
import com.artncore.WallPadDataMgr.WallpadDeviceSet;
|
|
|
+import com.artncore.managersetting.MainApplication;
|
|
|
+import com.artncore.managersetting.R;
|
|
|
import com.artncore.managersetting.dao.MainDatabaseManager;
|
|
|
import com.artncore.managersetting.domain.Const;
|
|
|
import com.artncore.managersetting.domain.ControllerVO;
|
|
|
@@ -26,8 +23,13 @@ import com.artncore.managersetting.ui.ControllerListAdapter;
|
|
|
import com.artncore.managersetting.ui.activities.MainActivity;
|
|
|
import com.artncore.managersetting.util.StringUtil;
|
|
|
import com.artncore.wallpadapi.WallPadAPI;
|
|
|
-import com.artncore.managersetting.MainApplication;
|
|
|
-import com.artncore.managersetting.R;
|
|
|
+
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+
|
|
|
+import kr.co.icontrols.wallpadsupport.Version;
|
|
|
+
|
|
|
+//import android.support.v4.app.Fragment;
|
|
|
|
|
|
/**
|
|
|
* A list fragment representing a list of Items. This fragment also supports
|
|
|
@@ -387,20 +389,20 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
|
String strType = InfoList.get(5);
|
|
|
|
|
|
if (Const.CONTROLLER_SETTING_WIRELESS.equals(strType)) {
|
|
|
- doorLockCurrent = 1;
|
|
|
+ doorLockCurrent = 0;
|
|
|
}
|
|
|
else if (Const.CONTROLLER_SETTING_WIRE.equals(strType)) {
|
|
|
- doorLockCurrent = 2;
|
|
|
+ doorLockCurrent = 1;
|
|
|
}
|
|
|
else if (Const.CONTROLLER_SETTING_FINGERPRINT.equals(strType)) {
|
|
|
- doorLockCurrent = 3;
|
|
|
+ doorLockCurrent = 2;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
List<String> itemList = new ArrayList<String>();
|
|
|
- itemList.add(mActivity.getString(R.string.do_not_used));
|
|
|
+ //itemList.add(mActivity.getString(R.string.do_not_used));
|
|
|
itemList.add(mActivity.getString(R.string.contoller_door_lock_item_wireless));
|
|
|
itemList.add(mActivity.getString(R.string.contoller_door_lock_item_wired));
|
|
|
itemList.add(mActivity.getString(R.string.contoller_door_lock_item_fingerprint));
|
|
|
@@ -418,7 +420,7 @@ public class SettingControllerFragment extends Fragment implements ControllerLis
|
|
|
mControllerList.add(controllerVO);
|
|
|
}
|
|
|
|
|
|
- if(doorLockCurrent == 1)
|
|
|
+ if(doorLockCurrent == 0)
|
|
|
{
|
|
|
int doorLockOpenDelayCurrent = Const.CONTROLLER_SETTING_DO_USED_INDEX;
|
|
|
if (mMainDatabaseManager.isUsedSettingDataSubDev(MainDatabaseManager.SETTING_ITEM_SUB_DEVICE_WIRELESS_DOORLOCK_OPENDELAY) == false)
|