提交类型 处理bug、移除支付宝的sdk

提交内容
1.工作日历内容由于隐藏了头以后，出现listView定焦问题，现在把焦点定在ListView之上的View，注意隐藏时候需要修改
2.工作日历的日历控件由于在预约模块的需要，修改了该控件的一些功能，导致出现进去时候没有默认为当天的bug
3.去除一元娟模块的支付功能
 冲突 无

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -466,7 +466,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         LinearLayout.LayoutParams linearParams = (LinearLayout.LayoutParams) viewPager.getLayoutParams(); // 取控件mGrid当前的布局参数   搜索
         linearParams.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);// 当控件的高强制设成50象素
         viewPager.setLayoutParams(linearParams); // 使设置好的布局参数应用到控件myGrid
-        pagerAdapter = new OACalenderViewPagerAdapter(ct);
+        pagerAdapter = new OACalenderViewPagerAdapter(ct,curDate);
         viewPager.setAdapter(pagerAdapter);
         viewPager.setCurrentItem(OACalenderViewPagerAdapter.MAX_NUM / 2);
         //判断是否是管理员

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Dec 13 16:55:40 CST 2017
-debugName=150
+#Thu Dec 14 15:31:52 CST 2017
+debugName=154
 versionName=624
-debugCode=150
+debugCode=154
 versionCode=163

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

@@ -16,7 +16,7 @@ public class Constants {
     public static String IM_BASE_URL() {
         String url = "";
         if (BaseConfig.isDebug()) {
-            url = IM_BASE_URL;
+            url = IM_BASE_URL_TEST;
         } else {
             url = IM_BASE_URL;
         }

app_core/common/src/main/res/layout/activity_oamain.xml

@@ -10,6 +10,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:focusableInTouchMode="true"
         android:orientation="vertical">
 
         <LinearLayout
@@ -257,6 +258,7 @@
         <!--end 头布局-->
         <FrameLayout
             android:layout_width="match_parent"
+            android:focusableInTouchMode="true"
             android:layout_height="match_parent">
 
             <!--标签布局-->

app_modular/apputils/src/main/java/com/modular/apputils/utils/SwitchUtil.java

@@ -9,7 +9,7 @@ import com.common.config.BaseConfig;
 public class SwitchUtil {
 
     public static boolean showYiyuanjuan() {
-        return BaseConfig.isDebug()&&false;
+        return BaseConfig.isDebug() && false;
     }
 
     public static boolean showShebeiguanli() {

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

@@ -7,7 +7,6 @@ import android.os.Looper;
 import android.os.Message;
 import android.text.TextUtils;
 
-import com.alipay.sdk.app.PayTask;
 import com.common.LogUtil;
 import com.common.thread.ThreadPool;
 import com.modular.apputils.listener.OnPlayListener;
@@ -91,16 +90,16 @@ public class AliPlay extends Handler {
     }
 
     private void payThread(Activity ct,  String orderInfo,  OnPlayListener onPlayListener) throws Exception {
-        PayTask alipay = new PayTask(ct);
-        LogUtil.i("orderInfo=" + orderInfo);
-        Map<String, String> result = alipay.payV2(orderInfo, true);
-        LogUtil.i(result.toString());
-        Message msg = new Message();
-        Bundle bundle = new Bundle();
-        bundle.putSerializable("onPlayListener", onPlayListener);
-        msg.setData(bundle);
-        msg.what = SDK_PAY_FLAG;
-        msg.obj = result;
-        sendMessage(msg);
+//        PayTask alipay = new PayTask(ct);
+//        LogUtil.i("orderInfo=" + orderInfo);
+//        Map<String, String> result = alipay.payV2(orderInfo, true);
+//        LogUtil.i(result.toString());
+//        Message msg = new Message();
+//        Bundle bundle = new Bundle();
+//        bundle.putSerializable("onPlayListener", onPlayListener);
+//        msg.setData(bundle);
+//        msg.what = SDK_PAY_FLAG;
+//        msg.obj = result;
+//        sendMessage(msg);
     }
 }