|
@@ -320,13 +320,13 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
|
|
|
}
|
|
|
sMap.put(temp.getValue(), temp.getKey());
|
|
|
}
|
|
|
- sMap = ((TreeMap)sMap).descendingMap();
|
|
|
+ sMap = ((TreeMap) sMap).descendingMap();
|
|
|
Iterator it = sMap.keySet().iterator();
|
|
|
Integer k1 = (Integer) it.next();
|
|
|
Integer k2 = (Integer) it.next();
|
|
|
Integer color1 = sMap.get(k1);
|
|
|
Integer color2 = sMap.get(k2);
|
|
|
- System.out.println("kkkk=="+k1+","+color1 + "," + k2 + "," + color2);
|
|
|
+ System.out.println("kkkk==" + k1 + "," + color1 + "," + k2 + "," + color2);
|
|
|
System.out.println("最.." + maxCnt + ", key=" + key);
|
|
|
rgb[0] = (key & 0xff0000) >> 16;
|
|
|
rgb[1] = (key & 0xff00) >> 8;
|
|
@@ -336,15 +336,15 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
|
|
|
int colorPercent = maxCnt * 100 / totalPixl;
|
|
|
if (colorPercent < 50) {
|
|
|
//可能存在2中底色, 大布局的底色和小模块的底色,都算底色。
|
|
|
- int secPercent = k2 * 100/totalPixl;
|
|
|
+ int secPercent = k2 * 100 / totalPixl;
|
|
|
rgb[0] = (color2 & 0xff0000) >> 16;
|
|
|
rgb[1] = (color2 & 0xff00) >> 8;
|
|
|
rgb[2] = (color2 & 0xff);
|
|
|
- System.out.println("二级底色色值为: " + rgb[0] + ", " + rgb[1]+", "+rgb[2]);
|
|
|
- System.out.println("二级底色比例=="+secPercent);
|
|
|
- colorPercent = (k1 + k2) * 100/totalPixl;
|
|
|
+ System.out.println("二级底色色值为: " + rgb[0] + ", " + rgb[1] + ", " + rgb[2]);
|
|
|
+ System.out.println("二级底色比例==" + secPercent);
|
|
|
+ colorPercent = (k1 + k2) * 100 / totalPixl;
|
|
|
}
|
|
|
- System.out.println("总底色比例=="+colorPercent);
|
|
|
+ System.out.println("总底色比例==" + colorPercent);
|
|
|
//计算底色是否是连续分布的
|
|
|
int windowSize = 50;
|
|
|
int pureColorBlockCnt = 0;
|
|
@@ -455,7 +455,7 @@ public class ScreenshotServiceImpl extends ServiceImpl<ScreenshotMapper, Screens
|
|
|
.setStartTime(currentTime)
|
|
|
.setEndTime(currentTime)
|
|
|
//第一次的持续时间默认为最短的一次间隔 以后为开始时间和结束时间只差 以防看一眼不计入时间的现象
|
|
|
- .setDuration((double) DETECTION_INTERVAL / 3600);
|
|
|
+ .setDuration(0.0);
|
|
|
timeCalculationMapper.insert(timeCalculation);
|
|
|
}
|
|
|
/*之后可能还需要处理跨越一天的情况*/
|