From 0a397f834382491316d9efe993ebb89757c000b9 Mon Sep 17 00:00:00 2001
From: xuxiuxi <xuxiuxi@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期五, 28 四月 2017 16:16:09 +0800
Subject: [PATCH]
---
VisitFace/RtspNativeCodec/app/build/intermediates/blame/res/debug/multi/values.json | 131 +++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 56 deletions(-)
diff --git a/VisitFace/RtspNativeCodec/app/build/intermediates/blame/res/debug/multi/values.json b/VisitFace/RtspNativeCodec/app/build/intermediates/blame/res/debug/multi/values.json
index ab97d40..a26e865 100644
--- a/VisitFace/RtspNativeCodec/app/build/intermediates/blame/res/debug/multi/values.json
+++ b/VisitFace/RtspNativeCodec/app/build/intermediates/blame/res/debug/multi/values.json
@@ -14,12 +14,12 @@
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
"position": {
- "startLine": 22,
+ "startLine": 23,
"startColumn": 4,
- "startOffset": 945,
- "endLine": 25,
+ "startOffset": 996,
+ "endLine": 26,
"endColumn": 19,
- "endOffset": 1055
+ "endOffset": 1106
}
}
},
@@ -35,12 +35,12 @@
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
"position": {
- "startLine": 10,
+ "startLine": 11,
"startColumn": 4,
- "startOffset": 405,
- "endLine": 18,
+ "startOffset": 456,
+ "endLine": 19,
"endColumn": 19,
- "endOffset": 819
+ "endOffset": 870
}
}
},
@@ -49,8 +49,27 @@
"startLine": 15,
"startColumn": 4,
"startOffset": 589,
+ "endColumn": 50,
+ "endOffset": 635
+ },
+ "from": {
+ "file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
+ "position": {
+ "startLine": 7,
+ "startColumn": 4,
+ "startOffset": 276,
+ "endColumn": 50,
+ "endOffset": 322
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 16,
+ "startColumn": 4,
+ "startOffset": 640,
"endColumn": 48,
- "endOffset": 633
+ "endOffset": 684
},
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
@@ -65,11 +84,11 @@
},
{
"to": {
- "startLine": 16,
+ "startLine": 17,
"startColumn": 4,
- "startOffset": 638,
+ "startOffset": 689,
"endColumn": 48,
- "endOffset": 682
+ "endOffset": 733
},
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
@@ -84,39 +103,20 @@
},
{
"to": {
- "startLine": 17,
- "startColumn": 4,
- "startOffset": 687,
- "endColumn": 50,
- "endOffset": 733
- },
- "from": {
- "file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
- "position": {
- "startLine": 21,
- "startColumn": 4,
- "startOffset": 894,
- "endColumn": 50,
- "endOffset": 940
- }
- }
- },
- {
- "to": {
"startLine": 18,
"startColumn": 4,
"startOffset": 738,
- "endColumn": 68,
- "endOffset": 802
+ "endColumn": 50,
+ "endOffset": 784
},
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
"position": {
- "startLine": 20,
+ "startLine": 22,
"startColumn": 4,
- "startOffset": 825,
- "endColumn": 68,
- "endOffset": 889
+ "startOffset": 945,
+ "endColumn": 50,
+ "endOffset": 991
}
}
},
@@ -124,18 +124,18 @@
"to": {
"startLine": 19,
"startColumn": 4,
- "startOffset": 807,
- "endColumn": 54,
- "endOffset": 857
+ "startOffset": 789,
+ "endColumn": 68,
+ "endOffset": 853
},
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
"position": {
- "startLine": 9,
+ "startLine": 21,
"startColumn": 4,
- "startOffset": 350,
- "endColumn": 54,
- "endOffset": 400
+ "startOffset": 876,
+ "endColumn": 68,
+ "endOffset": 940
}
}
},
@@ -143,18 +143,18 @@
"to": {
"startLine": 20,
"startColumn": 4,
- "startOffset": 862,
- "endColumn": 72,
- "endOffset": 930
+ "startOffset": 858,
+ "endColumn": 54,
+ "endOffset": 908
},
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
"position": {
- "startLine": 8,
+ "startLine": 10,
"startColumn": 4,
- "startOffset": 277,
- "endColumn": 72,
- "endOffset": 345
+ "startOffset": 401,
+ "endColumn": 54,
+ "endOffset": 451
}
}
},
@@ -162,9 +162,28 @@
"to": {
"startLine": 21,
"startColumn": 4,
- "startOffset": 935,
+ "startOffset": 913,
+ "endColumn": 72,
+ "endOffset": 981
+ },
+ "from": {
+ "file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
+ "position": {
+ "startLine": 9,
+ "startColumn": 4,
+ "startOffset": 328,
+ "endColumn": 72,
+ "endOffset": 396
+ }
+ }
+ },
+ {
+ "to": {
+ "startLine": 22,
+ "startColumn": 4,
+ "startOffset": 986,
"endColumn": 68,
- "endOffset": 999
+ "endOffset": 1050
},
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
@@ -179,11 +198,11 @@
},
{
"to": {
- "startLine": 22,
+ "startLine": 23,
"startColumn": 4,
- "startOffset": 1004,
+ "startOffset": 1055,
"endColumn": 52,
- "endOffset": 1052
+ "endOffset": 1103
},
"from": {
"file": "D:\\workspace\\proxy\\VisitFace\\RtspNativeCodec\\app\\src\\main\\res\\values\\strings.xml",
--
Gitblit v1.8.0