升级人脸识别sdk

IDCardLib/build.gradle

@@ -33,6 +33,6 @@ dependencies {
     })
     })
     api 'com.android.support:appcompat-v7:27.1.1'
     api 'com.android.support:appcompat-v7:27.1.1'
     testImplementation 'junit:junit:4.12'
     testImplementation 'junit:junit:4.12'
-    api files('libs/licensemanager-v1.1.jar')
-    api files('libs/livenessdetection-proguard-2.4.5.jar')
+    api files('libs/licensemanager-v1.3.jar')
+    api files('libs/livenessdetection-proguard-2.4.7.jar')
 }
 }

app/src/main/java/com/dayu/bigfish/MyApplication.java

@@ -36,6 +36,7 @@ import com.umeng.analytics.MobclickAgent;
 import com.umeng.analytics.MobclickAgent.EScenarioType;
 import com.umeng.analytics.MobclickAgent.EScenarioType;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.commonsdk.UMConfigure;
 import com.umeng.message.IUmengRegisterCallback;
 import com.umeng.message.IUmengRegisterCallback;
+import com.umeng.message.MsgConstant;
 import com.umeng.message.PushAgent;
 import com.umeng.message.PushAgent;
 import com.umeng.message.UmengNotificationClickHandler;
 import com.umeng.message.UmengNotificationClickHandler;
 import com.umeng.message.entity.UMessage;
 import com.umeng.message.entity.UMessage;
@@ -157,6 +158,7 @@ public class MyApplication extends BaseApplication {
             }
             }
         };
         };
         mPushAgent.setNotificationClickHandler(notificationClickHandler);
         mPushAgent.setNotificationClickHandler(notificationClickHandler);
+        mPushAgent.setNotificationPlaySound(MsgConstant.NOTIFICATION_PLAY_SERVER);
 
 
         //注册推送服务，每次调用register方法都会回调该接口
         //注册推送服务，每次调用register方法都会回调该接口
         mPushAgent.register(new IUmengRegisterCallback() {
         mPushAgent.register(new IUmengRegisterCallback() {

baseSDK/src/main/res/values/strings.xml

@@ -82,7 +82,7 @@
     <string name="tv_about_dayu">大鱼创想&#160;&#160;版权所有</string>
     <string name="tv_about_dayu">大鱼创想&#160;&#160;版权所有</string>
     <string name="tv_about_user_feiyong">收取费用</string>
     <string name="tv_about_user_feiyong">收取费用</string>
     <string name="tv_order_updoor_feiyong">上门费</string>
     <string name="tv_order_updoor_feiyong">上门费</string>
-    <string name="tv_order_serve_feiyong">服务费</string>
+    <string name="tv_order_serve_feiyong">服务费用</string>
     <string name="tv_order_yuan">(元)</string>
     <string name="tv_order_yuan">(元)</string>
     <string name="tv_order_cailiao_feiyong">商品货款</string>
     <string name="tv_order_cailiao_feiyong">商品货款</string>
     <string name="tv_order_other_feiyong">其他费</string>
     <string name="tv_order_other_feiyong">其他费</string>
@@ -793,7 +793,7 @@ C) 在甲方使用大鱼平å°æœåŠ¡è¿‡ç¨‹ä¸­äº§ç”Ÿçš„业务数æ®ï¼Œå®¢æˆ·æ•°æ
     <string name="hour_ago">小时前</string>
     <string name="hour_ago">小时前</string>
     <string name="min_ago">分钟前</string>
     <string name="min_ago">分钟前</string>
     <string name="just_before">刚刚</string>
     <string name="just_before">刚刚</string>
-    <string name="public_pay">对公支付</string>
+    <string name="public_pay">对公结算</string>
 
 
 
 
     <!--sale-->
     <!--sale-->

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

@@ -86,7 +86,7 @@ public class MultiOrderDetailFragment extends BaseFragment<SImplePresenter, Frag
         mServerAdapter.setViewType(R.layout.item_detail_server_info);
         mServerAdapter.setViewType(R.layout.item_detail_server_info);
         mBind.rlServerContent.setAdapter(mServerAdapter);
         mBind.rlServerContent.setAdapter(mServerAdapter);
         mServerAdapter.setData(detail.getSpus());
         mServerAdapter.setData(detail.getSpus());
-        if (detail.getPayType() == 1 && detail.getPayStatus() != 3){
+        if (detail.getPayType() != null && detail.getPayType() == 1 && detail.getPayStatus() != 3){
             mBind.llNoReceivePrice.setVisibility(View.VISIBLE);
             mBind.llNoReceivePrice.setVisibility(View.VISIBLE);
         }else{
         }else{
             mBind.llNoReceivePrice.setVisibility(View.GONE);
             mBind.llNoReceivePrice.setVisibility(View.GONE);