Skip to content

Commit 9930788

Browse files
thinaaronthinaaron
committed
MD预览接口更换为新接口
1 parent 01f69d8 commit 9930788

8 files changed

Lines changed: 39 additions & 37 deletions

File tree

‎app/src/main/java/net/coding/program/common/base/MDEditFragment.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,6 @@ protected final void initBase1() {
6767
}
6868
hostUploadPhoto = String.format(template, path);
6969
}
70-
71-
hostUploadPhoto = "https://coding.net/api/project/99160/upload_public_image";
72-
hostUploadPhoto = "https://coding.net/api/user/8206503/project/deleteMR/upload_public_image";
7370
}
7471

7572
@Click

‎app/src/main/java/net/coding/program/model/ProjectObject.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ public static String getTitle(boolean isPull) {
9191
return isPull ? "Pull Request" : "Merge Request";
9292
}
9393

94+
public static String getMdPreview(String projectPath) {
95+
final String HOST_PREVIEW = Global.HOST_API + "%s/project_preview_anchor";
96+
return String.format(HOST_PREVIEW, projectPath);
97+
}
98+
9499
public void setReadActivities() {
95100
un_read_activities_count = 0;
96101
}
@@ -144,7 +149,7 @@ public String getHttpProjectObject() {
144149
}
145150

146151
public String getProjectPath() {
147-
return backend_project_path;
152+
return translatePath(backend_project_path);
148153
}
149154

150155
public boolean isMy() {

‎app/src/main/java/net/coding/program/project/detail/TopicAddActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ public void exit() {
221221

222222
@Override
223223
public String getProjectPath() {
224-
return projectObject.getPath();
224+
return projectObject.getProjectPath();
225225
}
226226

227227
@Override

‎app/src/main/java/net/coding/program/project/detail/TopicPreviewFragment.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import net.coding.program.R;
99
import net.coding.program.common.Global;
1010
import net.coding.program.common.network.BaseFragment;
11+
import net.coding.program.model.ProjectObject;
1112
import net.coding.program.model.TopicLabelObject;
1213
import net.coding.program.project.detail.TopicEditFragment.SaveData;
13-
import net.coding.program.task.TaskDescripHtmlFragment;
1414

1515
import org.androidannotations.annotations.AfterViews;
1616
import org.androidannotations.annotations.EFragment;
@@ -26,13 +26,13 @@
2626
@OptionsMenu(R.menu.topic_detail_edit_preview)
2727
public class TopicPreviewFragment extends BaseFragment {
2828

29+
private static final String TAG_HTTP_MD_PREVIEW = "TAG_HTTP_MD_PREVIEW";
2930
@ViewById
3031
protected TextView title;
3132
@ViewById
3233
protected TopicLabelBar labelBar;
3334
@ViewById
3435
protected WebView content;
35-
3636
private SaveData saveData;
3737

3838
@AfterViews
@@ -68,7 +68,7 @@ protected void action_save() {
6868

6969
@Override
7070
public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
71-
if (tag.equals(TaskDescripHtmlFragment.HOST_PREVIEW)) {
71+
if (tag.equals(TAG_HTTP_MD_PREVIEW)) {
7272
if (code == 0) {
7373
String html = respanse.optString("data", "");
7474
Global.setWebViewContent(content, "topic-android", html);
@@ -82,6 +82,7 @@ public void parseJson(int code, JSONObject respanse, String tag, int pos, Object
8282
private void mdToHtml(String contentMd) {
8383
RequestParams params = new RequestParams();
8484
params.put("content", contentMd);
85-
postNetwork(TaskDescripHtmlFragment.HOST_PREVIEW, params, TaskDescripHtmlFragment.HOST_PREVIEW);
85+
String uri = ProjectObject.getMdPreview(saveData.getProjectPath());
86+
postNetwork(uri, params, TAG_HTTP_MD_PREVIEW);
8687
}
8788
}

‎app/src/main/java/net/coding/program/task/TaskAddActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,13 +254,14 @@ public View getView(int position, View convertView, ViewGroup parent) {
254254
}
255255
}
256256
};
257+
257258
private View.OnClickListener onClickCreateDescription = new View.OnClickListener() {
258259
@Override
259260
public void onClick(View v) {
260261
TaskDescriptionActivity_
261262
.intent(TaskAddActivity.this)
262263
.taskId(0)
263-
.projectId(mSingleTask.project.getId())
264+
.projectPath(mSingleTask.project.getProjectPath())
264265
.descriptionData(descriptionDataNew)
265266
.startForResult(RESULT_REQUEST_DESCRIPTION_CREATE);
266267
}
@@ -781,7 +782,7 @@ public void onClick(View v) {
781782
.intent(TaskAddActivity.this)
782783
.descriptionData(descriptionDataNew)
783784
.taskId(mSingleTask.getId())
784-
.projectId(mSingleTask.project.getId())
785+
.projectPath(mSingleTask.project.getProjectPath())
785786
.startForResult(RESULT_REQUEST_DESCRIPTION);
786787
}
787788
});

‎app/src/main/java/net/coding/program/task/TaskDescripHtmlFragment.java‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import net.coding.program.common.Global;
1616
import net.coding.program.common.network.BaseFragment;
1717
import net.coding.program.maopao.MaopaoDetailActivity;
18+
import net.coding.program.model.ProjectObject;
19+
import net.coding.program.project.detail.TopicEditFragment;
1820

1921
import org.androidannotations.annotations.AfterViews;
2022
import org.androidannotations.annotations.EFragment;
@@ -27,37 +29,18 @@
2729
@EFragment(R.layout.fragment_task_descrip_html)
2830
public class TaskDescripHtmlFragment extends BaseFragment {
2931

32+
private static final String TAG_HTTP_MD_PREVIEW = "TAG_HTTP_MD_PREVIEW";
3033
@ViewById
3134
WebView descWeb;
32-
3335
@ViewById
3436
View loading;
35-
3637
@FragmentArg
3738
String contentMd = "";
38-
3939
@FragmentArg
4040
String contentHtml = "";
41-
4241
@FragmentArg
4342
boolean preview = false;
44-
4543
ActionMode mActionMode;
46-
47-
@AfterViews
48-
void init() {
49-
setHasOptionsMenu(true);
50-
51-
Global.syncCookie(getActivity());
52-
53-
if (contentHtml.isEmpty()) {
54-
mdToHtml();
55-
mActionMode = getActivity().startActionMode(mActionModeCallback);
56-
} else {
57-
displayWebView();
58-
}
59-
}
60-
6144
private ActionMode.Callback mActionModeCallback = new ActionMode.Callback() {
6245

6346
int id = 0;
@@ -110,6 +93,20 @@ public void onDestroyActionMode(ActionMode mode) {
11093
}
11194
};
11295

96+
@AfterViews
97+
void init() {
98+
setHasOptionsMenu(true);
99+
100+
Global.syncCookie(getActivity());
101+
102+
if (contentHtml.isEmpty()) {
103+
mdToHtml();
104+
mActionMode = getActivity().startActionMode(mActionModeCallback);
105+
} else {
106+
displayWebView();
107+
}
108+
}
109+
113110
private void displayWebView() {
114111
String locateHtml = ((TaskDescrip) getActivity()).createLocateHtml(contentHtml);
115112

@@ -122,7 +119,6 @@ private void displayWebView() {
122119
descWeb.loadDataWithBaseURL(Global.HOST, locateHtml, "text/html", "UTF-8", null);
123120
}
124121

125-
public static final String HOST_PREVIEW = Global.HOST + "/api/markdown/preview";
126122

127123
@Override
128124
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
@@ -134,7 +130,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
134130

135131
@Override
136132
public void parseJson(int code, JSONObject respanse, String tag, int pos, Object data) throws JSONException {
137-
if (tag.equals(HOST_PREVIEW)) {
133+
if (tag.equals(TAG_HTTP_MD_PREVIEW)) {
138134
if (code == 0) {
139135
contentHtml = respanse.optString("data", "");
140136
displayWebView();
@@ -151,7 +147,9 @@ private void mdToHtml() {
151147

152148
RequestParams params = new RequestParams();
153149
params.put("content", contentMd);
154-
postNetwork(HOST_PREVIEW, params, HOST_PREVIEW);
150+
String projectPath = ((TopicEditFragment.SaveData) getActivity()).getProjectPath();
151+
String uri = ProjectObject.getMdPreview(projectPath);
152+
postNetwork(uri, params, TAG_HTTP_MD_PREVIEW);
155153
}
156154

157155
@OptionsItem

‎app/src/main/java/net/coding/program/task/TaskDescriptionActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ public class TaskDescriptionActivity extends BaseActivity implements TaskDescrip
3434
int taskId;
3535

3636
@Extra
37-
int projectId;
37+
String projectPath;
38+
// int projectId;
3839

3940
String HOST_DESCRIPTION = Global.HOST + "/api/task/%s/description";
4041

@@ -140,7 +141,7 @@ public void exit() {
140141

141142
@Override
142143
public String getProjectPath() {
143-
return String.valueOf(projectId);
144+
return projectPath;
144145
}
145146

146147
// 有任务的项目必定是私有项目

‎app/src/main/res/layout/commit_file_list_head.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
android:layout_marginLeft="12dp"
1818
android:layout_marginRight="12dp"
1919
android:layout_marginTop="@dimen/padding_15"
20-
android:maxLines="2"
2120
android:text="Medium Text"
2221
android:textColor="@color/font_black_content"
2322
android:textSize="20sp" />

0 commit comments

Comments
 (0)