androidv1.9.0

baseSDK/src/main/java/com/dayu/common/Constants.java

@@ -26,30 +26,30 @@ public class Constants {
     /**
      * uat环境配置.
      */
-    public static final String ENVIROMENT = "uat";
-    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
-    public static final String BASE_URL = "http://47.95.223.6:3112";
-    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
-    public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
-    public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
-    public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
-    public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
-    public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
-    public static final boolean IS_DEBUG = true;
+//    public static final String ENVIROMENT = "uat";
+//    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
+//    public static final String BASE_URL = "http://47.95.223.6:3112";
+//    public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
+//    public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
+//    public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
+//    public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
+//    public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
+//    public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
+//    public static final boolean IS_DEBUG = true;
 
     /**
      * 正式环境.
      */
-//    public static final String ENVIROMENT = "release";
-//    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
-//    public static final String BASE_URL = "https://mobile.kf.ai";
-//    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
-//    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
-//    public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
-//    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
-//    public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
-//    public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
-//    public static final boolean IS_DEBUG = false;
+    public static final String ENVIROMENT = "release";
+    public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
+    public static final String BASE_URL = "https://mobile.kf.ai";
+    public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
+    public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
+    public final static String WEB_SOP_DETAIL = "https://sop.kf.ai/#/sopdetail";
+    public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
+    public final static String CHECK_MULTI_WEB_SOP = "https://sop.kf.ai/#/manyServiceResult";
+    public final static String MULTI_WEB_SOP = "https://sop.kf.ai/#/manySop";
+    public static final boolean IS_DEBUG = false;
 
     /**
      * 演示环境

messageCenter/src/main/java/com/dayu/message/ui/fragment/HomeMessageFragment.java

@@ -7,7 +7,7 @@ import android.support.v4.app.Fragment;
 import com.dayu.base.ui.adapter.FragmentBaseAdapter;
 import com.dayu.base.ui.fragment.DataBindingFragment;
 import com.dayu.message.R;
-import com.dayu.message.databinding.FragmentMessage1Binding;
+import com.dayu.message.databinding.FragmentMessageBinding;
 import com.dayu.utils.TabLayoutUtils;
 import com.umeng.analytics.MobclickAgent;
 
@@ -22,7 +22,7 @@ import io.reactivex.functions.Function;
  * on 2017/11/20.
  */
 
-public class HomeMessageFragment extends DataBindingFragment<FragmentMessage1Binding> {
+public class HomeMessageFragment extends DataBindingFragment<FragmentMessageBinding> {
     private int mIndex = 0;
     private String mUmTag = "serverMessage";
 
@@ -35,7 +35,7 @@ public class HomeMessageFragment extends DataBindingFragment<FragmentMessage1Bin
 
     @Override
     public int getLayoutId() {
-        return R.layout.fragment_message1;
+        return R.layout.fragment_message;
     }
 
 

orderCenter/src/main/java/com/dayu/order/ui/adapter/OrderAdapter.java

@@ -377,7 +377,7 @@ public class OrderAdapter extends CoreAdapter<Order, FragmentOrderdoingItemBindi
         Intent intent;
         Bundle bundle = new Bundle();
         boolean flag = (boolean) SPUtils.get(Constants.ORDER_ID + order.getId(), false);
-        if (flag) {
+        if (!flag && (order.getFaceSwitch() != null && order.getFaceSwitch() == 1)) {
             mPresenter.dumpToFaceCert(order);
         } else {
             if (order.getSpus().size() > 1) {

orderCenter/src/main/java/com/dayu/order/ui/fragment/HomeOrderFragment.java

@@ -13,7 +13,7 @@ import com.dayu.base.ui.adapter.FragmentAdapter;
 import com.dayu.base.ui.fragment.BaseFragment;
 import com.dayu.order.R;
 import com.dayu.order.api.protocol.Tab;
-import com.dayu.order.databinding.FragmentOrderHome1Binding;
+import com.dayu.order.databinding.FragmentOrderHomeBinding;
 import com.dayu.order.presenter.homeorder.HomeOrderContract;
 import com.dayu.order.presenter.homeorder.HomeOrderPresenter;
 import com.dayu.provider.event.RefreshTab;
@@ -33,7 +33,7 @@ import java.util.List;
  * on 2017/11/20.
  */
 
-public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, FragmentOrderHome1Binding>
+public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, FragmentOrderHomeBinding>
         implements HomeOrderContract.View {
     public List<Fragment> list_fragments;
     private FragmentAdapter adapter;
@@ -52,7 +52,7 @@ public class HomeOrderFragment extends BaseFragment<HomeOrderPresenter, Fragment
 
     @Override
     public int getLayoutId() {
-        return R.layout.fragment_order_home1;
+        return R.layout.fragment_order_home;
     }
 
     @Override