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

# Conflicts:
#	WeiChat/version.properties
#	app_modular/appworks/src/main/AndroidManifest.xml

WeiChat/build.gradle

@@ -147,16 +147,13 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-
     testCompile deps.junit
     compile deps.appcompatV7
     compile deps.cardviewV7
     compile deps.design
-
     compile(deps.stetho) {
         force = true
     }
-
     compile deps.jodatime
     compile deps.systembartint
     compile deps.photoView
@@ -167,7 +164,6 @@ dependencies {
     compile deps.stickyGridHeaders
     compile deps.materialDialogs
     compile deps.okhttp
-
     androidTestCompile deps.leakcanaryNp
     debugCompile deps.leakcanary
     releaseCompile deps.leakcanaryNp
@@ -178,12 +174,12 @@ dependencies {
     compile project(':imageload')
     compile project(':applogin')
     compile project(':apptasks')
-
     compile project(':appcontact')
     compile project(':appme')
     compile project(':appworks')
-    compile project(":appbooking")
+    compile project(':appbooking')
     compile project(':android-pdf-viewer')
+    compile project(':apputils')
 }
 
 buildscript {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -188,7 +188,7 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     } else if (ApiUtils.getApiModel() instanceof ApiUAS) {
                         String travelCaller = CommonUtil.getSharedPreferences(context, Constants.WORK_TRAVEL_CALLER_CACHE);
                         if (StringUtil.isEmpty(travelCaller)) {
-                            intent.putExtra("caller", "FeePlease!CCSQ");
+                            intent.putExtra("caller", "FeePlease!CCSQ!new");
                         } else {
                             intent.putExtra("caller", travelCaller);
                         }

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

@@ -0,0 +1,51 @@
+package com.xzjmyk.pm.activity.wxapi;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.core.app.Constants;
+import com.tencent.mm.sdk.modelbase.BaseReq;
+import com.tencent.mm.sdk.modelbase.BaseResp;
+import com.tencent.mm.sdk.modelmsg.SendAuth;
+import com.tencent.mm.sdk.openapi.IWXAPI;
+import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
+import com.tencent.mm.sdk.openapi.WXAPIFactory;
+
+public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
+    private IWXAPI api;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        api = WXAPIFactory.createWXAPI(this, Constants.WXPAY_APPID, true);
+        api.handleIntent(getIntent(), this);
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+    }
+
+    @Override
+    public void onReq(BaseReq req) {
+    }
+
+    @Override
+    public void onResp(BaseResp resp) {
+        try {
+            switch (resp.errCode) {
+                case BaseResp.ErrCode.ERR_OK: {
+                    if (resp != null && resp instanceof SendAuth.Resp) {
+
+                    }
+                }
+                break;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        finish();
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.xzjmyk.pm.activity.wxapi;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.core.app.Constants;
+import com.tencent.mm.opensdk.constants.ConstantsAPI;
+import com.tencent.mm.sdk.modelbase.BaseReq;
+import com.tencent.mm.sdk.modelbase.BaseResp;
+import com.tencent.mm.sdk.openapi.IWXAPI;
+import com.tencent.mm.sdk.openapi.IWXAPIEventHandler;
+import com.tencent.mm.sdk.openapi.WXAPIFactory;
+
+public class WXPayEntryActivity extends Activity implements IWXAPIEventHandler {
+    private IWXAPI api;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+//        setContentView(R.layout.pay_result);
+        api = WXAPIFactory.createWXAPI(this, Constants.WXPAY_APPID);
+        api.handleIntent(getIntent(), this);
+    }
+
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+        setIntent(intent);
+        api.handleIntent(intent, this);
+    }
+
+    @Override
+    public void onReq(BaseReq req) {
+    }
+
+    @Override
+    public void onResp(BaseResp resp) {
+
+        // 0 支付成功
+        // -2取消
+        if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
+//			AlertDiaWedroidLog.Builder builder = new AlertDiaWedroidLog.Builder(this);
+//			builder.setTitle(R.string.app_tip);
+//			builder.setMessage(getString(R.string.pay_result_callback_msg, String.valueOf(resp.errCode)));
+//			builder.show();
+            Intent mIntent = new Intent("wxpay");
+            if (resp.errCode == 0) {
+                mIntent.putExtra("result", true);
+            } else {
+                mIntent.putExtra("result", false);
+            }
+            sendBroadcast(mIntent);
+        }
+        finish();
+    }
+}

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Dec 26 10:15:22 CST 2017
-debugName=247
+#Tue Dec 26 09:12:57 CST 2017
+debugName=240
 versionName=613
-debugCode=247
+debugCode=240
 versionCode=152

app_core/common/src/main/java/com/core/app/Constants.java

@@ -23,6 +23,8 @@ public class Constants {
         return url;
     }
 
+    public static final String WXPAY_APPID = "wxd1deafafe3fd9a21";
+
     public static String charitBaseUrl() {
         return "http://lj.ubtob.com/app/";
     }

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

@@ -30,7 +30,7 @@ public class HttpClient {
     private File cacheFile;//缓存文件路径
     private long cacheFileSize;//缓存文件大小
     private int maxRetryCount;// 最大重试次数
-    private boolean isDebug = true;// 是否开启打印日志
+    private boolean isDebug;// 是否开启打印日志
     private Builder mBuilder;
 
     private HttpBase httpBase;
@@ -115,7 +115,7 @@ public class HttpClient {
         private long cacheFileSize;//缓存文件大小
         private int maxRetryCount;// 最大重试次数
         private long retryTimeout = 5;//重试间隔时间
-        private boolean isDebug = true;// 是否开启打印日志
+        private boolean isDebug;// 是否开启打印日志
         private HttpBase httpBase;//具体的网络请求类
         private int what;
 

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

@@ -3,10 +3,9 @@ package com.modular.apputils.utils.playsdk;
 
 import android.content.Context;
 
-import com.modular.apputils.R;
+import com.core.app.Constants;
 import com.tencent.mm.opensdk.constants.ConstantsAPI;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
-import com.tencent.mm.opensdk.modelmsg.WXTextObject;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
@@ -16,7 +15,6 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory;
  */
 
 public class WxPlay {
-    private static final String APP_ID = "";
     private IWXAPI wxApi;
     private static WxPlay api;
 
@@ -37,26 +35,26 @@ public class WxPlay {
 
 
     public void init(Context context) {
-        wxApi = WXAPIFactory.createWXAPI(context, null);
-        wxApi.registerApp(APP_ID);
+        wxApi = WXAPIFactory.createWXAPI(context, Constants.WXPAY_APPID);
+        wxApi.registerApp(Constants.WXPAY_APPID);
     }
 
 
-
-    public void ss(){
+    public void ss() {
         PayReq request = new PayReq();
         request.appId = "wxd930ea5d5a258f4f";
         request.partnerId = "1900000109";
-        request.prepayId= "1101000000140415649af9fc314aa427";
+        request.prepayId = "1101000000140415649af9fc314aa427";
         request.packageValue = "Sign=WXPay";
-        request.nonceStr= "1101000000140429eb40476f8896f4c9";
-        request.timeStamp= "1398746574";
-        request.sign= "7FFECB600D7157C5AA49810D2D8F28BC2811827B";
+        request.nonceStr = "1101000000140429eb40476f8896f4c9";
+        request.timeStamp = "1398746574";
+        request.sign = "7FFECB600D7157C5AA49810D2D8F28BC2811827B";
         wxApi.sendReq(request);
 
     }
-    public void onResp(BaseResp resp){
-        if(resp.getType()== ConstantsAPI.COMMAND_PAY_BY_WX){
+
+    public void onResp(BaseResp resp) {
+        if (resp.getType() == ConstantsAPI.COMMAND_PAY_BY_WX) {
 //            Log.d(TAG,"onPayFinish,errCode="+resp.errCode);
 //            AlertDialog.Builderbuilder=newAlertDialog.Builder(this);
 //            builder.setTitle(R.string.app_tip);

app_modular/appworks/src/main/AndroidManifest.xml

@@ -346,6 +346,14 @@
             android:label="@string/text_cycle_count_add"
         />
         <activity android:name=".OA.platform.activity.BusinessTravelActivity"></activity>
+            android:label="@string/text_cycle_count_add" />
+        <activity android:name=".OA.platform.activity.BusinessTravelActivity">
+            <intent-filter>
+                <action android:name="com.modular.work.BusinessTravelActivity" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
 
         <activity android:name=".activity.DeviceQueryActivity"
                   android:windowSoftInputMode="adjustPan">

app_modular/appworks/src/main/java/com/uas/appworks/CRM/erp/activity/DeviceDataFormAddActivity.java

@@ -35,27 +35,23 @@ import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.RegexUtil;
 import com.common.data.StringUtil;
-import com.common.preferences.PreferenceUtils;
-import com.core.app.AppConfig;
 import com.core.app.Constants;
-import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.net.utils.NetUtils;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
-import com.modular.apputils.activity.SelectNetAcitivty;
-import com.modular.apputils.utils.PopupWindowHelper;
 import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.ListViewInScroller;
 import com.core.widget.view.model.SelectAimModel;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.widget.view.selectcalendar.bean.Data;
 import com.lidroid.xutils.ViewUtils;
+import com.modular.apputils.activity.SelectNetAcitivty;
+import com.modular.apputils.utils.PopupWindowHelper;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
-import com.core.widget.view.selectcalendar.bean.Data;
-import com.uas.appworks.OA.erp.activity.form.DataFormFieldActivity;
 import com.uas.appworks.OA.erp.activity.form.FormListSelectActivity;
 import com.uas.appworks.OA.erp.model.form.GroupData;
 import com.uas.appworks.R;

app_modular/appworks/src/main/java/com/uas/appworks/activity/CityIndustryServiceMainActivity.java

@@ -134,6 +134,7 @@ public class CityIndustryServiceMainActivity extends BaseMVPActivity<WorkPlatPre
     @Override
     protected void onStop() {
         super.onStop();
+        mBanner.stopAutoPlay();
     }
 
     @Override

app_modular/appworks/src/main/java/com/uas/appworks/activity/DeviceQueryActivity.java

@@ -34,6 +34,7 @@ import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.DeviceQueryConditionAdapter;
 import com.uas.appworks.datainquiry.adapter.DataInquiryFlexAdapter;
@@ -141,13 +142,13 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
         if (TextUtils.isEmpty(mCaller)) {
             mCaller = "Device";
         }
-        //TODO gongpengming
+
         if (!TextUtils.isEmpty(mClass)) {
-            String dc_class="dc_class";
-            if (mCaller!=null&&mCaller.equals("DeviceChange!Maintain")){
-                dc_class="db_class";
-            }
-            mBaseCondition = "("+dc_class+" = \'" + mClass + "\')";
+            String dc_class = "dc_class";
+//            if (mCaller != null && mCaller.equals("DeviceChange!Maintain")) {
+//                dc_class = "db_class";
+//            }
+            mBaseCondition = "(" + dc_class + " = \'" + mClass + "\')";
             mCondition = mBaseCondition;
         }
     }
@@ -196,7 +197,28 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 int reallyPosition = (int) parent.getItemIdAtPosition(position);
-                if (CommonUtil.isRepeatClick()) {
+                List<DataInquiryFlexBean.RowBean> rowBeans = mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).getRowBeans();
+                String keyValue = null, status = null;
+                for (DataInquiryFlexBean.RowBean rowBean : rowBeans) {
+                    List<DataInquiryFlexBean.RowBean.RowChildBean> rowChildBeans = rowBean.getRowChildBeans();
+                    for (DataInquiryFlexBean.RowBean.RowChildBean rowChildBean : rowChildBeans) {
+                        if ("dc_id".equals(rowChildBean.getField())) {
+                            keyValue = rowChildBean.getValue();
+                        }
+                        if ("dc_status".equals(rowChildBean.getField())) {
+                            status = rowChildBean.getValue();
+                        }
+                    }
+                    if (keyValue != null && status != null) {
+                        break;
+                    }
+                }
+                startActivity(new Intent(mContext, CommonDocDetailsActivity.class)
+                        .putExtra("caller", mCaller)
+                        .putExtra("keyValue", keyValue)
+                        .putExtra("device", true)
+                        .putExtra("status", status));
+                /*if (CommonUtil.isRepeatClick()) {
                     if (mOldPosition == reallyPosition) {
                         mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).setIsFlex(!mDeviceQueryFlexAdapter.getObjects().get(reallyPosition).isFlex());
                         mDeviceQueryFlexAdapter.notifyDataSetChanged();
@@ -204,7 +226,7 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                         mOldPosition = reallyPosition;
                     }
                 }
-                mOldPosition = reallyPosition;
+                mOldPosition = reallyPosition;*/
             }
         });
         mDataListView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
@@ -591,6 +613,7 @@ public class DeviceQueryActivity extends BaseMVPActivity<WorkPlatPresenter> impl
                                     DataInquiryFlexBean.RowBean.RowChildBean rowChildBean = new DataInquiryFlexBean.RowBean.RowChildBean();
                                     rowChildBean.setCaption(caption);
                                     rowChildBean.setValue(value);
+                                    rowChildBean.setField(field);
                                     rowChildBean.setWidth(columnsConditionBeans.get(j).getWidth());
 
                                     mAllRowChildBeans.add(rowChildBean);

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/activity/DataInquiryListActivity.java

@@ -532,6 +532,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
                                         }
                                         rowChildBean.setValue(value);
                                     }
+                                    rowChildBean.setField(field);
                                     rowChildBean.setWidth(mAllSchemeConditions.get(j).getWidth());
 
                                     mAllRowChildBeans.add(rowChildBean);

app_modular/appworks/src/main/java/com/uas/appworks/datainquiry/bean/DataInquiryFlexBean.java

@@ -39,6 +39,7 @@ public class DataInquiryFlexBean {
         public static class RowChildBean {
             private String mCaption;
             private String mValue;
+            private String mField;
             private int width;
 
             public int getWidth() {
@@ -64,6 +65,14 @@ public class DataInquiryFlexBean {
             public void setValue(String value) {
                 mValue = value;
             }
+
+            public String getField() {
+                return mField;
+            }
+
+            public void setField(String field) {
+                mField = field;
+            }
         }
     }
 }