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

WeiChat/src/main/AndroidManifest.xml

@@ -292,7 +292,8 @@
             </intent-filter>
         </activity>
         <!-- 消息模块 -->
-        <activity android:name=".ui.message.ChatActivity">
+        <activity android:name=".ui.message.ChatActivity"
+            android:theme="@style/MainBaseTheme">
             <intent-filter>
                 <action android:name="com.modular.message.ChatActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1006,7 +1007,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".ui.erp.activity.secretary.BookingListActivity">
+        <activity android:name=".ui.erp.activity.secretary.BookingListActivity"
+            android:label="@string/booking_menu"
+            android:theme="@style/MainBaseTheme">
             <intent-filter>
                 <action android:name="com.modular.booking.BookingListActivity" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1014,6 +1017,8 @@
         </activity>
         <activity
             android:name=".ui.erp.activity.secretary.BookingAddActivity"
+            android:label="@string/booking_add"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name="com.core.utils.pictureselector.PictureSelectorDemo"
@@ -1063,8 +1068,7 @@
         <activity
             android:name="com.xzjmyk.pm.activity.wxapi.WXPayEntryActivity"
             android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -31,7 +31,7 @@ import java.util.Locale;
  * 带网络请求的Activity继承
  *
  * @author Dean Tao
- */
+ */ 
 public abstract class BaseActivity extends ActionBackActivity {
 
     private FastVolley mFastVolley;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -27,8 +27,7 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.HttpImp;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.net.volley.ObjectResult;
@@ -59,7 +58,7 @@ import java.util.regex.Pattern;
  * @desc:小秘书新增界面
  * @author：Arison on 2017/6/22
  */
-public class BookingAddActivity extends OABaseActivity implements HttpImp, View.OnClickListener {
+public class BookingAddActivity extends SupportToolBarActivity implements  View.OnClickListener {
     
     private TextView tvBookObject;
     private RelativeLayout companyAddRl;
@@ -271,7 +270,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
             bt_commit.setEnabled(true);
             return;
         }
-        showLoading();
+//        showLoading();
         String content = "";
         content = et_book_content.getText().toString();
         content = content.replace("'", "''");
@@ -333,7 +332,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
             bt_commit.setEnabled(true);
             return;
         }
-        showLoading();
+//        showLoading();
         String content = "";
         content = et_book_content.getText().toString();
         content = content.replace("'", "''");
@@ -367,7 +366,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            dimssLoading();
+//            dimssLoading();
             switch (msg.what) {
                 case 0x01:
                     try {
@@ -387,7 +386,7 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
                             bt_commit.setEnabled(true);
                         }
 
-                        dimssLoading();
+//                        dimssLoading();
                     } catch (Exception e) {
                         ToastMessage("预约失败！");
                         bt_commit.setEnabled(true);
@@ -516,19 +515,20 @@ public class BookingAddActivity extends OABaseActivity implements HttpImp, View.
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
         if (!StringUtil.isMobileNumber(phone)) {
-            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
+           // showToast(, R.color.load_submit);
+            showToast("选择人员电话号码为空或是格式不正确");
             return;
         }
         StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
                 Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                dimssLoading();
+              // dimssLoading();
             }
         }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
             @Override
             public void onResponse(ObjectResult<AddAttentionResult> result) {
-                showToast("短信发送成功", R.color.load_submit);
+                showToast("短信发送成功");
 
             }
         }, AddAttentionResult.class, null) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -26,6 +26,7 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.HttpImp;
 import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.sp.UserSp;
@@ -60,7 +61,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class BookingListActivity extends OABaseActivity implements HttpImp, View.OnClickListener {
+public class BookingListActivity extends SupportToolBarActivity implements  View.OnClickListener {
 
     @ViewInject(R.id.tv_book_me)
     TextView tv_book_me;
@@ -137,7 +138,6 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
             finish();
         }
         return super.onOptionsItemSelected(item);
-
     }
 
     private void initEvent() {
@@ -268,11 +268,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                 startActivity(new Intent(mContext, BBookingAddActivity.class));
                 break;
             case R.id.mBookService:
-              if (BaseConfig.isDebug()){
-                  startActivity(new Intent(mContext,  BServicesActivity.class));
-              }else{
-                  startActivity(new Intent(mContext,  BServicesActivity.class));
-              }
+                startActivity(new Intent(mContext,  BServicesActivity.class));
                 break;
             case R.id.mBookShares:
                 Intent intent = new Intent(mContext, BBSharesListActivity.class);
@@ -334,7 +330,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
 
     private void loadListData() {
-        showLoading();
+//        showLoading();
         String url = Constants.IM_BASE_URL() + "user/appBookingList";
         Map<String, Object> params = new HashMap<>();
         params.put("token",  UserSp.getInstance(MyApplication.getInstance()).getAccessToken(""));
@@ -350,7 +346,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            dimssLoading();
+//            dimssLoading();
             setCalenderOnClicklistener();
             switch (msg.what) {
                 case 0x01:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/ChatActivity.java

@@ -35,9 +35,10 @@ import com.common.data.ListUtils;
 import com.common.preferences.PreferenceUtils;
 import com.common.thread.ThreadPool;
 import com.common.ui.CameraUtil;
-import com.core.app.ActionBackActivity;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
+import com.core.base.SupportToolBarActivity;
 import com.core.broadcast.MsgBroadcast;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
@@ -52,7 +53,6 @@ import com.core.net.volley.StringJsonObjectRequest;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.xmpp.CoreService;
-import com.core.xmpp.FriendHelper;
 import com.core.xmpp.ListenerManager;
 import com.core.xmpp.ReceiptManager;
 import com.core.xmpp.dao.ChatMessageDao;
@@ -61,13 +61,12 @@ import com.core.xmpp.downloader.Downloader;
 import com.core.xmpp.downloader.UploadEngine;
 import com.core.xmpp.listener.ChatMessageListener;
 import com.core.xmpp.model.ChatMessage;
-import com.core.app.AppConstant;
 import com.core.xmpp.utils.flie.FileUtils;
 import com.core.xmpp.widget.ChatBottomView;
 import com.core.xmpp.widget.ChatContentView;
 import com.core.xmpp.widget.PullDownListView;
-import com.uas.appcontact.R;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appcontact.R;
 import com.uas.appcontact.db.TopContactsDao;
 
 import java.io.File;
@@ -91,7 +90,7 @@ import java.util.UUID;
  * @修改时间: $Date$
  * @修改的内容: TODO 修改聊天，点击用户头像，加入黑名单，返回，还可以和加入黑名单的用户聊天的bug
  */
-public class ChatActivity extends ActionBackActivity
+public class ChatActivity extends SupportToolBarActivity
         implements ChatContentView.MessageEventListener, ChatBottomView.ChatBottomListener, ChatMessageListener {
 
 
@@ -243,9 +242,11 @@ public class ChatActivity extends ActionBackActivity
     private void initView() {
         String remarkName = mFriend.getRemarkName();
         if (remarkName == null) {
-            getSupportActionBar().setTitle(mFriend.getNickName());
+           // getSupportActionBar().setTitle(mFriend.getNickName());
+            setTitle(mFriend.getNickName());
         } else {
-            getSupportActionBar().setTitle(mFriend.getRemarkName());
+            //getSupportActionBar().setTitle(mFriend.getRemarkName());
+            setTitle(mFriend.getRemarkName());
         }
         findViewById(R.id.root_view);
         mAuthStateTipTv = (TextView) findViewById(R.id.auth_state_tip);

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

@@ -1,32 +1,137 @@
 package com.xzjmyk.pm.activity.wxapi;
 
-import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.common.LogUtil;
+import com.common.config.BaseConfig;
+import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.utils.ToastUtil;
+import com.me.network.app.http.HttpClient;
+import com.me.network.app.http.Method;
+import com.me.network.app.http.rx.Result2Listener;
+import com.me.network.app.http.rx.ResultSubscriber;
+import com.modular.apputils.listener.OnPlayListener;
+import com.modular.apputils.utils.playsdk.AliPlay;
+import com.modular.apputils.utils.playsdk.WxPlay;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.IWXAPIEventHandler;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
-import com.xzjmyk.pm.activity.R;
+import com.uas.appme.R;
 
-public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @desc:微信支付回调，支付测试类
+ * @author：Arison on 2018/5/2
+ */
+public class WXPayEntryActivity extends AppCompatActivity implements View.OnClickListener, OnPlayListener,IWXAPIEventHandler {
     private IWXAPI api;
+    private static final String TAG = "PayTestActivity";
+   // String baseUrl = "http://nf20718343.iask.in:15161/";
+    String baseUrl = "http://qq784602719.imwork.net:43580/";
+ 
+    private ListView lvWxPay;
+    private ListView lvAliPay;
+
+
+    PayTestAdapter wxAdapter;
+    PayTestAdapter aliAdapter;
+
+    List<Order> wxDatas = new ArrayList<>();
+    List<Order> aliDatas = new ArrayList<>();
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_pay_test);
+        getSupportActionBar().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();
+    }
 
-        Log.d("WXPayEntryOnResp", "onCreate");
+    private void initEvent() {
+        lvWxPay.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                final PayTestAdapter.ViewHolder holder= (PayTestAdapter.ViewHolder) view.getTag();
+                LogUtil.d(TAG,"list action:"+holder.btnAction.getText().toString());
+                holder.btnAction.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        LogUtil.d(TAG,"action:"+holder.btnAction.getText().toString());
+                        if ("支付".equals(holder.btnAction.getText().toString())){
+                            ToastUtil.showToast(WXPayEntryActivity.this,"支付");
+                            wxPay(holder.orderID.getText().toString());
+                        }else if("退款".equals(holder.btnAction.getText().toString())){
+                            ToastUtil.showToast(WXPayEntryActivity.this,"退款");
+                            wxRefund(holder.orderID.getText().toString());
+                        }
+                    }
+                });
+              
+            }
+        });
+        
+        lvAliPay.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                final PayTestAdapter.ViewHolder holder= (PayTestAdapter.ViewHolder) view.getTag();
+                LogUtil.d(TAG,"list action:"+holder.btnAction.getText().toString());
+                holder.btnAction.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        LogUtil.d(TAG,"action:"+holder.btnAction.getText().toString());
+                        if ("支付".equals(holder.btnAction.getText().toString())){
+                            ToastUtil.showToast(WXPayEntryActivity.this,"支付");
+                            aliPay(holder.orderID.getText().toString());
+                        }else if("退款".equals(holder.btnAction.getText().toString())){
+                            ToastUtil.showToast(WXPayEntryActivity.this,"退款");
+                            aliRefund(holder.orderID.getText().toString());
+                        }
+                    }
+                });
+            }
+        });
+    }
 
+    private void initData() {
         api = WXAPIFactory.createWXAPI(this, Constants.WXPAY_APPID, false);
-//        api.registerApp(Constants.WXPAY_APPID);
         api.handleIntent(getIntent(), this);
+        getWxOrders();
+        getAliPayOrders();
     }
 
     @Override
@@ -36,20 +141,241 @@ public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
         api = WXAPIFactory.createWXAPI(this, Constants.WXPAY_APPID, false);
         api.handleIntent(intent, this);
     }
+    
+    private void getAliPayOrders() {
+        new HttpClient.Builder(baseUrl)
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("alipay/orderquery")
+                        .add("userId",MyApplication.getInstance().mLoginUser.getTelephone())
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        if (!ListUtils.isEmpty(aliDatas)){
+                            aliDatas.clear();
+                        }
+                        LogUtil.i(TAG, "支付宝list:" + o.toString());
+                        JSONArray jsonArray = JSON.parseArray(o.toString());
+                        for (int i = 0; i < jsonArray.size(); i++) {
+                            Order model = new Order();
+                            JSONObject object = jsonArray.getJSONObject(i);
+                            model.setFee(String.valueOf(object.getDouble("fee")));
+                            model.setOutTradeNo(object.getString("outTradeNo"));
+                            model.setTradeState(object.getString("tradeState"));
+                            model.setTransactionId(object.getString("trade_no"));
+                            model.setTimeStart(String.valueOf(object.getLong("timeStart")));
+                            aliDatas.add(model);
+                        }
+                        if (!ListUtils.isEmpty(aliDatas)) {
+                            aliAdapter.notifyDataSetChanged();
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
+
+    private void getWxOrders() {
+        new HttpClient.Builder(baseUrl)
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("wxpay/wxAppQuery")
+                        .add("userid",MyApplication.getInstance().mLoginUser.getTelephone())
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        if (!ListUtils.isEmpty(wxDatas)) {
+                            wxDatas.clear();
+                        }
+                        LogUtil.i(TAG, "微信list:" + o.toString());
+                        JSONArray jsonArray = JSON.parseArray(o.toString());
+                        for (int i = 0; i < jsonArray.size(); i++) {
+                            Order model = new Order();
+                            JSONObject object = jsonArray.getJSONObject(i);
+                            model.setFee(String.valueOf(object.getDouble("fee")));
+                            model.setOutTradeNo(object.getString("outTradeNo"));
+                            model.setTradeState(object.getString("tradeState"));
+                            model.setTransactionId(object.getString("transactionId"));
+                            model.setTimeStart(String.valueOf(object.getLong("timeStart")));
+                            wxDatas.add(model);
+                        }
+                        if (!ListUtils.isEmpty(wxDatas)) {
+                            wxAdapter.notifyDataSetChanged();
+                        }
+                        ToastUtil.showToast(WXPayEntryActivity.this,"微信订单列表数据已刷新！");
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
 
     @Override
-    public void onReq(BaseReq baseReq) {
+    public void onClick(View view) {
+        int i = view.getId();
+        if (i == R.id.btn_wxPay) {
+            wxPay(null);
+        } else if (i == R.id.btn_wxRefund) {
+           // wxRefund();
+        } else if (i == R.id.btn_aliPay) {
+            aliPay(null);
+        } else if (i == R.id.btn_aliRefund) {
+           // aliRefund();
+        }
+    }
+
+    private void aliRefund(String outTradeNo) {
+        LogUtil.d(TAG,"outTradeNo:"+outTradeNo);
+        new HttpClient.Builder(baseUrl)
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("alipay/tradeRefund")
+                        .add("outTradeNo",outTradeNo)
+                        .add("refundAmount","0.01")
+                        .add("fee","0.01")
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        LogUtil.i(TAG, "Success:" + o.toString());
+                      
+                        getAliPayOrders();
+                        
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
+
+    private void aliPay(String orderId) {
+        LogUtil.d(TAG,"orderId:"+orderId);
+        new HttpClient.Builder(baseUrl)
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("alipay/appPay")
+                        .add("userId",MyApplication.getInstance().mLoginUser.getTelephone())
+                        .add("totalAmount","0.01")
+                        .add("out_trade_no",orderId)
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        LogUtil.i(TAG, "Success:" + o.toString());
+                        String message = o.toString();
+                        message = JSON.parseObject(o.toString()).getString("data");
+                        AliPlay.api().alipay(WXPayEntryActivity.this, message, WXPayEntryActivity.this);
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
+
+    private void wxRefund(String outTradeNo) {
+        LogUtil.d(TAG,"退款操作---商户订单号："+outTradeNo);
+        new HttpClient.Builder(baseUrl)
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("wxpay/appRefund")
+                        .add("outTradeNo", outTradeNo)
+                        .add("refund_fee","0.01")
+                        .add("fee","0.01")
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        Log.i(TAG, "Success:" + o.toString());
+                         getWxOrders();
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
+
+    private void wxPay(String orderId) {
+        LogUtil.d(TAG,"userid:"+MyApplication.getInstance().mLoginUser.getTelephone()+" orderId:"+orderId);
+        new HttpClient.Builder(baseUrl)
+                .isDebug(BaseConfig.isDebug())
+                .build()
+                .Api()
+                .send(new HttpClient.Builder()
+                        .url("wxpay/appPay")
+                        .add("userid", MyApplication.getInstance().mLoginUser.getTelephone())
+                        .add("fee","0.01")
+                        .add("out_trade_no",orderId)
+                        .method(Method.POST)
+                        .build(), new ResultSubscriber<>(new Result2Listener<Object>() {
+
+                    @Override
+                    public void onResponse(Object o) {
+                        Log.i(TAG, "Success:" + o.toString());
+                        String message = o.toString();
+                        JSONObject data = JSON.parseObject(JSON.parseObject(o.toString()).getString("data"));
+                        message = data.toJSONString();
+                        Log.i(TAG, "message:" + message);
+                        WxPlay.api().wxPay(WXPayEntryActivity.this, message, WXPayEntryActivity.this);
+                    }
+
+                    @Override
+                    public void onFailure(Object t) {
+                        Log.i(TAG, "Failure:" + t.toString());
+                    }
+                }));
+    }
+
+    @Override
+    public void onSuccess(String resultStatus, String resultInfo) {
+        LogUtil.d(TAG,"支付宝支付成功！");
+       getAliPayOrders();
 
     }
 
+    @Override
+    public void onFailure(String resultStatus, String resultInfo) {
+        getAliPayOrders();
+    }
+
+    
+    //
+    @Override
+    public void onReq(BaseReq baseReq) {
+        
+    }
+
     @Override
     public void onResp(BaseResp baseResp) {
-        Log.d("WXPayEntryOnResp", "onPayFinish, errCode = " + baseResp.errCode);
-        /**
-         *  0 支付成功
-         * -1 支付错误
-         * -2 用户取消
-         */
+        LogUtil.d(TAG, "onPayFinish, errCode = " + baseResp.errCode);
+        getWxOrders();
         if (baseResp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
             if (baseResp.errCode == BaseResp.ErrCode.ERR_OK) {
                 Toast.makeText(this, R.string.str_error_wechat_pay_success, Toast.LENGTH_LONG).show();
@@ -59,6 +385,179 @@ public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
                 Toast.makeText(this, R.string.str_error_wechat_pay_cancel, Toast.LENGTH_LONG).show();
             }
         }
-        finish();
     }
-}
+
+
+    public class Order {
+        String timeExpire;
+        String timeStart;
+        String outRefundNo;
+        String totalFee;
+        String refundSuccessTime;
+        String outTradeNo;
+        String fee;
+        String transactionId;
+        String tradeState;
+
+        public String getTimeExpire() {
+            return timeExpire;
+        }
+
+        public void setTimeExpire(String timeExpire) {
+            this.timeExpire = timeExpire;
+        }
+
+        public String getTimeStart() {
+            return timeStart;
+        }
+
+        public void setTimeStart(String timeStart) {
+            this.timeStart = timeStart;
+        }
+
+        public String getOutRefundNo() {
+            return outRefundNo;
+        }
+
+        public void setOutRefundNo(String outRefundNo) {
+            this.outRefundNo = outRefundNo;
+        }
+
+        public String getTotalFee() {
+            return totalFee;
+        }
+
+        public void setTotalFee(String totalFee) {
+            this.totalFee = totalFee;
+        }
+
+        public String getRefundSuccessTime() {
+            return refundSuccessTime;
+        }
+
+        public void setRefundSuccessTime(String refundSuccessTime) {
+            this.refundSuccessTime = refundSuccessTime;
+        }
+
+        public String getOutTradeNo() {
+            return outTradeNo;
+        }
+
+        public void setOutTradeNo(String outTradeNo) {
+            this.outTradeNo = outTradeNo;
+        }
+
+        public String getFee() {
+            return fee;
+        }
+
+        public void setFee(String fee) {
+            this.fee = fee;
+        }
+
+        public String getTransactionId() {
+            return transactionId;
+        }
+
+        public void setTransactionId(String transactionId) {
+            this.transactionId = transactionId;
+        }
+
+        public String getTradeState() {
+            return tradeState;
+        }
+
+        public void setTradeState(String tradeState) {
+            this.tradeState = tradeState;
+        }
+        //           "timeExpire":1525227228000,
+//                   "timeStart":1525226959000,
+//                   "outRefundNo":"1525231745951",
+//                   "totalFee":1,
+//                   "refundSuccessTime":1525231745000,
+//                   "outTradeNo":"1525226959568",
+//                   "fee":0.01,
+//                   "transactionId":"4200000132201805020747499624",
+//                   "tradeState":"2"
+    }
+
+    public class PayTestAdapter extends BaseAdapter {
+
+        private List<Order> objects = new ArrayList<Order>();
+
+        private Context context;
+        private LayoutInflater layoutInflater;
+
+        public PayTestAdapter(Context context, List<Order> data) {
+            this.context = context;
+            this.objects = data;
+            this.layoutInflater = LayoutInflater.from(context);
+        }
+
+        @Override
+        public int getCount() {
+            return objects.size();
+        }
+
+        @Override
+        public Order getItem(int position) {
+            return objects.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = layoutInflater.inflate(R.layout.item_pay_test, null);
+                convertView.setTag(new ViewHolder(convertView));
+            }
+            initializeViews((Order) getItem(position), (ViewHolder) convertView.getTag());
+            return convertView;
+        }
+
+        private void initializeViews(Order object, ViewHolder holder) {
+            holder.orderID.setText(object.getOutTradeNo());
+            holder.orderNo.setText(object.getTransactionId());
+            if ("0".equals(object.getTradeState())) {
+                holder.orderState.setText("支付");
+                holder.btnAction.setText("支付");
+                holder.btnAction.setEnabled(true);
+            } else if ("1".equals(object.getTradeState())) {
+                holder.orderState.setText("退款");
+                holder.btnAction.setText("退款");
+                holder.btnAction.setEnabled(true);
+            } else {
+                holder.orderState.setText("已退款");
+                holder.btnAction.setText("已退款");
+                holder.btnAction.setEnabled(false);
+            }
+
+            holder.orderNum.setText(object.getFee());
+            holder.orderTime.setText(DateFormatUtil.getStrDate4Date(new Date(Long.valueOf(object.getTimeStart())), "yyyy-MM-dd HH:mm:ss"));
+
+        }
+
+        protected class ViewHolder {
+            private TextView orderID;
+            private TextView orderState;
+            private TextView orderNum;
+            private TextView orderTime;
+            private TextView orderNo;
+            private TextView btnAction;
+
+            public ViewHolder(View view) {
+                orderID =  view.findViewById(R.id.orderID);
+                orderState =  view.findViewById(R.id.orderState);
+                orderNum = view.findViewById(R.id.orderNum);
+                orderTime =  view.findViewById(R.id.orderTime);
+                orderNo =  view.findViewById(R.id.orderNo);
+                btnAction = view.findViewById(R.id.btn_action);
+            }
+        }
+    }
+
+}

WeiChat/src/main/res/layout/activity_booking_list.xml

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
+    android:background="@color/white"
     android:descendantFocusability="blocksDescendants">
 
     <LinearLayout
@@ -45,7 +46,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:background="#6A6A6A"
+            android:background="#FFFFFF"
             android:paddingTop="10dp"
             android:paddingBottom="10dp">
             <RelativeLayout
@@ -72,11 +73,10 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center_horizontal"
-                    android:drawablePadding="@dimen/drawable_padding"
+                    android:drawablePadding="@dimen/padding"
                     android:drawableTop="@drawable/booking_personal"
                     android:layout_centerInParent="true"
                     android:text="@string/booking_personal"
-                    android:textColor="@color/white"
                     android:layout_marginTop="2dp"/>
             </RelativeLayout>
             <RelativeLayout
@@ -102,12 +102,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center_horizontal"
-                    android:layout_marginTop="2dp"
-                    android:drawablePadding="@dimen/drawable_padding"
+
+                    android:drawablePadding="@dimen/padding"
                     android:drawableTop="@drawable/booking_business"
                     android:layout_centerInParent="true"
                     android:text="@string/booking_business"
-                    android:textColor="@color/white" />
+                    android:layout_marginTop="2dp"
+                    />
             </RelativeLayout>
 
             <TextView
@@ -116,27 +117,27 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:layout_weight="1"
-                android:drawablePadding="@dimen/drawable_padding"
+                android:drawablePadding="@dimen/padding"
                 android:drawableTop="@drawable/booking_service"
                 android:gravity="center"
                 android:text="@string/booking_service"
-                android:textColor="@color/white" />
+                />
             <TextView
                 android:id="@+id/mBookShares"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:layout_weight="1"
-                android:drawablePadding="@dimen/drawable_padding"
+                android:drawablePadding="@dimen/padding"
                 android:drawableTop="@drawable/booking_share"
                 android:gravity="center"
                 android:text="@string/booking_shared"
-                android:textColor="@color/white" />
+             />
             <LinearLayout
                 android:id="@+id/oamain_more_menu_ll"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="@dimen/padding"
                 android:layout_weight="1"
                 android:orientation="vertical"
                 android:paddingLeft="5dp"
@@ -180,7 +181,7 @@
         <!--年月日布局-->
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="35dp"
+            android:layout_height="30dp"
             android:layout_gravity="center_horizontal"
             android:gravity="center">
 
@@ -210,7 +211,8 @@
         <android.support.v4.view.ViewPager
             android:id="@+id/viewPager"
             android:layout_width="match_parent"
-            android:layout_height="230dp" />
+            android:layout_height="200dp" 
+            android:background="@color/white"/>
 
         <View
             android:layout_width="match_parent"

WeiChat/src/main/res/layout/book_empty_list.xml

@@ -15,6 +15,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
+        android:textColor="@color/gray"
         android:layout_centerInParent="true"
         android:textSize="14sp"
         android:text="@string/book_empty"

WeiChat/src/main/res/layout/fragment_me.xml

@@ -555,7 +555,7 @@
                 android:drawableLeft="@drawable/icon_uu_setting"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="HITest"
+                android:text="支付中心"
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon May 14 08:58:28 CST 2018
-debugName=164
-versionName=640
-debugCode=164
-versionCode=180
+#Tue May 15 17:03:37 CST 2018
+debugName=257
+versionName=630
+debugCode=257
+versionCode=170

app_core/common/src/main/res/values/dimens.xml

@@ -67,7 +67,7 @@
     <dimen name="folder_cover_size">72dp</dimen>
     <dimen name="recyclerview_fast_scroller_width">16dp</dimen>
 
-    <dimen name="commonSettingItemHeight">40dp</dimen>
+    <dimen name="commonSettingItemHeight">42dp</dimen>
     <dimen name="commonSettingItemPaddingL">10dp</dimen>
     <dimen name="commonSettingItemPaddingR">10dp</dimen>
     <dimen name="commonSettingItemTextSize">14sp</dimen>

app_core/network/src/main/java/com/me/network/app/http/HttpClient.java

@@ -162,6 +162,7 @@ public class HttpClient {
         }
 
         public Builder add(String key, Object value) {
+            if (value==null) return this;
             this.params.put(key, value);
             return this;
         }

app_modular/appbooking/src/main/AndroidManifest.xml

@@ -3,12 +3,18 @@
     package="com.modular.booking">
 
     <application>
-        <activity android:name=".activity.business.BBookingAddActivity" />
-        <activity android:name=".activity.shares.BBSharesListActivity" />
+        <activity android:name=".activity.business.BBookingAddActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/booking_business"/>
+        <activity android:name=".activity.shares.BBSharesListActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/booking_share"/>
         <activity android:name=".activity.business.BBCompanyListActivity" />
         <activity android:name=".activity.business.MuilSelectBeanActivity" />
         <activity android:name=".activity.business.BBookingDetailActivity" />
-        <activity android:name=".activity.shares.MuiltSelectShareActivity" />
+        <activity android:name=".activity.shares.MuiltSelectShareActivity" 
+            android:label="@string/booking_share"
+            android:theme="@style/MainBaseTheme"/>
         <activity android:name=".activity.services.BServicesActivity" />
         <activity android:name=".activity.services.BServiceListActivity" />
         <activity android:name=".activity.services.BServiceAddActivity" />

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -28,7 +28,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectEmUser;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.StringJsonObjectRequest;
@@ -57,7 +57,7 @@ import java.util.Map;
  * @desc:商务预约新增界面
  * @author：Arison on 2017/9/7
  */
-public class BBookingAddActivity extends OABaseActivity implements View.OnClickListener {
+public class BBookingAddActivity extends SupportToolBarActivity implements View.OnClickListener {
     private TextView tvBookObject;
     private RelativeLayout companyAddRl;
     private RelativeLayout rlObject;
@@ -350,7 +350,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 "\"ab_longitude\":\"" + longitude + "\",\n" +
                 "\"ab_latitude\":\"" + latitude + "\"" +
                 "}\n";
-        showLoading();
+       // showLoading();
         LogUtil.d("HttpLogs", "map:" + map);
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
@@ -362,7 +362,7 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                dimssLoading();
+                //dimssLoading();
                 LogUtil.d("", "" + o.toString());
                 if (JSONUtil.validate(o.toString())) {
                     String success = JSON.parseObject(o.toString()).getString("result");
@@ -581,19 +581,19 @@ public class BBookingAddActivity extends OABaseActivity implements View.OnClickL
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
         if (!StringUtil.isMobileNumber(phone)) {
-            showToast("选择人员电话号码为空或是格式不正确", R.color.load_submit);
+            showToast("选择人员电话号码为空或是格式不正确");
             return;
         }
         StringJsonObjectRequest<AddAttentionResult> request = new StringJsonObjectRequest<AddAttentionResult>(
                 Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-                dimssLoading();
+              //  dimssLoading();
             }
         }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
             @Override
             public void onResponse(ObjectResult<AddAttentionResult> result) {
-                showToast("短信发送成功", R.color.load_submit);
+                showToast("短信发送成功");
 
             }
         }, AddAttentionResult.class, null) {

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/BBSharesListActivity.java

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
 
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.widget.EmptyLayout;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.modular.booking.R;
@@ -15,11 +15,8 @@ import com.modular.booking.model.BookingModel;
 
 import java.util.ArrayList;
 
-/**
-  * @desc:分享列表界面
-  * @author：Arison on 2017/9/7
-  */
-public class BBSharesListActivity extends BaseActivity {
+
+public class BBSharesListActivity extends SupportToolBarActivity {
     
     private ArrayList<BookingModel> mDatas = new ArrayList<>();
     private BookAdapter mAdapter;

app_modular/appbooking/src/main/java/com/modular/booking/activity/shares/MuiltSelectShareActivity.java

@@ -13,7 +13,7 @@ import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.OAConfig;
 import com.core.model.SelectCollisionTurnBean;
 import com.core.model.SelectEmUser;
@@ -30,7 +30,7 @@ import com.modular.booking.model.BookingModel;
 import java.util.ArrayList;
 import java.util.List;
 
-public class MuiltSelectShareActivity extends OABaseActivity {
+public class MuiltSelectShareActivity extends SupportToolBarActivity {
     private ArrayList<BookingModel> mDatas = new ArrayList<>();
     private MuiltBookAdapter mAdapter;
     private PullToRefreshListView mlist;
@@ -152,10 +152,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
 
 
     public void shareBooking(String planids, String bplanids, String imids) {
-        showLoading();
-        //map包括planids 个人计划id,bplanids商务计划id,userids共享人员imid，多个id用逗号连接
         String map = "{\"planids\":\"" + planids + "\",\"bplanids\":\"" + bplanids + "\",\"userids\":\"" + imids + "\"}";
-        LogUtil.d("HttpLogs", "map:" + map);
         HttpClient httpClient = new HttpClient.Builder(Constants.IM_BASE_URL()).isDebug(true).build();
         httpClient.Api().send(new HttpClient.Builder()
                 .url("/user/appBatchShare")
@@ -165,7 +162,7 @@ public class MuiltSelectShareActivity extends OABaseActivity {
                 .build(), new ResultSubscriber<>(new ResultListener<Object>() {
             @Override
             public void onResponse(Object o) {
-                dimssLoading();
+//                dimssLoading();
                 if (JSONUtil.validate(o.toString())){
                     String result=JSON.parseObject(o.toString()).getString("result");
                     if ("success".equals(result)){

app_modular/appbooking/src/main/res/values-zh-rCN/strings.xml

@@ -32,7 +32,7 @@
     <string name="booking_personal">个人预约</string>
     <string name="booking_business">商务预约</string>
     <string name="booking_service">服务预约</string>
-    <string name="booking_share">共享预约</string>
+    <string name="booking_share">预约共享</string>
 
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>

app_modular/appbooking/src/main/res/values-zh-rTW/strings.xml

@@ -32,7 +32,7 @@
     <string name="booking_personal">个人预约</string>
     <string name="booking_business">商务预约</string>
     <string name="booking_service">服务预约</string>
-    <string name="booking_share">共享预约</string>
+    <string name="booking_share">预约共享</string>
 
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>

app_modular/appbooking/src/main/res/values/strings.xml

@@ -33,7 +33,7 @@
     <string name="booking_personal">个人预约</string>
     <string name="booking_business">商务预约</string>
     <string name="booking_service">服务预约</string>
-    <string name="booking_share">共享预约</string>
+    <string name="booking_share">预约共享</string>
 
     <string name="booking_add_company">企业</string>
     <string name="unspecified_hair_stylist">不指定发型师，预约门店</string>

app_modular/appme/build.gradle

@@ -26,4 +26,5 @@ dependencies {
     compile project(':applogin')
     compile project(':appcontact')
 
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
 }

app_modular/appme/src/main/AndroidManifest.xml

@@ -1,87 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.uas.appme" >
+    package="com.uas.appme">
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
+
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
+      
         android:supportsRtl="true">
-
-        <activity android:name="com.uas.appme.pedometer.view.NewStepActivity"
-            android:label="@string/set_sport"></activity>
-
         <activity
-            android:name="com.uas.appme.pedometer.view.NewStepListActivity"
-            android:label="@string/sports_recode_more"/>
-        <activity android:name="com.uas.appme.pedometer.view.StepSplashActivity"></activity>
-
-        <activity android:name="com.uas.appme.settings.activity.AboutActivity"/>
-        <activity android:name="com.uas.appme.settings.activity.BaseInfoActivity"/>
-        <activity android:name="com.uas.appme.settings.activity.BookingSetActivity"/>
+            android:name=".pedometer.view.NewStepActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_sport" />
+        <activity
+            android:name=".pedometer.view.NewStepListActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/sports_recode_more" />
+        <activity android:name=".pedometer.view.StepSplashActivity" />
+        <activity android:name=".settings.activity.AboutActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_about"/>
+        <activity android:name=".settings.activity.BaseInfoActivity" />
+        <activity android:name=".settings.activity.BookingSetActivity" 
+            android:label="@string/booking_time_set"
+            android:theme="@style/MainBaseTheme"/>
         <activity
-            android:name="com.uas.appme.settings.activity.FeedbackActivity"
+            android:name=".settings.activity.FeedbackActivity"
+            android:theme="@style/MainBaseTheme"
             android:windowSoftInputMode="stateHidden|stateAlwaysHidden">
             <intent-filter>
                 <action android:name="com.modular.main.FeedbackActivity" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
-        <activity android:name="com.uas.appme.settings.activity.SelectLanguageActivity"/>
+        <activity android:name=".settings.activity.SelectLanguageActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_language"/>
         <activity
-            android:name="com.uas.appme.settings.activity.SettingActivity"
+            android:name=".settings.activity.SettingActivity"
+            android:theme="@style/MainBaseTheme"
             android:configChanges="keyboardHidden|orientation"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
-            android:name="com.uas.appme.other.activity.SelectAreaActivity"
+            android:name=".other.activity.SelectAreaActivity"
             android:screenOrientation="portrait" />
-        <activity android:name=".pedometer.view.UURanking"
+        <activity
+            android:name=".pedometer.view.UURanking"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/ranking">
             <intent-filter>
-                <action android:name="com.modular.appme.UURanking"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="com.modular.appme.UURanking" />
+
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".pedometer.view.PersonalPageActivity"/>
-        <activity android:name=".pedometer.view.ShareStepsActivity"
-            android:label="@string/share"/>
-        <activity android:name=".settings.activity.BSettingActivity"
-            android:label="@string/business_setting"/>
-        <activity android:name=".settings.activity.ImageSettingActivity"
-            android:label="@string/information_photo"/>
-        <activity android:name=".settings.activity.PersonSettingActivity"
+        <activity android:name=".pedometer.view.PersonalPageActivity" />
+        <activity
+            android:name=".pedometer.view.ShareStepsActivity"
+            android:label="@string/share" />
+        <activity
+            android:name=".settings.activity.BSettingActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/business_setting" />
+        <activity
+            android:name=".settings.activity.ImageSettingActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/information_photo" />
+        <activity
+            android:name=".settings.activity.PersonSettingActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/add_new_people"
-            android:windowSoftInputMode="adjustPan"/>
-        <activity android:name=".settings.activity.PersonSettingListActivity"
-            />
-        <activity android:name=".settings.activity.BComSetEmployeeRestActivity"
-            android:label="@string/set_e_relax"/>
-        <activity android:name=".settings.activity.BComSetCompanyRestActivity"
-            android:label="@string/set_c_relax"/>
-        <activity android:name=".settings.activity.BSettingLocationActivity"
-            android:label="@string/set_location"/>
+            android:windowSoftInputMode="adjustPan" />
+        <activity android:name=".settings.activity.PersonSettingListActivity" />
+        <activity
+            android:name=".settings.activity.BComSetEmployeeRestActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_e_relax" />
+        <activity
+            android:name=".settings.activity.BComSetCompanyRestActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_c_relax" />
+        <activity
+            android:name=".settings.activity.BSettingLocationActivity"
+            android:theme="@style/MainBaseTheme"
+            android:label="@string/set_location" />
         <activity android:name=".settings.activity.BRestActivity" />
         <activity android:name=".settings.activity.BSetComRestListActivity" />
-        <activity android:name=".settings.activity.BusinessHoursSetting"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing"/>
-        <activity android:name=".settings.activity.SigatureActivity"/>
-        <activity android:name=".settings.handwritedemo.LandscapeActivity"
+        <activity
+            android:name=".settings.activity.BusinessHoursSetting"
+            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
+        <activity android:name=".settings.activity.SigatureActivity" />
+        <activity
+            android:name=".settings.handwritedemo.LandscapeActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/salary_sign"
-            android:screenOrientation="landscape"
-            />
-        <activity android:name=".settings.activity.CheckWagesActivity"
+            android:screenOrientation="landscape" />
+        <activity
+            android:name=".settings.activity.CheckWagesActivity"
             android:windowSoftInputMode="stateUnspecified|adjustNothing">
             <intent-filter>
-                <action android:name="com.modular.appme.CheckWagesActivity"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="com.modular.appme.CheckWagesActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity android:name=".settings.activity.WagesDetailsActivity"
-            />
-        <activity android:name=".settings.activity.TableSetActivity"/>
-        <activity android:name=".settings.activity.TableListActivity"/>
-        <activity android:name=".settings.activity.FindWagePWActivity"
-            android:label="@string/change_qpw"/>
+        <activity android:name=".settings.activity.WagesDetailsActivity" />
+        <activity android:name=".settings.activity.TableSetActivity" />
+        <activity android:name=".settings.activity.TableListActivity" />
+        <activity
+            android:name=".settings.activity.FindWagePWActivity"
+            android:label="@string/change_qpw" />
+      <!--  <activity android:name=".settings.activity.PayTestActivity"></activity>-->
     </application>
-</manifest>
+
+</manifest>

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepActivity.java

@@ -21,7 +21,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.core.app.Constants;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.uas.appme.R;
 import com.uas.appme.pedometer.bean.StepEntity;
@@ -42,7 +42,7 @@ import java.util.TimerTask;
  * Created by FANGlh on 2017/4/13.
  * function:
  */
-public class NewStepActivity extends BaseActivity implements Handler.Callback {
+public class NewStepActivity extends SupportToolBarActivity implements Handler.Callback {
 
     /**
      * 屏幕长度和宽度

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/NewStepListActivity.java

@@ -15,7 +15,7 @@ import com.common.data.ListUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.dao.DBManager;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
@@ -34,7 +34,7 @@ import java.util.List;
  * Created by FANGlh on 2017/4/13.
  * function:
  */
-public class NewStepListActivity extends BaseActivity {
+public class NewStepListActivity extends SupportToolBarActivity {
     private UuStepNumAdapter muuStepNumAdapter;
     private StepDataDao stepDataDao;
     private List<StepEntity> stepEntityList;

app_modular/appme/src/main/java/com/uas/appme/pedometer/view/UURanking.java

@@ -25,7 +25,7 @@ import com.common.data.StringUtil;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.MyListView;
@@ -55,7 +55,7 @@ import de.hdodenhof.circleimageview.CircleImageView;
  * function:
  */
 
-public class UURanking extends BaseActivity implements View.OnClickListener {
+public class UURanking extends SupportToolBarActivity implements View.OnClickListener {
     private CircleImageView mPhotoImg;
     private TextView mNameTv;
     private TextView mRankingTv;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java

@@ -16,7 +16,7 @@ import android.widget.TextView;
 import com.afollestad.materialdialogs.GravityEnum;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.common.system.SystemUtil;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.IntentUtils;
 import com.core.widget.view.Activity.CommonWebviewActivity;
@@ -28,7 +28,7 @@ import com.umeng.socialize.bean.SHARE_MEDIA;
 import com.umeng.socialize.media.UMImage;
 import com.uuzuche.lib_zxing.activity.CodeUtils;
 
-public class AboutActivity extends BaseActivity implements View.OnClickListener {
+public class AboutActivity extends SupportToolBarActivity implements View.OnClickListener {
 
     private RelativeLayout me_name;
     private RelativeLayout me_function;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetCompanyRestActivity.java

@@ -21,7 +21,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.time.wheel.OASigninPicker;
@@ -42,7 +42,7 @@ import java.util.List;
  * function:
  */
 
-public class BComSetCompanyRestActivity extends BaseActivity implements View.OnClickListener{
+public class BComSetCompanyRestActivity extends SupportToolBarActivity implements View.OnClickListener{
     private MyListView mComList;
     private List<CompanyRestBean> mList;  //进行保存的员工休息数据列表
     private ComRestAdapter myAdapter;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BComSetEmployeeRestActivity.java

@@ -31,7 +31,7 @@ import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
@@ -59,7 +59,7 @@ import static com.common.data.JSONUtil.getJSONArray;
  * function:
  */
 
-public class BComSetEmployeeRestActivity extends BaseActivity implements View.OnClickListener{
+public class BComSetEmployeeRestActivity extends SupportToolBarActivity implements View.OnClickListener{
     private MyListView mComList;
     private List<ComRestBean> mList;  //进行保存的员工休息数据列表
     private ComRestAdapter myAdapter;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingActivity.java

@@ -13,7 +13,7 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.utils.CommonUtil;
 import com.me.network.app.http.HttpClient;
 import com.me.network.app.http.Method;
@@ -26,7 +26,7 @@ import com.uas.appme.R;
  * function:
  */
 
-public class BSettingActivity extends BaseActivity implements View.OnClickListener {
+public class BSettingActivity extends SupportToolBarActivity implements View.OnClickListener {
 
     private String sc_industry = null;
     private String sc_industrycode = null;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BSettingLocationActivity.java

@@ -40,6 +40,7 @@ import com.common.ui.CameraUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -72,7 +73,7 @@ import java.util.regex.Pattern;
  * function:
  */
 
-public class BSettingLocationActivity extends BaseActivity implements View.OnClickListener{
+public class BSettingLocationActivity extends SupportToolBarActivity implements View.OnClickListener{
     private MyListView mComList;
     private List<BSetLocationBean> mList;  //进行保存的员工休息数据列表
     private BSetLocationAdapter myAdapter;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/BookingSetActivity.java

@@ -14,11 +14,10 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.OABaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.time.wheel.TimePicker;
-import com.core.widget.view.imp.HttpImp;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.uas.appme.R;
@@ -32,7 +31,7 @@ import java.util.Map;
  * @desc:设置时间段
  * @author：Arison on 2017/6/26
  */
-public class BookingSetActivity extends OABaseActivity implements HttpImp, View.OnClickListener {
+public class BookingSetActivity extends SupportToolBarActivity implements  View.OnClickListener {
 
     private Button submit_btn;
     private TextView tv_endTime;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/FeedbackActivity.java

@@ -41,10 +41,10 @@ import com.common.ui.ProgressDialogUtil;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
-import com.core.app.AppConstant;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.UploadFileResult;
 import com.core.net.http.ViewUtil;
 import com.core.net.volley.ObjectResult;
@@ -65,9 +65,9 @@ import com.lidroid.xutils.http.RequestParams;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
-import com.uas.appme.R;
 import com.modular.login.activity.LoginActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.uas.appme.R;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -83,7 +83,7 @@ import java.util.regex.Pattern;
  * @author：Arison on 2016/9/27
  * update : FANGlh on 2017-5-23 关于问题反馈上传文字新增字段，发送图片及更新更新附件ID接口
  */
-public class FeedbackActivity extends BaseActivity implements View.OnClickListener {
+public class FeedbackActivity extends SupportToolBarActivity implements View.OnClickListener {
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
     private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
     private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
@@ -216,9 +216,9 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
         findViewById(R.id.display_rl).setOnClickListener(this);
 
         if (mType == 0) {
-            getSupportActionBar().setTitle(getString(R.string.send_words));
+          setTitle(getString(R.string.send_words));
         } else {
-            getSupportActionBar().setTitle(getString(R.string.Rated_suggest));
+            setTitle(getString(R.string.Rated_suggest));
         }
         mTextEdit = (EditText) findViewById(R.id.text_edit);
         mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);

app_modular/appme/src/main/java/com/uas/appme/settings/activity/ImageSettingActivity.java

@@ -24,7 +24,7 @@ import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
@@ -50,7 +50,7 @@ import java.util.Map;
  * function:
  */
 
-public class ImageSettingActivity extends BaseActivity implements View.OnClickListener{
+public class ImageSettingActivity extends SupportToolBarActivity implements View.OnClickListener{
     private ImageView mImageIm;
     private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照

app_modular/appme/src/main/java/com/uas/appme/settings/activity/PersonSettingActivity.java

@@ -34,7 +34,7 @@ import com.common.ui.ImageUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
@@ -70,9 +70,7 @@ import java.util.Map;
  * Created by FANGlh on 2017/10/10.
  * function:
  */
-
-
-public class PersonSettingActivity extends BaseActivity implements View.OnClickListener{
+public class PersonSettingActivity extends SupportToolBarActivity implements View.OnClickListener{
     private FormEditText mUserNameTv;
     private FormEditText mUserSexTv;
     private RelativeLayout mRySetStartTime;

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SelectLanguageActivity.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -17,8 +16,7 @@ import android.widget.TextView;
 
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
-import com.core.base.BaseActivity;
-import com.core.widget.view.EmptyLayout;
+import com.core.base.SupportToolBarActivity;
 import com.core.widget.view.SmoothCheckBox;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -28,14 +26,10 @@ import com.uas.appme.settings.model.Business;
 
 import java.util.ArrayList;
 
-/**
- * @desc:切换语言
- * @author：Arison on 2017/5/11
- */
-public class SelectLanguageActivity extends BaseActivity {
+
+public class SelectLanguageActivity extends SupportToolBarActivity {
 
     private PullToRefreshListView mlist;
-    private EmptyLayout mEmptyLayout;
     private BussinessDetailAdapter mAdapter;
     private ArrayList<Business> mData = new ArrayList<Business>();
     private String currentLanguage;
@@ -73,10 +67,7 @@ public class SelectLanguageActivity extends BaseActivity {
     }
 
     private void initView() {
-        getSupportActionBar().setTitle(getString(R.string.set_language));
-
         mlist = (PullToRefreshListView) findViewById(R.id.list_business);
-        mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -84,9 +75,7 @@ public class SelectLanguageActivity extends BaseActivity {
                 BussinessDetailAdapter.ViewHolder holder = (BussinessDetailAdapter.ViewHolder) view.getTag();
                 //ToastMessage();
                 final boolean flag = !mAdapter.getMdata().get(position - 1).isChecked;
-                Log.i(TAG, "onClick:" + position + " check:" + !flag);
                 currentLanguage = holder.tv_business_name.getHint().toString();
-
                 for (Business model : mAdapter.getMdata()) {
                     model.setIsChecked(false);
                 }

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -43,7 +43,7 @@ import com.core.app.AppConfig;
 import com.core.app.AppConstant;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.dao.work.VideoFileDao;
 import com.core.dao.work.WorkModelDao;
 import com.core.model.OAConfig;
@@ -75,7 +75,7 @@ import java.util.List;
 /**
  * 设置
  */
-public class SettingActivity extends BaseActivity implements View.OnClickListener {
+public class SettingActivity extends SupportToolBarActivity implements View.OnClickListener {
 
     private TextView mExitBtn;
     private TextView mCacheTv;
@@ -112,7 +112,8 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_setting);
-        getSupportActionBar().setTitle(getString(R.string.user_setting));
+        //getSupportActionBar().setTitle(getString(R.string.user_setting));
+        super.setTitle(getString(R.string.user_setting));
         initView();
     }
 
@@ -141,20 +142,14 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
         businessmen_setting_rl = (RelativeLayout) findViewById(R.id.businessmen_setting_rl);
         businessmen_setting_rl.setOnClickListener(this);
         bsettingRed = (TextView) findViewById(R.id.businessmen_setting_new);
-
         if (PreferenceUtils.getBoolean(MyApplication.getInstance(), Constants.B_SETTINGRED)) //商家设置红点
             bsettingRed.setVisibility(View.GONE);
-
         new_step_rl.setOnClickListener(this);
-//        new_step_rl.setVisibility(View.GONE);
-
         dialog = new ProgressDialog(this);
         dialog.setIndeterminate(true);
         share_rl = (RelativeLayout) findViewById(R.id.share_rl);
         mExitBtn = (TextView) findViewById(R.id.exit_btn);
-        //share_rl.setVisibility(View.GONE);
         int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constants.BAIDU_PUSH);
-
         if (isPush == -1) {//第一次进入没有配置
             cb_task_reply.setChecked(true);
         } else if (isPush == 0) {//选择不推送
@@ -183,7 +178,6 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
             @Override
             public void onClick(View v) {
                 showExitDialog();
-
             }
         });
         mCacheTv = (TextView) findViewById(R.id.cache_tv);

app_modular/appme/src/main/java/com/uas/appme/settings/handwritedemo/LandscapeActivity.java

@@ -1,17 +1,17 @@
 package com.uas.appme.settings.handwritedemo;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Toast;
 
+import com.core.base.SupportToolBarActivity;
 import com.uas.appme.R;
 import com.uas.appme.settings.activity.SigatureActivity;
 import com.uas.appme.settings.activity.WagesDetailsActivity;
 
 import java.io.IOException;
 
-public class LandscapeActivity extends Activity implements View.OnClickListener {
+public class LandscapeActivity extends SupportToolBarActivity implements View.OnClickListener {
    private LinePathView pathView;
     private int signCode;
 

app_modular/appme/src/main/res/layout/activity_pay_test.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/btn_wxPay"
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+             android:layout_margin="5dp"
+            android:textColor="@color/white"
+            android:background="@drawable/bg_blue_button"
+            android:layout_weight="1"
+            android:text="微信支付" />
+
+        <Button
+            android:id="@+id/btn_wxRefund"
+            android:background="@drawable/bg_blue_button"
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+            android:layout_margin="5dp"
+            android:textColor="@color/white"
+            android:layout_weight="1"
+            android:text="微信退款" />
+    </LinearLayout>
+
+    <ListView
+        android:id="@+id/lv_wxPay"
+        android:layout_width="match_parent"
+        android:layout_height="220dp"
+        android:divider="@color/gray_light">
+
+    </ListView>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <Button
+            android:id="@+id/btn_aliPay"
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+            android:layout_margin="5dp"
+            android:textColor="@color/white"
+            android:background="@drawable/bg_blue_button"
+            android:layout_weight="1"
+            android:text="支付宝支付" />
+
+        <Button
+            android:id="@+id/btn_aliRefund"
+            android:layout_width="match_parent"
+            android:layout_height="35dp"
+            android:layout_margin="5dp"
+            android:textColor="@color/white"
+            android:background="@drawable/bg_blue_button"
+            android:layout_weight="1"
+            android:text="支付宝退款" />
+    </LinearLayout>
+    <ListView
+        android:id="@+id/lv_aliPay"
+        android:layout_width="match_parent"
+        android:layout_height="220dp"
+        android:divider="@color/gray_light">
+    </ListView>
+</LinearLayout>

app_modular/appme/src/main/res/layout/item_pay_test.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+  >
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="5dp"
+    android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="订单编号:"/>
+
+        <TextView
+            android:id="@+id/orderID"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/sp_12"
+            android:text="xxxxxxxxxxxxxxxxxx"
+            android:textColor="@color/black" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="订单状态:"/>
+
+        <TextView
+            android:id="@+id/orderState"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="xxxx"
+            android:textColor="@color/black" />
+    </LinearLayout>
+   
+</LinearLayout>
+    
+    <LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+        android:padding="5dp"
+    android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="订单金额:"/>
+
+        <TextView
+            android:id="@+id/orderNum"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="xxxx"
+            android:textColor="@color/black" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="订单时间:"/>
+
+        <TextView
+            android:id="@+id/orderTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/sp_12"
+            android:text="xxxx"
+            android:textColor="@color/black" />
+    </LinearLayout>
+
+</LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="5dp"
+        android:orientation="horizontal">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="vertical">
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="支付平台订单号:"/>
+
+            <TextView
+                android:id="@+id/orderNo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/sp_12"
+                android:text="xxxx"
+                android:textColor="@color/black" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/btn_action"
+                android:layout_width="66dp"
+                android:gravity="center"
+                android:layout_height="30dp"
+                android:background="@drawable/bg_blue_button"
+                android:text="支付" />
+        </LinearLayout>
+
+    </LinearLayout>
+</LinearLayout>

app_modular/appme/src/main/res/values/strings.xml

@@ -1868,5 +1868,4 @@
     <string name="rest_date">休息时间</string>
 
 
-
 </resources>

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

@@ -16,7 +16,6 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 /**
  * Created by Bitlike on 2017/12/25.
  */
-
 public class WxPlay {
     private IWXAPI wxApi;
     private static WxPlay api;
@@ -51,7 +50,10 @@ public class WxPlay {
             request.timeStamp = JSONUtil.getText(orderObject, "timestamp");
             request.sign = JSONUtil.getText(orderObject, "sign");
 
-            wxApi.sendReq(request);
+           boolean result= wxApi.sendReq(request);
+           if (result){
+               onPlayListener.onSuccess("200","订单支付成功");
+           }
         } else {
             onPlayListener.onFailure("500", "订单信息获取异常");
         }

app_modular/apputils/src/main/res/values/style.xml

@@ -19,5 +19,6 @@
         <item name="android:windowDisablePreview">true</item>
         <item name="styleLoadingLayout">@style/LoadingLayoutStyle</item>
         <item name="android:homeAsUpIndicator">@drawable/actionbar_up_indicator</item>
+        <item name="actionMenuTextColor">#ffffff</item>
     </style>
 </resources>

app_modular/appworks/src/main/AndroidManifest.xml

@@ -202,6 +202,7 @@
             android:label="@string/change_mobile" />
         <activity
             android:name=".OA.erp.activity.MissionSetActivity"
+            android:theme="@style/MainBaseTheme"
             android:label="@string/activity_mission_set" />
         <activity
             android:name=".OA.erp.activity.MissionActivity"

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MissionSetActivity.java

@@ -14,7 +14,7 @@ import com.common.preferences.PreferenceUtils;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
-import com.core.base.BaseActivity;
+import com.core.base.SupportToolBarActivity;
 import com.core.model.SelectBean;
 import com.core.utils.CommonInterface;
 import com.core.widget.view.Activity.SelectActivity;
@@ -24,7 +24,7 @@ import com.uas.appworks.R;
 
 import java.util.ArrayList;
 
-public class MissionSetActivity extends BaseActivity implements View.OnClickListener {
+public class MissionSetActivity extends SupportToolBarActivity implements View.OnClickListener {
     private SwitchView auto_sv;
     private SwitchView needprocess_sv;
     private RelativeLayout distance_rl;