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

# Conflicts:
#	WeiChat/version.properties

WeiChat/build.gradle

@@ -53,6 +53,13 @@ def getVersionCode() {
 
 android {
     def versionArray = getVersionCode()
+    //====================Add below two line=============
+    dexOptions {
+        javaMaxHeapSize "4g" //specify the heap size for the dex process
+        preDexLibraries = false //delete the already predexed libraries
+        //是否支持大工程模式
+        jumboMode = true
+    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

WeiChat/src/main/java/com/xzjmyk/pm/activity/wxapi/WXPayEntryActivity.java

@@ -66,20 +66,20 @@ public class WXPayEntryActivity extends AppCompatActivity implements View.OnClic
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_pay_test);
-        setTitle("支付测试");
-        findViewById(R.id.btn_wxPay).setOnClickListener(this);
-        findViewById(R.id.btn_wxRefund).setOnClickListener(this);
-        lvWxPay = findViewById(R.id.lv_wxPay);
-        findViewById(R.id.btn_aliPay).setOnClickListener(this);
-        findViewById(R.id.btn_aliRefund).setOnClickListener(this);
-        lvAliPay = findViewById(R.id.lv_aliPay);
-        wxAdapter = new PayTestAdapter(this, wxDatas);
-        aliAdapter = new PayTestAdapter(this, aliDatas);
-        lvWxPay.setAdapter(wxAdapter);
-        lvAliPay.setAdapter(aliAdapter);
-        initEvent();
-        initData();
+//        setContentView(R.layout.activity_pay_test);
+//        setTitle("支付测试");
+//        findViewById(R.id.btn_wxPay).setOnClickListener(this);
+//        findViewById(R.id.btn_wxRefund).setOnClickListener(this);
+//        lvWxPay = findViewById(R.id.lv_wxPay);
+//        findViewById(R.id.btn_aliPay).setOnClickListener(this);
+//        findViewById(R.id.btn_aliRefund).setOnClickListener(this);
+//        lvAliPay = findViewById(R.id.lv_aliPay);
+//        wxAdapter = new PayTestAdapter(this, wxDatas);
+//        aliAdapter = new PayTestAdapter(this, aliDatas);
+//        lvWxPay.setAdapter(wxAdapter);
+//        lvAliPay.setAdapter(aliAdapter);
+//        initEvent();
+//        initData();
     }
 
     private void initEvent() {
@@ -130,8 +130,8 @@ public class WXPayEntryActivity extends AppCompatActivity implements View.OnClic
     private void initData() {
         api = WXAPIFactory.createWXAPI(this, Constants.WXPAY_APPID, false);
         api.handleIntent(getIntent(), this);
-        getWxOrders();
-        getAliPayOrders();
+//        getWxOrders();
+//        getAliPayOrders();
     }
 
     @Override
@@ -362,7 +362,7 @@ public class WXPayEntryActivity extends AppCompatActivity implements View.OnClic
 
     @Override
     public void onFailure(String resultStatus, String resultInfo) {
-        getAliPayOrders();
+        //getAliPayOrders();
     }
 
     

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

@@ -1,7 +1,6 @@
 package com.uas.appworks.OA.platform.activity;
 
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -19,7 +18,6 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 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;
@@ -166,7 +164,7 @@ public class JoinCharitActivity extends BaseActivity {
                     status = JSONUtil.getText(projectOrActivity, "overdue", "stage");
                 }
 
-                int id = JSONUtil.getInt(o, "id");
+                int id = JSONUtil.getInt(projectOrActivity, "id");
                 int amount = JSONUtil.getInt(o, "amount");
                 LogUtil.i("amount=" + amount);
                 model.setId(id);

gradle.properties

@@ -1,7 +1,7 @@
 android.useDeprecatedNdk=true
 org.gradle.daemon=true
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx5120m
+org.gradle.jvmargs=-Xmx1024m
 
 applicationId=com.xzjmyk.pm.activity
 versionCode=125

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip