shawenguan 2 년 전
부모
커밋
c7916aa28e
1개의 변경된 파일19개의 추가작업 그리고 20개의 파일을 삭제
  1. 19 20
      Scripts/jhsh/jhshHelper.js

+ 19 - 20
Scripts/jhsh/jhshHelper.js

@@ -60,23 +60,10 @@ if (!lk.isExecComm) {
         lk.msg('');
         lk.done();
     }else{
-        // all();
-        doTest();
+        all();
     }
 }
 
-async function doTest(){
-    let startTime = new Date().getTime();
-    lk.log('start='+startTime);
-    await lk.wait(3000);
-    lk.log('pass='+(new Date().getTime() - startTime));
-    lk.done();
-}
-
-async function testWait(){
-    return new Promise((resolve) => setTimeout(resolve, 3000))
-}
-
 function checkHandleRequest() {
     const url = $request.url;
     const path = $request.path;
@@ -124,7 +111,7 @@ function checkHandleRequest() {
             let MID = $request.headers['MID'] || $request.headers['Mid'] || $request.headers['mid'];
             let obj = JSON.parse(body);
             obj['MID'] = MID;
-            lk.setVal(jhshStoreKeyPrefix+'ActInfo-'+txcode, JSON.stringify(obj));
+            checkAppendActInfo(MID, txcode, obj);
             lk.log(`建行生活活动数据[${txcode}]获取成功`);
             switch(txcode){
                 case 'A3341A038':
@@ -137,11 +124,12 @@ function checkHandleRequest() {
     }
 }
 
-function checkAddActInfo(mid, txcode, data){
+
+function checkAppendActInfo(mid, txcode, data){
     data['MID'] = mid;
     const actId = data['ACT_ID'];
     let allInfo = {};
-    const jsonStr = lk.getVal(jhshStoreKeyPrefix+'ActInfo'+txcode);
+    const jsonStr = lk.getVal(jhshStoreKeyPrefix+'ActInfo-'+txcode);
     if(jsonStr){
         allInfo = JSON.parse(jsonStr);
     }
@@ -150,6 +138,19 @@ function checkAddActInfo(mid, txcode, data){
     lk.setVal(jhshStoreKeyPrefix+'ActInfo-'+txcode, JSON.stringify(allInfo));
 }
 
+function getTheActInfo(txcode){
+    const signActInfoStr = lk.getVal(jhshStoreKeyPrefix+'ActInfo-'+txcode);
+    let signActInfoDict = {};
+    if(signActInfoStr){
+        try {
+            signActInfoDict = JSON.parse(signActInfoStr);
+        } catch {
+
+        }
+    }
+    return signActInfoDict;
+}
+
 async function all() {
     // await getLatestVersion(); // 获取版本信息
     const loginInfoStr = lk.getVal(jhshStoreKeyPrefix+'LoginInfo');
@@ -163,8 +164,7 @@ async function all() {
             continue;
         }
         // 签到活动
-        const signActInfoStr = lk.getVal(jhshStoreKeyPrefix+'ActInfo-A3341A038');
-        const signActInfoDict = JSON.parse(signActInfoStr);
+        const signActInfoDict = getTheActInfo('A3341A038');
         for(let actId in signActInfoDict){
             const signInActObj = signActInfoDict[actId];
             if (!signInActObj?.MID) {
@@ -179,7 +179,6 @@ async function all() {
     lk.done();
 }
 
-
 async function checkSignIn(loginInfo, signActInfo){
     const DeviceId = loginInfo['DeviceId'];
     const MBCUserAgent = loginInfo['MBCUserAgent'];