完成一元捐基本的界面逻辑开发，接入支付宝,完成支付宝相关功能

app_modular/appmessages/src/main/java/com/modular/appmessages/activity/MessageWebActivity.java

@@ -3,6 +3,7 @@ package com.modular.appmessages.activity;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.http.SslError;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -13,6 +14,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.ProgressBar;
+import android.widget.ZoomButtonsController;
 
 import com.common.system.SystemUtil;
 import com.core.base.BaseActivity;
@@ -23,136 +25,166 @@ import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 
+import java.lang.reflect.Field;
+
 public class MessageWebActivity extends BaseActivity {
 
 
-    private WebView webViewRefresh;
-    private ProgressBar progressBar;
-    private String url;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_message_web);
-        webViewRefresh = (WebView) findViewById(R.id.webView);
-        progressBar = (ProgressBar) findViewById(R.id.progressBar);
-        initView();
-        initData();
-    }
-
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        if (getIntent() != null && getIntent().getBooleanExtra(IntentUtils.KEY_NEER_SHARE, false)) {
-            getMenuInflater().inflate(R.menu.menu_about, menu);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (R.id.app_about == item.getItemId()) {
-            String title = getSupportActionBar().getTitle().toString();
-            String content = null;
-            String imageUrl = null;
-            Intent intent = getIntent();
-            if (intent != null) {
-                content = intent.getStringExtra(IntentUtils.KEY_SHARE_CONTENT);
-                imageUrl = intent.getStringExtra(IntentUtils.KEY_SHARE_IMAGE);
-            }
-            if (content == null) {
-                content = "UU互联 Android客户端" + SystemUtil.getVersionName(mContext);
-                imageUrl = "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png";
-            }
-            new ShareAction(activity).setDisplayList(
-                    SHARE_MEDIA.SINA,
-                    SHARE_MEDIA.QQ,
-                    SHARE_MEDIA.QZONE,
-                    SHARE_MEDIA.WEIXIN,
-                    SHARE_MEDIA.WEIXIN_CIRCLE,
-                    SHARE_MEDIA.WEIXIN_FAVORITE,
-                    SHARE_MEDIA.MORE)
-                    .withTitle(title)
-                    .withText(content)
-                    .withMedia(new UMImage(activity, imageUrl))
-                    .withTargetUrl(url)
-                    .setCallback(CommonUtil.umShareListener)
-                    .open();
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void initView() {
-        webViewRefresh.getSettings().setJavaScriptEnabled(true);
-        webViewRefresh.getSettings().setSupportZoom(true);
-        webViewRefresh.getSettings().setBuiltInZoomControls(true);
-        webViewRefresh.getSettings().setUseWideViewPort(true);
-        webViewRefresh.getSettings().setDomStorageEnabled(true);
-        webViewRefresh.getSettings().setLoadWithOverviewMode(true);
-        webViewRefresh.getSettings().setDefaultTextEncodingName("utf-8");
-        webViewRefresh.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
-        webViewRefresh.clearCache(true);
-        webViewRefresh.clearHistory();
-        webViewRefresh.setWebViewClient(new WebViewClient() {
-            public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                view.loadUrl(url);
-                return true;
-            }
-
-            @Override
-            public void onPageStarted(WebView view, String url, Bitmap favicon) {
-                if (progressBar.getVisibility() == View.GONE) {
-                    progressBar.setVisibility(View.VISIBLE);
-                }
-            }
-
-            @Override
-            public void onPageFinished(WebView view, String url) {
-                if (progressBar.getVisibility() == View.VISIBLE) {
-                    progressBar.setVisibility(View.GONE);
-                }
-            }
-
-            @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
-                handler.proceed();
-            }
-        });
-        webViewRefresh.setWebChromeClient(new WebChromeClient() {
-            @Override
-            public void onProgressChanged(WebView view, int newProgress) {
-                progressBar.setProgress(newProgress);
-                if (newProgress == 100) {
-                    progressBar.setProgress(newProgress);
-                    progressBar.setVisibility(View.GONE);
-                }
-                super.onProgressChanged(view, newProgress);
-            }
-        });
+	private WebView webViewRefresh;
+	private ProgressBar progressBar;
+	private String url;
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.activity_message_web);
+		webViewRefresh = (WebView) findViewById(R.id.webView);
+		progressBar = (ProgressBar) findViewById(R.id.progressBar);
+		initView();
+		initData();
+	}
+
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		if (getIntent() != null && getIntent().getBooleanExtra(IntentUtils.KEY_NEER_SHARE, false)) {
+			getMenuInflater().inflate(R.menu.menu_about, menu);
+		}
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		if (R.id.app_about == item.getItemId()) {
+			String title = getSupportActionBar().getTitle().toString();
+			String content = null;
+			String imageUrl = null;
+			Intent intent = getIntent();
+			if (intent != null) {
+				content = intent.getStringExtra(IntentUtils.KEY_SHARE_CONTENT);
+				imageUrl = intent.getStringExtra(IntentUtils.KEY_SHARE_IMAGE);
+			}
+			if (content == null) {
+				content = "UU互联 Android客户端" + SystemUtil.getVersionName(mContext);
+				imageUrl = "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png";
+			}
+			new ShareAction(activity).setDisplayList(
+					SHARE_MEDIA.SINA,
+					SHARE_MEDIA.QQ,
+					SHARE_MEDIA.QZONE,
+					SHARE_MEDIA.WEIXIN,
+					SHARE_MEDIA.WEIXIN_CIRCLE,
+					SHARE_MEDIA.WEIXIN_FAVORITE,
+					SHARE_MEDIA.MORE)
+					.withTitle(title)
+					.withText(content)
+					.withMedia(new UMImage(activity, imageUrl))
+					.withTargetUrl(url)
+					.setCallback(CommonUtil.umShareListener)
+					.open();
+		}
+		return super.onOptionsItemSelected(item);
+	}
+
+	private void initView() {
+		webViewRefresh.getSettings().setJavaScriptEnabled(true);
+		webViewRefresh.getSettings().setSupportZoom(true);
+		webViewRefresh.getSettings().setBuiltInZoomControls(true);
+		webViewRefresh.getSettings().setUseWideViewPort(true);
+		webViewRefresh.getSettings().setDomStorageEnabled(true);
+		webViewRefresh.getSettings().setLoadWithOverviewMode(true);
+		webViewRefresh.getSettings().setDefaultTextEncodingName("utf-8");
+		webViewRefresh.getSettings().setCacheMode(WebSettings.LOAD_NO_CACHE);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+			webViewRefresh.getSettings().setDisplayZoomControls(false);
+		} else {
+			setZoomControlGone();
+		}
+		webViewRefresh.clearCache(true);
+		webViewRefresh.clearHistory();
+		webViewRefresh.setWebViewClient(new WebViewClient() {
+			public boolean shouldOverrideUrlLoading(WebView view, String url) {
+				view.loadUrl(url);
+				return true;
+			}
+
+			@Override
+			public void onPageStarted(WebView view, String url, Bitmap favicon) {
+				if (progressBar.getVisibility() == View.GONE) {
+					progressBar.setVisibility(View.VISIBLE);
+				}
+			}
+
+			@Override
+			public void onPageFinished(WebView view, String url) {
+				if (progressBar.getVisibility() == View.VISIBLE) {
+					progressBar.setVisibility(View.GONE);
+				}
+			}
+
+			@Override
+			public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+				handler.proceed();
+			}
+		});
+		webViewRefresh.setWebChromeClient(new WebChromeClient() {
+			@Override
+			public void onProgressChanged(WebView view, int newProgress) {
+				progressBar.setProgress(newProgress);
+				if (newProgress == 100) {
+					progressBar.setProgress(newProgress);
+					progressBar.setVisibility(View.GONE);
+				}
+				super.onProgressChanged(view, newProgress);
+			}
+		});
 //        webViewRefresh.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener<WebView>() {
 //            @Override
 //            public void onRefresh(PullToRefreshBase<WebView> refreshView) {
 //                loadData();
 //            }
 //        });
-    }
-
-    private void initData() {
-        Intent intent = getIntent();
-        if (intent != null) {
-            url = intent.getStringExtra(IntentUtils.KEY_URL);
-            String title = intent.getStringExtra(IntentUtils.KEY_TITLE);
-            if (title != null) {
-                getSupportActionBar().setTitle(title);
-            }
-        }
-        loadData();
-    }
-
-    private void loadData() {
-        if (url != null) {
-            webViewRefresh.loadUrl(url);
-        }
-
-    }
+	}
+
+	public void setZoomControlGone() {
+		Class classType;
+		Field field;
+		try {
+			classType = WebView.class;
+			field = classType.getDeclaredField("mZoomButtonsController");
+			field.setAccessible(true);
+			ZoomButtonsController mZoomButtonsController = new ZoomButtonsController(webViewRefresh);
+			mZoomButtonsController.getZoomControls().setVisibility(View.GONE);
+			try {
+				field.set(webViewRefresh, mZoomButtonsController);
+			} catch (IllegalArgumentException e) {
+				e.printStackTrace();
+			} catch (IllegalAccessException e) {
+				e.printStackTrace();
+			}
+		} catch (SecurityException e) {
+			e.printStackTrace();
+		} catch (NoSuchFieldException e) {
+			e.printStackTrace();
+		}
+	}
+
+	private void initData() {
+		Intent intent = getIntent();
+		if (intent != null) {
+			url = intent.getStringExtra(IntentUtils.KEY_URL);
+			String title = intent.getStringExtra(IntentUtils.KEY_TITLE);
+			if (title != null) {
+				getSupportActionBar().setTitle(title);
+			}
+		}
+		loadData();
+	}
+
+	private void loadData() {
+		if (url != null) {
+			webViewRefresh.loadUrl(url);
+		}
+
+	}
 }

app_modular/apputils/build.gradle

@@ -24,5 +24,6 @@ dependencies {
     compile deps.appcompatV7
     compile project(':common')
     compile project(':network')
-
+    //接入微信支付
+//    compile 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
 }

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/CharitSearchActivity.java

@@ -82,7 +82,7 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 					if (charitableAdapter != null) {
 						CharitModel model = charitableAdapter.getModels(i);
 						if (model != null) {
-							IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_PROJECT_URL + "/" + model.getId(), model.getName());
+							IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_PROJECT_URL + "?pro_id=" + model.getId(), model.getName());
 						}
 					}
 				} else {
@@ -129,8 +129,6 @@ public class CharitSearchActivity extends BaseActivity implements OnPlayListener
 				try {
 					if (o != null) {
 						handlerData(o.toString());
-					} else {
-						handlerData(TestString.PROJECTS_DATA);
 					}
 				} catch (Exception e) {
 					if (e != null) {

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/activity/JoinCharitActivity.java

@@ -74,10 +74,14 @@ public class JoinCharitActivity extends BaseActivity {
 			@Override
 			public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
 				if (mAdapter != null) {
+					LogUtil.i("i=" + i);
+					LogUtil.i("l=" + l);
 					JoinModel model = mAdapter.getModel((int) l);
 					if (model != null) {
 						IntentUtils.linkCommonWeb(ct,
-								(type == 2 ? Constants.BASE_CHARIT_ACTIVITY_URL : Constants.BASE_CHARIT_PROJECT_URL) + "/" + model.getId()
+								(type == 2 ? Constants.BASE_CHARIT_ACTIVITY_URL
+										: Constants.BASE_CHARIT_PROJECT_URL) +
+										"?pro_id=" + model.getId()
 								, model.getName());
 					}
 				}

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/JoinCharitAdapter.java

@@ -7,8 +7,10 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.baidu.cyberplayer.utils.G;
 import com.common.LogUtil;
 import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.uas.appworks.OA.platform.model.JoinModel;
 import com.uas.appworks.R;
 
@@ -25,7 +27,7 @@ public class JoinCharitAdapter extends BaseAdapter {
 
 
 	public JoinModel getModel(int i) {
-		if (ListUtils.getSize(models)>i){
+		if (ListUtils.getSize(models) > i && i >= 0) {
 			return models.get(i);
 		}
 		return null;
@@ -75,11 +77,16 @@ public class JoinCharitAdapter extends BaseAdapter {
 		JoinModel model = models.get(i);
 		holder.nameTv.setText(model.getName());
 		holder.statusTv.setText(model.getStatus());
-		holder.timeTv.setText(model.getTime());
+		if (StringUtil.isEmpty(model.getTime())) {
+			holder.timeTv.setVisibility(View.GONE);
+		} else {
+			holder.timeTv.setVisibility(View.VISIBLE);
+			holder.timeTv.setText(model.getTime());
+		}
 		holder.subTv.setText(model.getSub());
 		if (type == 1) {
 			holder.amountTv.setVisibility(View.VISIBLE);
-			LogUtil.i("Amount"+model.getAmount());
+			LogUtil.i("Amount" + model.getAmount());
 			holder.amountTv.setText(String.valueOf(model.getAmount()));
 		} else {
 			holder.amountTv.setVisibility(View.GONE);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/adapter/TypeAdapter.java

@@ -64,8 +64,10 @@ public class TypeAdapter extends BaseAdapter implements View.OnClickListener {
 		}
 		if (selectPostion == i) {
 			hodler.typeBtn.setBackgroundResource(R.drawable.text_frame_circle_red_bg);
+			hodler.typeBtn.setTextColor(ct.getResources().getColor(R.color.indianred));
 		} else {
 			hodler.typeBtn.setBackgroundResource(R.drawable.text_frame_circle_bg);
+			hodler.typeBtn.setTextColor(ct.getResources().getColor(R.color.hintColor));
 		}
 		hodler.typeBtn.setTag(i);
 		hodler.typeBtn.setOnClickListener(this);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/ActivityFragment.java

@@ -105,10 +105,11 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 			public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
 				if (mAdapter != null && ListUtils.getSize(mAdapter.getModels()) > i) {
 					CharitActModel model = mAdapter.getModels().get(i);
-					IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_ACTIVITY_URL + "/" + model.getId(), model.getName());
+					IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_ACTIVITY_URL + "?pro_id=" + model.getId(), model.getName());
 				}
 			}
 		});
+		setAdapter(null);
 		initData();
 	}
 
@@ -126,7 +127,7 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 	}
 
 	private void loadData(String keyWork, final String status) {
-		LogUtil.i("loadProjects=");
+		baseActivity.progressDialog.show();
 		httpClient.Api().send(new HttpClient.Builder()
 				.url("activities")
 				.add("keyWork", keyWork)
@@ -138,8 +139,6 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 				try {
 					if (o != null) {
 						handlerData(o.toString(), status);
-					} else {
-						handlerData(TestString.PROJECTS_DATA, status);
 					}
 				} catch (Exception e) {
 					if (e != null) {
@@ -169,19 +168,11 @@ public class ActivityFragment extends EasyFragment implements View.OnClickListen
 	}
 
 	private void setAdapter(String status, List<CharitActModel> models) {
-		String newtime = DateFormatUtil.long2Str("yyyy.MM.dd HH:mm");
+//		String newtime = DateFormatUtil.long2Str("yyyy.MM.dd HH:mm");
 		List<CharitActModel> showModels = new ArrayList<>();
 		if (!"全部".equals(status)) {
 			for (CharitActModel model : models) {
-				if (newtime.compareTo(model.getStartTime()) < 0) {
-					if (status.equals("未开始")) {
-						showModels.add(model);
-					}
-				} else if (newtime.compareTo(model.getEndTime()) > 0) {
-					if (status.equals("已结束")) {
-						showModels.add(model);
-					}
-				} else if (status.equals("进行中")) {
+				if (status.equals(model.getStage())) {
 					showModels.add(model);
 				}
 			}

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/fragment/CharitableListFragment.java

@@ -121,7 +121,7 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 
 	private void loadData() {
 		baseActivity.progressDialog.show();
-		LogUtil.i("loadData");
+		setContantData(null);
 		loadIndexData();
 		loadProjects("全部");
 	}
@@ -165,18 +165,15 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 		moneyAmountTv.setText(totality);
 		JSONObject o;
 		List<Carousel> list = new ArrayList<>();
-		if (BaseConfig.isDebug() && ListUtils.isEmpty(carouselList)) {
-			carouselList = JSONUtil.getJSONArray(TestString.INDEX_DATA, "carouselList");
-		}
 		for (int i = 0; i < carouselList.size(); i++) {
 			o = carouselList.getJSONObject(i);
-			Carousel c = new Carousel(JSONUtil.getInt(o, "proId"), JSONUtil.getText(o, "text"), JSONUtil.getText(o, "img"));
+			Carousel c = new Carousel(JSONUtil.getInt(o, "id"),
+					JSONUtil.getText(o, "body"),
+					JSONUtil.getText(o, "pictureUrl"));
 			LogUtil.i("c=" + JSON.toJSONString(c));
 			list.add(c);
 		}
-		LogUtil.i("list=" + list.size());
 		setBannerData(list);
-
 		List<String> areaList = new ArrayList<>();
 		allArea.add(0, "全部");
 		for (int i = 0; i < allArea.size(); i++) {
@@ -203,8 +200,6 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 				try {
 					if (o != null) {
 						handlerProjects(o.toString());
-					} else {
-						handlerProjects(TestString.PROJECTS_DATA);
 					}
 				} catch (Exception e) {
 					if (e != null) {
@@ -237,8 +232,10 @@ public class CharitableListFragment extends EasyFragment implements OnPlayListen
 			autoPlayPagerAdapter = new AutoPlayPagerAdapter(ct, models, new AutoPlayPagerAdapter.ItemClickListener() {
 				@Override
 				public void clickItem(Carousel carousel) {
-					LogUtil.i("carousel=" + JSON.toJSONString(carousel));
-					IntentUtils.linkCommonWeb(ct, Constants.BASE_CHARIT_PROJECT_URL);
+					IntentUtils.linkCommonWeb(ct,
+							Constants.BASE_CHARIT_PROJECT_URL + "?pro_id=" + carousel.getId(),
+							carousel.getText());
+
 				}
 			});
 			banner.setAdapter(autoPlayPagerAdapter);

app_modular/appworks/src/main/java/com/uas/appworks/OA/platform/model/CharitActModel.java

@@ -39,7 +39,7 @@ public class CharitActModel {
 	private String receiveEndTime;
 	private int receivePerson;
 	private long receiveStartTime;
-	private int stage;
+	private String stage;
 	private String startTime;
 	private List<AwardsBean> awards;
 
@@ -139,11 +139,11 @@ public class CharitActModel {
 		this.receiveStartTime = receiveStartTime;
 	}
 
-	public int getStage() {
+	public String getStage() {
 		return stage;
 	}
 
-	public void setStage(int stage) {
+	public void setStage(String stage) {
 		this.stage = stage;
 	}
 

app_modular/appworks/src/main/java/com/uas/appworks/widget/SelectPlayPop.java

@@ -9,8 +9,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.PopupWindow;
+import android.widget.RadioButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
@@ -63,6 +65,19 @@ public class SelectPlayPop {
 		final CheckBox agreeCb = (CheckBox) view.findViewById(R.id.agreeCb);
 		final RadioGroup selectRg = (RadioGroup) view.findViewById(R.id.selectRg);
 		final RadioGroup typeRg = (RadioGroup) view.findViewById(R.id.typeRg);
+		final RadioButton wxRb = (RadioButton) view.findViewById(R.id.wxRb);
+		final RadioButton aliPlayRb = (RadioButton) view.findViewById(R.id.aliPlayRb);
+		wxRb.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+				if (b) {
+					ToastUtil.showToast(ct, "暂不支持微信支付");
+					aliPlayRb.setChecked(true);
+				}
+			}
+		});
+
+
 		view.findViewById(R.id.giftBtn).setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {

app_modular/appworks/src/main/res/layout/fragment_user.xml

@@ -22,6 +22,7 @@
 
         <ImageView
             android:id="@+id/infoTag"
+            android:visibility="gone"
             android:layout_width="@dimen/next_width"
             android:layout_height="@dimen/next_height"
             android:layout_alignBottom="@id/nameTv"
@@ -190,13 +191,13 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <TextView
+        <View
             android:id="@+id/messageNumTv"
             android:layout_width="4dp"
             android:layout_height="4dp"
             android:layout_alignTop="@id/messageTag"
             android:layout_toRightOf="@id/messageTag"
-            android:background="@color/red"
+            android:background="@drawable/hongdian"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:textColor="@color/hintColor"

app_modular/appworks/src/main/res/layout/handler_charit_list.xml

@@ -43,9 +43,9 @@
         android:layout_marginTop="10dp"
         custom:indicator_bottommargin="30dp"
         custom:indicator_radius="3dp"
-        custom:indicator_selected_color="#ff0000"
+        custom:indicator_selected_color="@color/white"
         custom:indicator_span="16dp"
-        custom:indicator_unselected_color="#00ff00" />
+        custom:indicator_unselected_color="@color/hintColor" />
 
     <com.core.widget.view.MyGridView
         android:id="@+id/typeGv"

app_modular/appworks/src/main/res/layout/item_join.xml

@@ -12,6 +12,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:text="周杰伦"
+        android:layout_marginTop="3dp"
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
@@ -46,7 +47,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/nameTv"
         android:layout_marginTop="10dp"
-        android:text="深圳市有软科技有限公司"
         android:textColor="@color/hintColor"
         android:textSize="@dimen/text_main" />
 
@@ -56,7 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/timeTv"
         android:layout_marginTop="10dp"
-        android:text="捐赠善款(元)"
+        android:background="@drawable/text_frame_bg"
         android:textColor="@color/hintColor"
         android:textSize="@dimen/text_main" />
 </RelativeLayout>

app_modular/appworks/src/main/res/layout/pop_play_select.xml

@@ -41,11 +41,11 @@
             style="@style/IMTabButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:checked="true"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:layout_weight="1"
             android:background="@drawable/pop_text_frame_bg"
+            android:checked="true"
             android:padding="10dp"
             android:paddingTop="3dp"
             android:text="1元"
@@ -81,10 +81,10 @@
             android:textColor="@drawable/pop_text_color_bg" />
 
         <RadioButton
+            android:id="@+id/tenRb"
             style="@style/IMTabButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:id="@+id/tenRb"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:layout_weight="1"
@@ -113,8 +113,8 @@
             android:layout_height="wrap_content"
             android:background="@null"
             android:hint="自定义金额"
-            android:minWidth="40dp"
             android:inputType="numberDecimal"
+            android:minWidth="40dp"
             android:textSize="@dimen/text_main" />
 
         <TextView
@@ -155,15 +155,14 @@
         android:paddingTop="4dp">
 
         <RadioButton
+            android:id="@+id/wxRb"
             style="@style/IMTabButton"
             android:layout_width="0dp"
-            android:id="@+id/wxRb"
             android:layout_height="match_parent"
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:layout_weight="1"
             android:background="@drawable/pop_text_frame_bg"
-            android:checked="true"
             android:padding="10dp"
             android:paddingTop="3dp"
             android:text="微信"
@@ -171,6 +170,7 @@
 
 
         <RadioButton
+            android:id="@+id/aliPlayRb"
             style="@style/IMTabButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
@@ -178,6 +178,7 @@
             android:layout_marginRight="5dp"
             android:layout_weight="1"
             android:background="@drawable/pop_text_frame_bg"
+            android:checked="true"
             android:padding="10dp"
             android:paddingTop="3dp"
             android:text="支付宝"