3.x 종료 문구 수정

This commit is contained in:
hyunwoo93.cha
2024-10-22 15:49:09 +09:00
parent 3ce746d66a
commit 320cb795a7
2 changed files with 35 additions and 22 deletions

View File

@@ -359,22 +359,20 @@ function AppBase(props) {
}, [dispatch]);
return (
<>
{webOSVersion > 4 ? (
<ErrorBoundary>
<MainView
className={
typeof window === "object" &&
!window.PalmSystem &&
!cursorVisible &&
css.preventMouse
}
/>
</ErrorBoundary>
) : (
<ErrorBoundary>
{webOSVersion === undefined ? null : webOSVersion < 4 ? (
<NotSupportedVersion />
) : (
<MainView
className={
typeof window === "object" &&
!window.PalmSystem &&
!cursorVisible &&
css.preventMouse
}
/>
)}
</>
</ErrorBoundary>
);
}

View File

@@ -101,6 +101,23 @@ export const getHttpHeaderForServiceRequest =
getState().localSettings;
lunaSend.getHttpHeaderForServiceRequest({
onSuccess: (res) => {
const version = res["X-Device-Netcast-Platform-Version"] || "";
const webOSVersion = Number(
version.substring(0, version.lastIndexOf("."))
);
// 4버전 미만인 경우 다른 처리 없이 버전 정보만 저장
if (webOSVersion < 4) {
dispatch(
changeAppStatus({
webOSVersion,
showLoadingPanel: { show: false },
})
);
return;
}
// 4버전 이상인 경우 기존 로직 수행
console.log("getHttpHeaderForServiceRequest", res);
const convertedRes = {
Authorization: res["Authorization"],
@@ -139,18 +156,17 @@ export const getHttpHeaderForServiceRequest =
convertedRes["app_id"] = appinfo.id;
}
}
//todo temp
convertedRes["app_ver"] = "1.0.0"; //appinfo.version;
convertedRes["app_ver"] = "1.0.0";
convertedRes["cntry_cd"] = res["X-Device-Country"];
convertedRes["prod_cd"] = res["X-Device-Product"];
convertedRes["plat_cd"] = res["X-Device-Platform"];
convertedRes["lang_cd"] = res["X-Device-Language"];
convertedRes["sdk_ver"] = res["X-Device-SDK-VERSION"]; //server sdk version
convertedRes["sdk_ver"] = res["X-Device-SDK-VERSION"];
convertedRes["publish_flag"] = res["X-Device-Publish-Flag"];
const version = res["X-Device-Netcast-Platform-Version"] || "";
convertedRes["os_ver"] = version;
convertedRes["dvc_auth"] = res["X-Authentication"];
//todo: for test
if (serverType !== "system") {
if (ricCodeSetting === "eic") {
if (languageSetting === "GB") {
@@ -175,7 +191,7 @@ export const getHttpHeaderForServiceRequest =
res["HOST"] = "RU.nextlgsdp.com";
}
}
//language Code
if (convertedRes["cntry_cd"] === "US") {
convertedRes["lang_cd"] = "en-US";
}
@@ -192,7 +208,7 @@ export const getHttpHeaderForServiceRequest =
dispatch({ type: types.GET_HTTP_HEADER, payload: convertedRes });
dispatch(
changeAppStatus({
webOSVersion: version.substring(0, version.lastIndexOf(".")),
webOSVersion,
serverHOST: res["HOST"],
mbr_no: res["X-User-Number"],
})
@@ -214,7 +230,6 @@ export const getHttpHeaderForServiceRequest =
})
);
},
onFailure: (err) => console.error("LoginData fetch failed ", err),
});
},