Преглед изворни кода

[ManagerSetting]
1. 터치펌웨어 버전 조회 추가
2. 최신APK 등록

jglee пре 2 година
родитељ
комит
a8488d7c6d

BIN
10_Release/ManagerSetting.apk


+ 49 - 0
ManagerSetting/src/main/java/com/artncore/managersetting/ui/fragments/QueryVersionInfoFragment.java

@@ -7,6 +7,7 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Enumeration;
 
+import kr.co.icontrols.v40ioctl.V40IF;
 import kr.co.icontrols.wallpadsupport.Version;
 
 import android.annotation.SuppressLint;
@@ -104,6 +105,9 @@ public class QueryVersionInfoFragment extends Fragment {
 
     public final int INFO_TYPE_MODEL_NAME = INFO_TYPE_VERSION_BASE + 210;
 
+    //jglee 터치 펌웨어 버전 추가
+    public final int INFO_TOUCH_IC_FW_VER = INFO_TYPE_VERSION_BASE + 212;
+
     private Activity mActivity;
     private MainDatabaseManager mMainDatabaseManager;
 
@@ -256,6 +260,9 @@ public class QueryVersionInfoFragment extends Fragment {
         showVersionInfo(INFO_TYPE_HEARTBEAT_GATEWAY_VER);
         showVersionInfo(INFO_TYPE_NEWS_VER);
 
+        //jglee - 터치 펌웨어 버전 추가
+        showVersionInfo(INFO_TOUCH_IC_FW_VER);
+
         if (ModelType == Version.MODEL_TYPE.IHN_1020GL)
         {
             showVersionInfo(INFO_TYPE_GATEWAY_VER);
@@ -480,6 +487,13 @@ public class QueryVersionInfoFragment extends Fragment {
 
                 break;
 
+            //jglee - 텀치 펌웨어 버전 표시
+            case INFO_TOUCH_IC_FW_VER:
+                title += mActivity.getString(R.string.version_info_touch_ic_fw_ver);
+                result.append(title + getTouchICFWVersion());
+                result.append("\n");
+
+
             default:
                 break;
         }
@@ -487,6 +501,41 @@ public class QueryVersionInfoFragment extends Fragment {
         mTV_Result.append(result + "\n");
     }
 
+    // get Touch IC FW Version
+    public String getTouchICFWVersion() {
+        StringBuilder result = new StringBuilder();
+        try {
+            // TO DO
+            if (Build.VERSION.SDK_INT > 23) {
+                V40IF mV40IF = new V40IF();
+                mV40IF.WpdInterfaceOpen();
+                int nVer = 0;
+                //jglee - 모델명 분기에 따라
+                if(ModelType == Version.MODEL_TYPE.IHN_1010GL_I_2443 || ModelType == Version.MODEL_TYPE.IHN_1010GL_I_6410)
+                    nVer = mV40IF.WpdInterfaceControl(0xF408, 1);
+                else
+                    nVer = mV40IF.WpdInterfaceControl(0xF410, 1);
+                mV40IF.WpdInterfaceClose();
+                if (nVer < 0) result.append("None(" + nVer + ")");
+                else result.append(nVer);
+            }
+            else {
+                result.append("Not support");
+            }
+        } catch (RuntimeException re) {
+            Log.e(TAG, "[RuntimeException] getTouchICFWVersion()");
+            Log.e(TAG, re.toString());
+            result.append("RuntimeException");
+        } catch (Exception e) {
+            Log.e(TAG, "[Exception] getTouchICFWVersion()");
+            LogUtil.errorLogInfo("", TAG, e);
+            result.append("Exception");
+        }
+
+        return result.toString();
+    }
+
+
     // 현재 동/호를 return
     private String queryDongHo() {
         StringBuilder result = new StringBuilder();

+ 1 - 1
ManagerSetting/src/main/res/values/strings.xml

@@ -174,7 +174,7 @@
     <string name="version_info_device_lh_gateway_ver">LH 게이트웨이 정보 : </string>
     <string name="version_info_model_name_ver">모델명 : </string>
     <string name="version_info_model_name_from_bsp_ver">(from BSP)</string>
-
+    <string name="version_info_touch_ic_fw_ver">터치IC FW 버전 : </string>
 
     <string name="guard_info_jurisdictional_guard">관할경비실 : </string>
     <string name="guard_info_front_gate_guard">정문 경비시 : </string>