GithubStar/MMKV
1
0
Fork 0
mirror of https://github.com/Tencent/MMKV.git synced 2026-10-17 04:30:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge iOS to Core lib: most things actually work

Browse Source
This commit is contained in:
guoling
2019-12-23 21:30:56 +08:00
parent 728ee4c9c2
commit 59b064b8bf
54 changed files with 1553 additions and 6717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/MiniPBCoder.cpp
+54 -3
View File
@@ -100,7 +100,7 @@ void MiniPBCoder::writeRootObject() {
m_outputData->writeDouble(oDate.timeIntervalSince1970);
break;
}
#endif
#endif // MMKV_IOS_OR_MAC
case PBEncodeItemType_None: {
MMKVError("%d", encodeItem->type);
break;
@@ -249,7 +249,7 @@ MMBuffer MiniPBCoder::getEncodeData(__unsafe_unretained NSObject *obj) {
return move(*m_outputBuffer);
}
#endif
#endif // MMKV_IOS_OR_MAC
MMBuffer MiniPBCoder::getEncodeData(const string &str) {
m_encodeItems = new vector<PBEncodeItem>();
@@ -339,10 +339,21 @@ void MiniPBCoder::decodeOneMap(MMKVMap &dic, size_t size, bool greedy) {
#ifdef MMKV_IOS_OR_MAC
const auto &key = m_inputData->readNSString();
if (key.length > 0) {
auto value = m_inputData->readData();
if (value.length() > 0) {
dictionary[key] = move(value);
[key retain];
} else {
auto itr = dictionary.find(key);
if (itr != dictionary.end()) {
dictionary.erase(itr);
[itr->first release];
}
}
}
#else
const auto &key = m_inputData->readString();
if (key.length() > 0) {
#endif
auto value = m_inputData->readData();
if (value.length() > 0) {
dictionary[key] = move(value);
@@ -350,6 +361,7 @@ void MiniPBCoder::decodeOneMap(MMKVMap &dic, size_t size, bool greedy) {
dictionary.erase(key);
}
}
#endif
}
};
@@ -364,6 +376,11 @@ void MiniPBCoder::decodeOneMap(MMKVMap &dic, size_t size, bool greedy) {
MMKVMap tmpDic;
block(tmpDic);
dic.swap(tmpDic);
#ifdef MMKV_IOS_OR_MAC
for (auto &pair : tmpDic) {
[pair.first release];
}
#endif
} catch (std::exception &exception) {
MMKVError("%s", exception.what());
}
@@ -419,6 +436,40 @@ NSObject *MiniPBCoder::decodeObject(const MMBuffer &oData, Class cls) {
return nil;
}
bool MiniPBCoder::isCompatibleObject(NSObject *obj) {
if ([obj isKindOfClass:[NSString class]]) {
return true;
}
if ([obj isKindOfClass:[NSData class]]) {
return true;
}
if ([obj isKindOfClass:[NSDate class]]) {
return true;
}
return false;
}
bool MiniPBCoder::isCompatibleClass(Class cls) {
if (cls == [NSString class]) {
return true;
}
if (cls == [NSMutableString class]) {
return true;
}
if (cls == [NSData class]) {
return true;
}
if (cls == [NSMutableData class]) {
return true;
}
if (cls == [NSDate class]) {
return true;
}
return false;
}
#endif // MMKV_IOS_OR_MAC
} // namespace mmkv