فهرست منبع

1.完成一元捐基本的界面逻辑开发,接入支付宝,完成支付宝相关功能
2.移除测试数据
3.添加异常处理,提交测试

Bitliker 8 سال پیش
والد
کامیت
5ca484f7f8

+ 9 - 1
app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/CharitSearchActivity.java

@@ -15,6 +15,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
+import com.core.net.utils.NetUtils;
 import com.core.utils.IntentUtils;
 import com.core.utils.ToastUtil;
 import com.core.widget.EmptyLayout;
@@ -113,7 +114,10 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 	private String lastKeyWork;
 
 	private void loadActivity(final String keyWork) {
-
+		if (!NetUtils.isNetWorkConnected(ct)) {
+			ToastUtil.showToast(ct, R.string.networks_out);
+			return;
+		}
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("activities")
 				.add("keyWork", keyWork)
@@ -139,6 +143,10 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 
 
 	private void loadProjects(final String keyWork) {
+		if (!NetUtils.isNetWorkConnected(ct)) {
+			ToastUtil.showToast(ct, R.string.networks_out);
+			return;
+		}
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("projects")
 				.add("area", "全部")

+ 7 - 0
app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/JoinCharitActivity.java

@@ -17,8 +17,10 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
+import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
 import com.core.utils.IntentUtils;
+import com.core.utils.ToastUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
@@ -110,6 +112,11 @@ public class JoinCharitActivity extends BaseActivity {
 
 
 	private void initData() {
+		if (!NetUtils.isNetWorkConnected(ct)) {
+			ToastUtil.showToast(ct, R.string.networks_out);
+			return;
+		}
+		progressDialog.show();
 		HttpClient httpClient = new HttpClient.Builder(Constants.charitBaseUrl()).isDebug(true).build();
 		HttpClient builder = new HttpClient.Builder()
 				.url((type == 2 ? "joinActivity" : "donateDetail") + "/" + CommonUtil.getUUId())

+ 5 - 0
app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/ActivityFragment.java

@@ -24,6 +24,7 @@ import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.base.EasyFragment;
+import com.core.net.utils.NetUtils;
 import com.core.utils.IntentUtils;
 import com.core.utils.ToastUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -119,6 +120,10 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 	}
 
 	private void loadData(String keyWork, final String status) {
+		if (!NetUtils.isNetWorkConnected(ct)) {
+			ToastUtil.showToast(ct, R.string.networks_out);
+			return;
+		}
 		baseActivity.progressDialog.show();
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("activities")

+ 17 - 1
app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -21,6 +21,7 @@ import com.common.data.JSONUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.base.EasyFragment;
+import com.core.net.utils.NetUtils;
 import com.core.utils.IntentUtils;
 import com.core.utils.ToastUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
@@ -122,6 +123,11 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 	}
 
 	public void loadIndexData() {
+		if (!NetUtils.isNetWorkConnected(ct)) {
+			ToastUtil.showToast(ct, R.string.networks_out);
+			return;
+		}
+		baseActivity.progressDialog.show();
 		LogUtil.i("loadIndexData");
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("appIndex")
@@ -136,7 +142,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 				} catch (Exception e) {
 					if (e != null) {
 						LogUtil.i("e=" + e.getMessage());
-						ToastUtil.showToast(e.getMessage());
+						ToastUtil.showToast(ct, e.getMessage());
 					}
 				}
 				baseActivity.progressDialog.dismiss();
@@ -176,6 +182,11 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 
 
 	private void loadProjects(String area) {
+		if (!NetUtils.isNetWorkConnected(ct)) {
+			ToastUtil.showToast(ct, R.string.networks_out);
+			return;
+		}
+		baseActivity.progressDialog.show();
 		LogUtil.i("loadProjects=" + area);
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("projects")
@@ -299,6 +310,11 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 	}
 
 	private void loadOrderInfo(Double amount, CharitModel model) {
+		if (!NetUtils.isNetWorkConnected(ct)) {
+			ToastUtil.showToast(ct, R.string.networks_out);
+			return;
+		}
+		baseActivity.progressDialog.show();
 		if (model == null) {
 			ToastUtil.showToast(ct, "内部错误");
 			return;