GithubStar/Tangram-Android
1
0
Fork 0
mirror of https://github.com/alibaba/Tangram-Android.git synced 2026-10-17 05:07:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix insert error

Browse Source
This commit is contained in:
longerian
2018-01-26 16:27:56 +08:00
parent f0620580ff
commit 1a11dea313
2 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tangram/src/main/java/com/tmall/wireless/tangram/TangramEngine.java
+47 -34
View File
@@ -520,6 +520,9 @@ public class TangramEngine extends BaseTangramEngine<JSONArray, Card, BaseCell>
public void insertWith(int insertPosition, List<BaseCell> list) {
int newItemSize = list != null ? list.size() : 0;
if (newItemSize > 0 && mGroupBasicAdapter != null) {
if (insertPosition >= mGroupBasicAdapter.getItemCount()) {
insertPosition = mGroupBasicAdapter.getItemCount() - 1;
}
BaseCell insertCell = mGroupBasicAdapter.getItemByPosition(insertPosition);
int cardIdx = mGroupBasicAdapter.findCardIdxFor(insertPosition);
Card card = mGroupBasicAdapter.getCardRange(cardIdx).second;
@@ -562,7 +565,11 @@ public class TangramEngine extends BaseTangramEngine<JSONArray, Card, BaseCell>
for (int i = 0, size = groups.size(); i < size; i++) {
insertedLayoutHelpers.add(groups.get(i).getLayoutHelper());
}
newLayoutHelpers.addAll(insertIdx, insertedLayoutHelpers);
if (insertIdx >= layoutHelpers.size()) {
newLayoutHelpers.addAll(insertedLayoutHelpers);
} else {
newLayoutHelpers.addAll(insertIdx, insertedLayoutHelpers);
}
layoutManager.setLayoutHelpers(newLayoutHelpers, false);
mGroupBasicAdapter.insertBatchComponents(insertIdx, groups);
}
@@ -585,8 +592,10 @@ public class TangramEngine extends BaseTangramEngine<JSONArray, Card, BaseCell>
*/
public void removeBy(int position) {
if (mGroupBasicAdapter != null) {
BaseCell removeCell = mGroupBasicAdapter.getItemByPosition(position);
removeBy(removeCell);
if (position < mGroupBasicAdapter.getItemCount() && position >= 0) {
BaseCell removeCell = mGroupBasicAdapter.getItemByPosition(position);
removeBy(removeCell);
}
}
}
@@ -599,36 +608,38 @@ public class TangramEngine extends BaseTangramEngine<JSONArray, Card, BaseCell>
VirtualLayoutManager layoutManager = getLayoutManager();
if (data != null && mGroupBasicAdapter != null && layoutManager != null) {
int removePosition = mGroupBasicAdapter.getPositionByItem(data);
int cardIdx = mGroupBasicAdapter.findCardIdxFor(removePosition);
Card card = mGroupBasicAdapter.getCardRange(cardIdx).second;
card.removeCellSilently(data);
List<LayoutHelper> layoutHelpers = layoutManager.getLayoutHelpers();
LayoutHelper emptyLayoutHelper = null;
if (layoutHelpers != null && cardIdx >= 0 && cardIdx < layoutHelpers.size()) {
for (int i = 0, size = layoutHelpers.size(); i < size; i++) {
LayoutHelper layoutHelper = layoutHelpers.get(i);
int start = layoutHelper.getRange().getLower();
int end = layoutHelper.getRange().getUpper();
if (end < removePosition) {
//do nothing
} else if (start <= removePosition && removePosition <= end) {
int itemCount = layoutHelper.getItemCount() - 1;
if (itemCount > 0) {
layoutHelper.setItemCount(itemCount);
layoutHelper.setRange(start, end - 1);
} else {
emptyLayoutHelper = layoutHelper;
if (removePosition >= 0) {
int cardIdx = mGroupBasicAdapter.findCardIdxFor(removePosition);
Card card = mGroupBasicAdapter.getCardRange(cardIdx).second;
card.removeCellSilently(data);
List<LayoutHelper> layoutHelpers = layoutManager.getLayoutHelpers();
LayoutHelper emptyLayoutHelper = null;
if (layoutHelpers != null && cardIdx >= 0 && cardIdx < layoutHelpers.size()) {
for (int i = 0, size = layoutHelpers.size(); i < size; i++) {
LayoutHelper layoutHelper = layoutHelpers.get(i);
int start = layoutHelper.getRange().getLower();
int end = layoutHelper.getRange().getUpper();
if (end < removePosition) {
//do nothing
} else if (start <= removePosition && removePosition <= end) {
int itemCount = layoutHelper.getItemCount() - 1;
if (itemCount > 0) {
layoutHelper.setItemCount(itemCount);
layoutHelper.setRange(start, end - 1);
} else {
emptyLayoutHelper = layoutHelper;
}
} else if (removePosition < start) {
layoutHelper.setRange(start - 1, end - 1);
}
} else if (removePosition < start) {
layoutHelper.setRange(start - 1, end - 1);
}
if (emptyLayoutHelper != null) {
final List<LayoutHelper> newLayoutHelpers = new LinkedList<>(layoutHelpers);
newLayoutHelpers.remove(emptyLayoutHelper);
layoutManager.setLayoutHelpers(newLayoutHelpers, false);
}
mGroupBasicAdapter.removeComponent(data);
}
if (emptyLayoutHelper != null) {
final List<LayoutHelper> newLayoutHelpers = new LinkedList<>(layoutHelpers);
newLayoutHelpers.remove(emptyLayoutHelper);
layoutManager.setLayoutHelpers(newLayoutHelpers, false);
}
mGroupBasicAdapter.removeComponent(data);
}
}
}
@@ -693,10 +704,12 @@ public class TangramEngine extends BaseTangramEngine<JSONArray, Card, BaseCell>
VirtualLayoutManager layoutManager = getLayoutManager();
if (oldOne != null && newOne != null && mGroupBasicAdapter != null && layoutManager != null) {
int replacePosition = mGroupBasicAdapter.getPositionByItem(oldOne);
int cardIdx = mGroupBasicAdapter.findCardIdxFor(replacePosition);
Card card = mGroupBasicAdapter.getCardRange(cardIdx).second;
card.replaceCell(oldOne, newOne);
mGroupBasicAdapter.replaceComponent(Arrays.asList(oldOne), Arrays.asList(newOne));
if (replacePosition >= 0) {
int cardIdx = mGroupBasicAdapter.findCardIdxFor(replacePosition);
Card card = mGroupBasicAdapter.getCardRange(cardIdx).second;
card.replaceCell(oldOne, newOne);
mGroupBasicAdapter.replaceComponent(Arrays.asList(oldOne), Arrays.asList(newOne));
}
}
}
tangram/src/main/java/com/tmall/wireless/tangram/dataparser/concrete/PojoGroupBasicAdapter.java
+3 -3
View File
@@ -472,7 +472,7 @@ public class PojoGroupBasicAdapter extends GroupBasicAdapter<Card, BaseCell> {
} else if (start <= pos && pos < end) {
Pair<Range<Integer>, Card> newPair = new Pair<>(Range.create(start, end + newItemSize), pair.second);
newCards.add(newPair);
} else if (pos < start) {
} else if (pos <= start) {
Pair<Range<Integer>, Card> newPair = new Pair<>(Range.create(start + newItemSize, end + newItemSize), pair.second);
newCards.add(newPair);
}
@@ -570,7 +570,7 @@ public class PojoGroupBasicAdapter extends GroupBasicAdapter<Card, BaseCell> {
diff = newComponent.size() - oldComponent.size();
Pair<Range<Integer>, Card> newPair = new Pair<>(Range.create(start, end + diff), pair.second);
newCards.add(newPair);
} else if (index < start) {
} else if (index <= start) {
Pair<Range<Integer>, Card> newPair = new Pair<>(Range.create(start + diff, end + diff), pair.second);
newCards.add(newPair);
}
@@ -608,7 +608,7 @@ public class PojoGroupBasicAdapter extends GroupBasicAdapter<Card, BaseCell> {
diff = newComponent.size() - oldComponent.size();
Pair<Range<Integer>, Card> newPair = new Pair<>(Range.create(start, end + diff), newGroup);
newCards.add(newPair);
} else if (index < start) {
} else if (index <= start) {
Pair<Range<Integer>, Card> newPair = new Pair<>(Range.create(start + diff, end + diff), pair.second);
newCards.add(newPair);
}