|
9 | 9 | import net.coding.program.common.Global;
|
10 | 10 | import net.coding.program.common.adapter.SearchMergeAdapter;
|
11 | 11 | import net.coding.program.common.network.RefreshBaseFragment;
|
12 |
| -import net.coding.program.model.Merge; |
13 | 12 | import net.coding.program.model.MergeObject;
|
14 | 13 | import net.coding.program.project.detail.merge.MergeDetailActivity_;
|
15 | 14 |
|
@@ -79,23 +78,8 @@ final void listView(MergeObject itemData) {
|
79 | 78 | return;
|
80 | 79 | }
|
81 | 80 |
|
82 |
| - Merge merge = new Merge(); |
83 |
| - merge.setId(itemData.getId()); |
84 |
| - merge.setSrcBranch(itemData.getSrcBranch()); |
85 |
| - merge.setDesBranch(itemData.getDesBranch()); |
86 |
| - merge.setCreated_at(itemData.getCreatedAt()); |
87 |
| - merge.setAuthor(itemData.getAuthor()); |
88 |
| - merge.setAction_at(itemData.getAction_at()); |
89 |
| - merge.setMerge_status(itemData.merge_status); |
90 |
| - merge.setContent(itemData.getBody()); |
91 |
| - merge.setIid(itemData.getIid()); |
92 |
| - merge.setTitle(itemData.getTitle()); |
93 |
| - merge.setPath(itemData.getPath()); |
94 |
| - Merge.ActionAuthor userObject = new Merge.ActionAuthor(); |
95 |
| - userObject.name = itemData.getAuthor().name; |
96 |
| - merge.setAction_author(userObject); |
97 |
| - MergeDetailActivity_.intent(this).mMerge(merge).start(); |
98 |
| - |
| 81 | + String url = String.format("%s%s", Global.HOST_API, itemData.getPath()); |
| 82 | + MergeDetailActivity_.intent(this).mMergeUrl(url).start(); |
99 | 83 | }
|
100 | 84 |
|
101 | 85 | public String getKeyword() {
|
|
0 commit comments