Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

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

@@ -186,18 +186,22 @@ public class MessageWebActivity extends BaseActivity {
         if (needCookie) {
             synCookies(ct, url);
         }
-        try{
-            if(url.startsWith("baidu://")||
+        try {
+            if (url.startsWith("baidu://") ||
                     url.startsWith("weixin://") //微信
                     || url.startsWith("alipays://") //支付宝
                     || url.startsWith("mailto://") //邮件
                     || url.startsWith("tel://")//电话
-                    || url.startsWith("dianping://")){
+                    || url.contains("https://wx.tenpay.com")//微信支付
+                    || url.startsWith("dianping://")) {
                 Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
                 startActivity(intent);
+                return true;
+            } else if (url.contains("https://wx.tenpay.com")) {
+
                 return true;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             return false;
         }
         view.loadUrl(url);

app_modular/apputils/src/main/java/com/modular/apputils/utils/playsdk/AliPlay.java

@@ -92,7 +92,6 @@ public class AliPlay extends Handler {
 
     private void payThread(Activity ct, String orderInfo, OnPlayListener onPlayListener) throws Exception {
         PayTask alipay = new PayTask(ct);
-        LogUtil.i("orderInfo=" + orderInfo);
         Map<String, String> result = alipay.payV2(orderInfo, true);
         LogUtil.i(result.toString());
         Message msg = new Message();

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

@@ -172,8 +172,7 @@ public class JoinCharitActivity extends BaseActivity {
                 }
 
                 int id = JSONUtil.getInt(projectOrActivity, "id");
-                int amount = JSONUtil.getInt(o, "amount");
-                LogUtil.i("amount=" + amount);
+                float amount = JSONUtil.getFloat(o, "amount");
                 model.setId(id);
                 model.setAmount(amount);
                 model.setName(name);

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

@@ -7,8 +7,6 @@ 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;
@@ -98,7 +96,6 @@ public class JoinCharitAdapter extends BaseAdapter {
 		holder.subTv.setText(model.getSub());
 		if (type == 1) {
 			holder.amountTv.setVisibility(View.VISIBLE);
-			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/fragment/UserFragment.java

@@ -141,9 +141,15 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
                 phoneTv.setText(tel);
             }
         }
-        DecimalFormat df = new DecimalFormat(".##");
         if (sumMoney != null) {
-            charitTv.setText(sumMoney);
+            DecimalFormat df = new DecimalFormat(".##");
+            try {
+                charitTv.setText(df.format(Float.valueOf(sumMoney)));
+            } catch (Exception e) {
+                charitTv.setText(sumMoney);
+            }
+        } else {
+            charitTv.setText("0.00");
         }
         projectNumTv.setText("(" + sumProJoin + ")");
         activityNumTv.setText("(" + sumActJoin + ")");
@@ -159,7 +165,7 @@ public class UserFragment extends EasyFragment implements View.OnClickListener {
                     .putExtra("sumMoney", charitTv.getText().toString())
                     .putExtra("title", "已参与项目"));
         } else if (view.getId() == R.id.activityRl) {
-          ct.startActivity(new Intent(ct, JoinCharitActivity.class)
+            ct.startActivity(new Intent(ct, JoinCharitActivity.class)
                     .putExtra("type", 2)
                     .putExtra("title", "已参与活动")
                     .putExtra("sumNum", activityNumTv.getText().toString()));

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

@@ -7,7 +7,7 @@ package com.uas.appworks.OA.platform.model;
 public class JoinModel {
 	private int  id;
 	private int type;
-	private int amount;
+	private float amount;
 	private String name;
 	private String time;
 	private String status;
@@ -21,11 +21,11 @@ public class JoinModel {
 		this.id = id;
 	}
 
-	public int getAmount() {
+	public float getAmount() {
 		return amount;
 	}
 
-	public void setAmount(int amount) {
+	public void setAmount(float amount) {
 		this.amount = amount;
 	}
 

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

@@ -72,6 +72,7 @@
             android:layout_alignTop="@id/charitTag"
             android:layout_below="@id/companyTv"
             android:paddingRight="@dimen/padding"
+            android:text="0.00"
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 

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

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/padding"
     android:background="@color/white">
 
     <ImageView
@@ -97,15 +98,12 @@
         app:layout_constraintTop_toTopOf="@id/defTv" />
 
 
-
-
     <TextView
         android:id="@+id/giftBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:layout_constraintRight_toRightOf="@id/defTv"
         app:layout_constraintTop_toBottomOf="@id/defTv"
-        app:layout_constraintBottom_toBottomOf="parent"
         android:layout_marginBottom="@dimen/padding"
         android:layout_marginTop="@dimen/padding"
         android:background="@color/indianred"

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

@@ -57,6 +57,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/timeTv"
         android:layout_marginTop="10dp"
+        android:visibility="gone"
         android:background="@drawable/text_frame_bg"
         android:textColor="@color/hintColor"
         android:textSize="@dimen/text_main" />