change

单军华

2018-07-19 83b9d5c682b21d88133f24da0f94dd56bd79e687

change

 screendisplay/Pods/HMEmoticon/????/Emoticon/HMEmoticon.bundle/Contents/Info.plist

File was deleted

 screendisplay/Pods/HMEmoticon/????/Emoticon/HMEmoticon.bundle/Contents/Resources/default/ConfigInfo.plist

 screendisplay/Pods/HMEmoticon/????/Emoticon/HMEmoticon.bundle/Contents/Resources/emoji/ConfigInfo.plist

 screendisplay/Pods/HMEmoticon/????/Emoticon/HMEmoticon.bundle/Contents/Resources/lxh/ConfigInfo.plist

New file
@@ -0,0 +1,486 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
    <dict>
        <key>chs</key>
        <string>[笑哈哈]</string>
        <key>cht</key>
        <string>[笑哈哈]</string>
        <key>gif</key>
        <string>lxh_xiaohaha.gif</string>
        <key>png</key>
        <string>lxh_xiaohaha.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[好爱哦]</string>
        <key>cht</key>
        <string>[好愛哦]</string>
        <key>gif</key>
        <string>lxh_haoaio.gif</string>
        <key>png</key>
        <string>lxh_haoaio.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[噢耶]</string>
        <key>cht</key>
        <string>[噢耶]</string>
        <key>gif</key>
        <string>lxh_oye.gif</string>
        <key>png</key>
        <string>lxh_oye.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[偷乐]</string>
        <key>cht</key>
        <string>[偷樂]</string>
        <key>gif</key>
        <string>lxh_toule.gif</string>
        <key>png</key>
        <string>lxh_toule.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[泪流满面]</string>
        <key>cht</key>
        <string>[淚流滿面]</string>
        <key>gif</key>
        <string>lxh_leiliumanmian.gif</string>
        <key>png</key>
        <string>lxh_leiliumanmian.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[巨汗]</string>
        <key>cht</key>
        <string>[巨汗]</string>
        <key>gif</key>
        <string>lxh_juhan.gif</string>
        <key>png</key>
        <string>lxh_juhan.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[抠鼻屎]</string>
        <key>cht</key>
        <string>[摳鼻屎]</string>
        <key>gif</key>
        <string>lxh_koubishi.gif</string>
        <key>png</key>
        <string>lxh_koubishi.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[求关注]</string>
        <key>cht</key>
        <string>[求關注]</string>
        <key>gif</key>
        <string>lxh_qiuguanzhu.gif</string>
        <key>png</key>
        <string>lxh_qiuguanzhu.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[好喜欢]</string>
        <key>cht</key>
        <string>[好喜歡]</string>
        <key>gif</key>
        <string>lxh_haoxihuan.gif</string>
        <key>png</key>
        <string>lxh_haoxihuan.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[崩溃]</string>
        <key>cht</key>
        <string>[崩潰]</string>
        <key>gif</key>
        <string>lxh_bengkui.gif</string>
        <key>png</key>
        <string>lxh_bengkui.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[好囧]</string>
        <key>cht</key>
        <string>[好冏]</string>
        <key>gif</key>
        <string>lxh_haojiong.gif</string>
        <key>png</key>
        <string>lxh_haojiong.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[震惊]</string>
        <key>cht</key>
        <string>[震驚]</string>
        <key>gif</key>
        <string>lxh_zhenjing.gif</string>
        <key>png</key>
        <string>lxh_zhenjing.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[别烦我]</string>
        <key>cht</key>
        <string>[別煩我]</string>
        <key>gif</key>
        <string>lxh_biefanwo.gif</string>
        <key>png</key>
        <string>lxh_biefanwo.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[不好意思]</string>
        <key>cht</key>
        <string>[不好意思]</string>
        <key>gif</key>
        <string>lxh_buhaoyisi.gif</string>
        <key>png</key>
        <string>lxh_buhaoyisi.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[羞嗒嗒]</string>
        <key>cht</key>
        <string>[羞嗒嗒]</string>
        <key>gif</key>
        <string>lxh_xiudada.gif</string>
        <key>png</key>
        <string>lxh_xiudada.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[得意地笑]</string>
        <key>cht</key>
        <string>[得意地笑]</string>
        <key>gif</key>
        <string>lxh_deyidexiao.gif</string>
        <key>png</key>
        <string>lxh_deyidexiao.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[纠结]</string>
        <key>cht</key>
        <string>[糾結]</string>
        <key>gif</key>
        <string>lxh_jiujie.gif</string>
        <key>png</key>
        <string>lxh_jiujie.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[给劲]</string>
        <key>cht</key>
        <string>[給勁]</string>
        <key>gif</key>
        <string>lxh_geijin.gif</string>
        <key>png</key>
        <string>lxh_geijin.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[悲催]</string>
        <key>cht</key>
        <string>[悲催]</string>
        <key>gif</key>
        <string>lxh_beicui.gif</string>
        <key>png</key>
        <string>lxh_beicui.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[甩甩手]</string>
        <key>cht</key>
        <string>[甩甩手]</string>
        <key>gif</key>
        <string>lxh_shuaishuaishou.gif</string>
        <key>png</key>
        <string>lxh_shuaishuaishou.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[好棒]</string>
        <key>cht</key>
        <string>[好棒]</string>
        <key>gif</key>
        <string>lxh_haobang.gif</string>
        <key>png</key>
        <string>lxh_haobang.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[瞧瞧]</string>
        <key>cht</key>
        <string>[瞧瞧]</string>
        <key>gif</key>
        <string>lxh_qiaoqiao.gif</string>
        <key>png</key>
        <string>lxh_qiaoqiao.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[不想上班]</string>
        <key>cht</key>
        <string>[不想上班]</string>
        <key>gif</key>
        <string>lxh_buxiangshangban.gif</string>
        <key>png</key>
        <string>lxh_buxiangshangban.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[困死了]</string>
        <key>cht</key>
        <string>[困死了]</string>
        <key>gif</key>
        <string>lxh_kunsile.gif</string>
        <key>png</key>
        <string>lxh_kunsile.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[许愿]</string>
        <key>cht</key>
        <string>[許願]</string>
        <key>gif</key>
        <string>lxh_xuyuan.gif</string>
        <key>png</key>
        <string>lxh_xuyuan.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[丘比特]</string>
        <key>cht</key>
        <string>[丘比特]</string>
        <key>gif</key>
        <string>lxh_qiubite.gif</string>
        <key>png</key>
        <string>lxh_qiubite.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[有鸭梨]</string>
        <key>cht</key>
        <string>[有鴨梨]</string>
        <key>gif</key>
        <string>lxh_youyali.gif</string>
        <key>png</key>
        <string>lxh_youyali.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[想一想]</string>
        <key>cht</key>
        <string>[想一想]</string>
        <key>gif</key>
        <string>lxh_xiangyixiang.gif</string>
        <key>png</key>
        <string>lxh_xiangyixiang.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[躁狂症]</string>
        <key>cht</key>
        <string>[躁狂症]</string>
        <key>gif</key>
        <string>lxh_zaokuangzheng.gif</string>
        <key>png</key>
        <string>lxh_zaokuangzheng.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[转发]</string>
        <key>cht</key>
        <string>[轉發]</string>
        <key>gif</key>
        <string>lxh_zhuanfa.gif</string>
        <key>png</key>
        <string>lxh_zhuanfa.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[互相膜拜]</string>
        <key>cht</key>
        <string>[互相膜拜]</string>
        <key>gif</key>
        <string>lxh_xianghumobai.gif</string>
        <key>png</key>
        <string>lxh_xianghumobai.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[雷锋]</string>
        <key>cht</key>
        <string>[雷鋒]</string>
        <key>gif</key>
        <string>lxh_leifeng.gif</string>
        <key>png</key>
        <string>lxh_leifeng.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[杰克逊]</string>
        <key>cht</key>
        <string>[傑克遜]</string>
        <key>gif</key>
        <string>lxh_jiekexun.gif</string>
        <key>png</key>
        <string>lxh_jiekexun.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[玫瑰]</string>
        <key>cht</key>
        <string>[玫瑰]</string>
        <key>gif</key>
        <string>lxh_meigui.gif</string>
        <key>png</key>
        <string>lxh_meigui.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[hold住]</string>
        <key>cht</key>
        <string>[hold住]</string>
        <key>gif</key>
        <string>lxh_holdzhu.gif</string>
        <key>png</key>
        <string>lxh_holdzhu.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[群体围观]</string>
        <key>cht</key>
        <string>[群體圍觀]</string>
        <key>gif</key>
        <string>lxh_quntiweiguan.gif</string>
        <key>png</key>
        <string>lxh_quntiweiguan.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[推荐]</string>
        <key>cht</key>
        <string>[推薦]</string>
        <key>gif</key>
        <string>lxh_tuijian.gif</string>
        <key>png</key>
        <string>lxh_tuijian.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[赞啊]</string>
        <key>cht</key>
        <string>[贊啊]</string>
        <key>gif</key>
        <string>lxh_zana.gif</string>
        <key>png</key>
        <string>lxh_zana.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[被电]</string>
        <key>cht</key>
        <string>[被電]</string>
        <key>gif</key>
        <string>lxh_beidian.gif</string>
        <key>png</key>
        <string>lxh_beidian.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
    <dict>
        <key>chs</key>
        <string>[霹雳]</string>
        <key>cht</key>
        <string>[霹靂]</string>
        <key>gif</key>
        <string>lxh_pili.gif</string>
        <key>png</key>
        <string>lxh_pili.png</string>
        <key>type</key>
        <string>0</string>
    </dict>
</array>
</plist>

 screendisplay/Pods/HMEmoticon/????/Emoticon/HMEmoticon.bundle/Contents/Resources/lxh/info.plist

File was deleted

 screendisplay/Pods/HMEmoticon/????/Emoticon/HMEmoticonPackage.m

@@ -29,7 +29,7 @@
        // 判断目录是否为空
        if (_directory != nil) {
            // 加载表情模型
            NSString *fileName = [NSString stringWithFormat:@"%@/info.plist", _directory];
            NSString *fileName = [NSString stringWithFormat:@"%@/ConfigInfo.plist", _directory];
            NSString *path = [[NSBundle hm_emoticonBundle] pathForResource:fileName ofType:nil];
            NSArray *array = [NSArray arrayWithContentsOfFile:path];
            

 screendisplay/Pods/Pods.xcodeproj/project.xcworkspace/xcuserdata/danjunhua.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ

 screendisplay/Pods/UMengUShare/UShareSDK/SocialLibraries/QQ/QQSDK/TencentOpenApi_IOS_Bundle.bundle/Info.plist

Binary files differ

 screendisplay/screendisplay.xcodeproj/project.pbxproj

@@ -1387,6 +1387,7 @@
                    "$(inherited)",
                    "$(PROJECT_DIR)/Pods/BaiduMapKit/BaiduMapKit/thirdlibs",
                );
                ONLY_ACTIVE_ARCH = YES;
                PRODUCT_BUNDLE_IDENTIFIER = com.moral.screendisplay;
                PRODUCT_NAME = "$(TARGET_NAME)";
                TARGETED_DEVICE_FAMILY = 1;

 screendisplay/screendisplay.xcworkspace/xcuserdata/danjunhua.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ

 screendisplay/screendisplay.xcworkspace/xcuserdata/danjunhua.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -10,7 +10,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "screendisplay/Classes/&#x68c0;&#x6d4b;/Controller/DynamicViewController.m"
            timestampString = "553066761.09716"
            timestampString = "553068454.5627019"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "286"
@@ -106,7 +106,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "screendisplay/Classes/&#x68c0;&#x6d4b;/Controller/MonitoringMapViewController.m"
            timestampString = "553065592.995932"
            timestampString = "553068350.753279"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "452"
@@ -186,7 +186,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "screendisplay/Classes/&#x68c0;&#x6d4b;/Service/DynamicService.m"
            timestampString = "553066296.854059"
            timestampString = "553068454.562896"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "76"
@@ -202,7 +202,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "screendisplay/Classes/&#x68c0;&#x6d4b;/Controller/DynamicViewController.m"
            timestampString = "553066761.097684"
            timestampString = "553068454.563179"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "272"
@@ -218,7 +218,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "screendisplay/Classes/&#x68c0;&#x6d4b;/Controller/DynamicViewController.m"
            timestampString = "553066761.0978971"
            timestampString = "553068454.563228"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "134"
@@ -234,7 +234,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "screendisplay/Classes/&#x68c0;&#x6d4b;/Controller/DynamicViewController.m"
            timestampString = "553066761.098107"
            timestampString = "553068454.563272"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "165"
@@ -250,7 +250,7 @@
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "screendisplay/Classes/&#x68c0;&#x6d4b;/Service/DynamicService.m"
            timestampString = "553066296.854408"
            timestampString = "553068454.563316"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "71"

 screendisplay/screendisplay/Classes/??/Controller/DynamicViewController.m

@@ -151,7 +151,7 @@
        [valueTeampArr addObject:model.value];
        [_historyRecordLineChart.xLineDataArr addObject:[NSString stringWithFormat:@"%d",i]];
    }
    

    [_historyRecordLineChart.valueArr addObject:valueTeampArr];
    
    [_historyRecordLineChart updateYScale];
@@ -253,7 +253,7 @@

-(void)updateDynamicData
{
    //[self GetDynamicDataList:1];
    [self GetDynamicDataList:1];
}

-(void)GetDynamicDataList:(int)pageSize

 screendisplay/screendisplay/Classes/??/Service/DynamicService.m

@@ -45,7 +45,7 @@
//                                    if(self.dynamicViewModels.count-1 < i + 1) continue;
//                                    [self.dynamicViewModels exchangeObjectAtIndex:i withObjectAtIndex:i+1];
//                                }
                                [self.dynamicViewModels removeObjectAtIndex:self.dynamicViewModels.count-1];
                                [self.dynamicViewModels removeObjectAtIndex:0];
                                if(dynamicTempViewModels.count==1)
                                {
                                    DynamicModel * dynamicViewModel = [dynamicTempViewModels objectAtIndex:0];

 screendisplay/screendisplay/Supporting Files/Info.plist

@@ -17,9 +17,9 @@
    <key>CFBundlePackageType</key>
    <string>APPL</string>
    <key>CFBundleShortVersionString</key>
    <string>1.0</string>
    <string>1.0.1</string>
    <key>CFBundleVersion</key>
    <string>1.0</string>
    <string>1.0.1</string>
    <key>LSRequiresIPhoneOS</key>
    <true/>
    <key>NSAppTransportSecurity</key>