!1120 支持从devicetype获取设备类型

Merge pull request !1120 from cheng_jinsong/devicetype

interfaces/innerkits/syspara/param_wrapper.cpp

@@ -163,7 +163,10 @@ std::string GetDeviceType(void)
         {"fitnessWatch", "liteWearable"},
     };
     static const char *productType = nullptr;
-    const char *type = GetProperty("const.build.characteristics", &productType);
+    const char *type = GetProperty("const.build.devicetype", &productType);
+    if (type == nullptr) {
+        type = GetProperty("const.build.characteristics", &productType);
+    }
     if (deviceTypeMap.count(type) != 0) {
         return deviceTypeMap[type];
     }

interfaces/innerkits/syspara/parameter.c

@@ -94,6 +94,10 @@ int SetParameter(const char *key, const char *value)
 const char *GetDeviceType(void)
 {
     static const char *productType = NULL;
+    const char *deviceType = GetProperty("const.build.devicetype", &productType);
+    if (deviceType != NULL) {
+        return deviceType;
+    }
     return GetProperty("const.build.characteristics", &productType);
 }