Przeglądaj źródła

提交类型 修复bug
提交内容 处理外勤等界面在选择时间弹框弹出来的时候没有选择时间的情况下出现 时大约24的情况

Bitliker 7 lat temu
rodzic
commit
5939cf7fd9

+ 1 - 1
WeiChat/build.gradle

@@ -184,7 +184,7 @@ dependencies {
     compile project(':appbooking')
     compile project(':appmusic')
     compile project(':apputils')
-    compile project(':faceplatform-ui')
+//    compile project(':faceplatform-ui')
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     compile 'com.android.support:support-v4:26.+'
 }

+ 1 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -43,7 +43,6 @@ import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
 import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
 import com.baidu.autoupdatesdk.UICheckUpdateCallback;
-import com.baidu.idl.face.platform.ui.config.FaceConfig;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
@@ -634,7 +633,7 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
         LogUtil.d("OnCreate end:" + DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS));
 
         //初始化面部识别
-        FaceConfig.initFace(ct);
+//        FaceConfig.initFace(ct);
 
     }
 

+ 2 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -19,7 +19,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
 
-import com.baidu.idl.face.platform.ui.activity.FaceVeriftyActivity;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -331,8 +330,8 @@ public class MessageFragment extends SupportToolBarFragment implements IMessageV
                 break;
 
             case R.id.itemSignImage:
-//                sign(true);
-                startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
+                sign(true);
+//                startActivityForResult(new Intent(ct, FaceVeriftyActivity.class), 0x223);
                 break;
         }
 

+ 4 - 3
app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -105,9 +105,9 @@ public class CommonUtil {
             return "";
         }
         String baseUrl = getSharedPreferences(ct, "erp_baseurl");
-        if (BaseConfig.isDebug()){
-            baseUrl="http://192.168.253.35:8080/ERP/";
-        }
+//        if (BaseConfig.isDebug()){
+//            baseUrl="http://192.168.253.35:8080/ERP/";
+//        }
 //        baseUrl = "http://192.168.253.41:8080/ERP/";
 
         return baseUrl;
@@ -131,6 +131,7 @@ public class CommonUtil {
      * @param context
      * @return
      */
+
     public static String getAccountToken(Context context) {
         if (context == null) {
             return "";