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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/AndroidManifest.xml

@@ -1068,8 +1068,6 @@
 
         <service android:name="com.core.service.InitializeService" />
 
-
-
         <!-- android:authorities="包名.fileprovider"将“包名”替换为实际包名 -->
         <provider
             android:authorities="com.xzjmyk.pm.activity.fileprovider"
@@ -1078,7 +1076,7 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/bdp_update_filepaths"/>
+                android:resource="@xml/provider_paths"/>
         </provider>
     </application>
 

WeiChat/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <external-files-path name="extfiles" path="autoupdatecache/" />
+    <external-cache-path name="extcachs" path="autoupdatecache/" />
+    <cache-path name="intcachs" path="autoupdatecache/" />
+    <external-path
+        name="external_files"
+        path="." />
+</paths>
+

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/MessagePresenter.java

@@ -1156,6 +1156,7 @@ public class MessagePresenter implements OnHttpResultListener {
         public void sign(boolean signOk, String message) {
             if (signOk) {
                 VoiceUtils.signVoice(R.raw.voice_sign);
+
             }
             iMessageView.updateSign(message);
         }

app_modular/apputils/src/main/java/com/modular/apputils/activity/BillInputActivity.java

@@ -211,9 +211,12 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
                 case "C"://单项选择
                     getComboValue(position, model);
                     break;
+                case "DT"://时间选择
+                    showDateDialog(true, position);
+                    break;
                 case "D"://日期选择
                 case "T"://时间选择
-                    showDateDialog(!model.getCaption().contains("生日"), position);
+                    showDateDialog(false, position);
                     break;
                 case "SF":
                 case "DF":
@@ -323,7 +326,7 @@ public class BillInputActivity extends OABaseActivity implements IBill, BillAdap
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String date = year + "-" + month + "-" + day;
                 String dateTime = date + " " + hour + ":" + minute + ":00";
-                mBillAdapter.updateBillModelValues(position, needTime ? dateTime : date, dateTime);
+                mBillAdapter.updateBillModelValues(position, needTime ? dateTime : date,  needTime ? dateTime : date);
             }
         });
 

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

@@ -42,6 +42,7 @@ public class BillTypeChangeUtils {
         if (TextUtils.isEmpty(dfType)) return false;
         switch (dfType.toUpperCase()) {
             case "D":
+            case "DT":
             case "C":
             case "MF":
             case "SF":

app_modular/apputils/src/main/res/layout/item_bill_details.xml

@@ -40,7 +40,7 @@
         <TextView
             android:id="@+id/valuesTv"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/padding"
             android:background="@null"
             android:gravity="right|center"

app_modular/apputils/src/main/res/layout/item_bill_input_select.xml

@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/white"
-    android:maxHeight="180dp"
     android:minHeight="50dp"
     android:padding="@dimen/padding">
 
@@ -46,7 +45,7 @@
     <EditText
         android:id="@+id/valuesEd"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/padding"
         android:background="@null"
         android:gravity="right|center"

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/CommonDocDetailsActivity.java

@@ -59,6 +59,8 @@ import com.uas.appworks.OA.erp.utils.approvautils.NodeAdapter;
 import com.uas.appworks.OA.platform.activity.BusinessTravelActivity;
 import com.uas.appworks.R;
 import com.uas.appworks.activity.DeviceQueryActivity;
+import com.uas.appworks.crm3_0.activity.CustomerBillInputActivity;
+import com.uas.appworks.crm3_0.activity.CustomerListActivity;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -148,6 +150,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
     private boolean device;
     private boolean message;
     private boolean back_normal;
+    private boolean form_new_bill;
 
     public void initView() {
         Intent intent = getIntent();
@@ -155,6 +158,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             device = intent.getBooleanExtra("device", false);
             message = intent.getBooleanExtra("message", false);
             back_normal = intent.getBooleanExtra("back_normal", false);
+            form_new_bill = intent.getBooleanExtra("form_new_bill", false);
             statusKey = intent.getStringExtra("statusKey");
         }
 
@@ -315,7 +319,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (!"FeePlease!FYBX".equals(mCaller) && !device) {
+        if (!"FeePlease!FYBX".equals(mCaller) && !device&&!form_new_bill) {
             getMenuInflater().inflate(R.menu.menu_common_docdetails, menu);
             MenuItem item = menu.getItem(0);
             String title = null;
@@ -348,7 +352,9 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 endMessage();
             } else if (device) {
                 endDevice();
-            } else {
+            } else if (form_new_bill){
+                endNewBill();
+            }else {
                 if (ActivityUtils.isExsitMianActivity(mContext, FormListSelectActivity.class)) {
                     LogUtil.d("正常返回...");
                     onBackPressed();
@@ -365,6 +371,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
         return true;
     }
 
+
     public Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -420,12 +427,20 @@ public class CommonDocDetailsActivity extends BaseActivity {
                             String result = msg.getData().getString("result");
                             LogUtil.prinlnLongMsg("RESUBMITTED_message", result);
 //                            Toast.makeText(ct, "单据反提交成功", Toast.LENGTH_SHORT).show();
-                            startActivity(new Intent(CommonDocDetailsActivity.this, device ? DeviceDataFormAddActivity.class : DataFormDetailActivity.class)
-                                    .putExtra("caller", mCaller)
-                                    .putExtra("id", mkeyValue)
-                                    .putExtra("title", mTitle)
-                                    .putExtra("submittype", "resubmit")
-                                    .putExtra("status", "已提交"));
+                            if (form_new_bill){
+                                startActivity(new Intent(ct, CustomerBillInputActivity.class)
+                                        .putExtra(Constants.Intents.CALLER, mCaller)
+                                        .putExtra(Constants.Intents.TITLE, getToolBarTitle())
+                                        .putExtra(Constants.Intents.MY_DOIT, true)
+                                        .putExtra(Constants.Intents.ID, mkeyValue));
+                            }else{
+                                startActivity(new Intent(CommonDocDetailsActivity.this, device ? DeviceDataFormAddActivity.class : DataFormDetailActivity.class)
+                                        .putExtra("caller", mCaller)
+                                        .putExtra("id", mkeyValue)
+                                        .putExtra("title", mTitle)
+                                        .putExtra("submittype", "resubmit")
+                                        .putExtra("status", "已提交"));
+                            }
 
                             finish();
                         }
@@ -1011,7 +1026,7 @@ public class CommonDocDetailsActivity extends BaseActivity {
             resubmit_ll.setOnClickListener(new View.OnClickListener() { // 重新提交
                 @Override
                 public void onClick(View v) {
-                    if (device && StringUtil.getText(status_tv).equals(getString(R.string.status_pending))) {
+                    if ((device||form_new_bill) && StringUtil.getText(status_tv).equals(getString(R.string.status_pending))) {
                         reSubmit();
                     } else if (ListUtils.isEmpty(mCommonApprovalFlowBean.getProcesss())
                             && ListUtils.isEmpty(mCommonApprovalFlowBean.getNodes())
@@ -1184,6 +1199,8 @@ public class CommonDocDetailsActivity extends BaseActivity {
                 endMessage();
             } else if (device) {
                 endDevice();
+            } else if (form_new_bill) {
+                endNewBill();
             } else {
                 if (ActivityUtils.isExsitMianActivity(mContext, FormListSelectActivity.class)) {
                     LogUtil.d("正常返回...");
@@ -1223,6 +1240,11 @@ public class CommonDocDetailsActivity extends BaseActivity {
         onBackPressed();
     }
 
+    private void endNewBill() {
+        startActivity(new Intent(ct, CustomerListActivity.class)
+                .putExtra(Constants.Intents.CALLER, mCaller)
+                .putExtra(Constants.Intents.TITLE, getToolBarTitle()));
+    }
     private void endDevice() {
         String dc_class = null;
         if (mCaller.equals("DeviceChange!Use")) {

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerBillInputActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 
 import android.os.Parcelable;
 import android.view.MenuItem;
+import android.widget.GridView;
 import android.widget.PopupWindow;
 
 import com.alibaba.fastjson.JSONObject;
@@ -33,12 +34,6 @@ import java.util.List;
  * 客户|预录入客户录入界面
  */
 public class CustomerBillInputActivity extends BillInputActivity {
-    private LatLng mLatLng;
-
-    @Override
-    public BillPresenter newBillPresenter() {
-        return super.newBillPresenter();
-    }
 
     @Override
     public BillAdapter newBillAdapter(List<BillGroupModel> groupModels) {
@@ -60,7 +55,8 @@ public class CustomerBillInputActivity extends BillInputActivity {
 
     @Override
     public void commitSuccess(int keyValue, String code) {
-        batchDealCustomerLngLat(keyValue);
+        endActivity();
+//        batchDealCustomerLngLat(keyValue);
     }
 
     private void batchDealCustomerLngLat(int keyValue) {
@@ -104,11 +100,19 @@ public class CustomerBillInputActivity extends BillInputActivity {
                     .putExtra(Constants.Intents.ID, 0)
                     .putExtra(Constants.Intents.HASH_MAP, hashMap));
         } else {
-            startActivity(new Intent(ct, CustomerListActivity.class)
-                    .putExtra(Constants.Intents.CALLER, mBillPresenter.getFormCaller())
-                    .putExtra(Constants.Intents.TITLE, getToolBarTitle()));
+            //进入详情界面
+            Intent intent = new Intent("com.modular.form.erp.activity.CommonDocDetailsActivity");
+            intent.putExtra("form_new_bill", true);
+            intent.putExtra("caller", mBillPresenter.getFormCaller());
+            intent.putExtra("keyValue", mBillPresenter.getFormId());
+            startActivity(intent);
+            //进入列表界面
+//            startActivity(new Intent(ct, CustomerListActivity.class)
+//                    .putExtra(Constants.Intents.CALLER, mBillPresenter.getFormCaller())
+//                    .putExtra(Constants.Intents.TITLE, getToolBarTitle()));
 
         }
+
         finish();
     }
 
@@ -117,7 +121,7 @@ public class CustomerBillInputActivity extends BillInputActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
-        if (0x201 == requestCode&&data!=null) {
+        if (0x201 == requestCode && data != null) {
             SelectAimModel chcheAimModel = data.getParcelableExtra("data");
             if (popupWindow != null) {
                 popupWindow.dismiss();
@@ -128,8 +132,8 @@ public class CustomerBillInputActivity extends BillInputActivity {
                 public void result(SelectAimModel model) {
                     String name = model.getName();
                     String address = model.getAddress();
-                    mLatLng = model.getLatLng();
-                    handlerSelectDbFind(name, address, selectPosition);
+                    LatLng mLatLng = model.getLatLng();
+                    handlerSelectDbFind(name, address, mLatLng, selectPosition);
 
                 }
             }, null);
@@ -138,15 +142,27 @@ public class CustomerBillInputActivity extends BillInputActivity {
         }
     }
 
-    protected void handlerSelectDbFind(String name, String address, int groupId) {
-        BillGroupModel mBillGroupModel = mBillAdapter.getBillGroupModel(groupId);
-        if (mBillGroupModel != null) {
-            if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {
-                for (BillGroupModel.BillModel e : mBillGroupModel.getShowBillFields()) {
-                    if ("企业名称".equals(e.getCaption())) {
-                        e.setValue(name);
-                    } else if ("企业地址".equals(e.getCaption())) {
-                        e.setValue(address);
+    protected void handlerSelectDbFind(String name, String address, LatLng latLng, int groupId) {
+        List<BillGroupModel> mBillGroupModels = mBillAdapter.getBillGroupModels();
+        if (!ListUtils.isEmpty(mBillGroupModels)) {
+            for (BillGroupModel mBillGroupModel : mBillGroupModels) {
+                if (mBillGroupModel != null) {
+                    if (!ListUtils.isEmpty(mBillGroupModel.getShowBillFields())) {
+                        for (BillGroupModel.BillModel e : mBillGroupModel.getShowBillFields()) {
+                            if ("企业名称".equals(e.getCaption()) || "cu_name".equals(e.getField())) {
+                                e.setValue(name);
+                            } else if ("cu_add2".equals(e.getCaption()) || "cu_add1".equals(e.getField())) {
+                                e.setValue(address);
+                            }
+                            if (latLng != null) {
+                                if ("cu_lat".equals(e.getField())) {
+                                    e.setValue(latLng.latitude + "");
+                                    //经纬度
+                                } else if ("cu_lng".equals(e.getField())) {
+                                    e.setValue(latLng.longitude + "");
+                                }
+                            }
+                        }
                     }
                 }
             }

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerDetails3_0Activity.java

@@ -18,6 +18,7 @@ import android.widget.TextView;
 
 import com.common.LogUtil;
 import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.OABaseActivity;
 import com.modular.apputils.activity.BillDetailsActivity;
@@ -89,7 +90,12 @@ public class CustomerDetails3_0Activity extends BillDetailsActivity implements I
         }
         mTabLayout.setupWithViewPager(mViewPager);//将TabLayout和ViewPager关联起来。
         mViewPager.setVisibility(View.GONE);
-        if (isMe) {
+        String mCaller="";
+        if (getIntent()!=null)
+        {
+            mCaller = getIntent().getStringExtra(Constants.Intents.CALLER);
+        }
+        if (isMe&&!StringUtil.isEmpty(mCaller)&&mCaller.equals("Customer!Base")) {
             bottomLL.setVisibility(View.VISIBLE);
             mTabLayout.setVisibility(View.VISIBLE);
             createScheduleTv.setOnClickListener(mOnClickListener);

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerManageActivity.java

@@ -341,7 +341,7 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
                         .putExtra(Constants.Intents.CALLER, "PreCustomer")
                         .putExtra(Constants.Intents.TITLE, "预录入客户"));
                 break;
-            case 2:
+            case 3:
                 String emCode = CommonUtil.getEmcode();
                 ArrayList<BillListConfig> billListConfigs = new ArrayList<>();
                 BillListConfig mBillListConfig = new BillListConfig();
@@ -367,7 +367,7 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
                         .putExtra(Constants.Intents.DETAILS_CLASS, CustomerContactDetailActivity.class)
                 );
                 break;
-            case 3:
+            case 2:
                 emCode = CommonUtil.getEmcode();
                 billListConfigs = new ArrayList<>();
                 mBillListConfig = new BillListConfig();
@@ -413,7 +413,7 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
                 mTitle = "预录入客户";
                 clazz = CustomerBillInputActivity.class;
                 break;
-            case 2:
+            case 3:
                 dbfindCondition = new HashMap<>();
                 dbfindCondition.put("cu_code", "cu_sellercode='" + CommonUtil.getEmcode() + "'");
                 mCaller = "Contact";
@@ -421,19 +421,11 @@ public class CustomerManageActivity extends OABaseActivity implements ICustomerM
                 mId = -1;
                 clazz = CustomerContactActivity.class;
                 break;
-            case 3:
+            case 2:
                 mCaller = "VisitRecord";
                 mTitle = "拜访报告";
                 clazz = VisitRecordBillInputActivity.class;
                 break;
-            case 4:
-                mCaller = "Customer!Base";
-                mTitle = "正式客户";
-                clazz = DataFormDetailActivity.class;
-                startActivity(new Intent(ct, clazz)
-                        .putExtra("caller", mCaller)
-                        .putExtra("title", mTitle));
-                return;
         }
         startActivity(new Intent(ct, clazz)
                 .putExtra(Constants.Intents.CALLER, mCaller)

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/CustomerVisitActivity.java

@@ -339,6 +339,7 @@ public class CustomerVisitActivity extends BaseActivity {
                 contactTv = (TextView) itemView.findViewById(R.id.contactTv);
                 doManTv = (TextView) itemView.findViewById(R.id.doManTv);
                 statusTv = (TextView) itemView.findViewById(R.id.statusTv);
+                contactTv.setVisibility(View.GONE);
 
             }
         }
@@ -346,8 +347,8 @@ public class CustomerVisitActivity extends BaseActivity {
         @Override
         public void onBindViewHolder(VisitRecordViewHolder holder, int i) {
             VisitPlan mVisitPlan = visitPlans.get(i);
-            holder.contactTv.setText(mVisitPlan.getCustomerName());
-            holder.dateTv.setText(mVisitPlan.getRecordDay());
+            holder.dateTv.setText("客户名称:"+mVisitPlan.getCustomerName());
+//            holder.dateTv.setText(mVisitPlan.getRecordDay());
             holder.doManTv.setText(mVisitPlan.getDoman());
             holder.statusTv.setText(mVisitPlan.getStatus());
             holder.itemView.setTag(mVisitPlan);

app_modular/appworks/src/main/java/com/uas/appworks/crm3_0/activity/VisitRecordBillInputActivity.java

@@ -4,7 +4,13 @@ package com.uas.appworks.crm3_0.activity;
 import android.content.Intent;
 import android.os.Handler;
 
+import com.common.LogUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.core.app.Constants;
+import com.core.model.OAConfig;
+import com.core.model.SelectCollisionTurnBean;
+import com.core.model.SelectEmUser;
 import com.core.utils.CommonUtil;
 import com.modular.apputils.activity.BillDetailsActivity;
 import com.modular.apputils.activity.BillInputActivity;
@@ -19,18 +25,30 @@ import java.util.List;
 
 //拜访报告录入界面
 public class VisitRecordBillInputActivity extends BillInputActivity {
-    @Override
-    public BillAdapter newBillAdapter(List<BillGroupModel> groupModels) {
-        return new BillAdapter(ct, groupModels, this);
-    }
+
+//    @Override
+//    public void setAdapter(List<BillGroupModel> groupModels) {
+//        if (!ListUtils.isEmpty(groupModels)) {
+//            BillGroupModel groupModel = groupModels.get(0);
+//            if (groupModel != null && !ListUtils.isEmpty(groupModel.getShowBillFields())) {
+//                for (BillGroupModel.BillModel billModel : groupModel.getShowBillFields()) {
+//                    if ("HOS".equals(billModel.getType()) && "vr_group".equals(billModel.getField())) {
+//                        billModel.setType("C");
+//                        break;
+//                    }
+//                }
+//            }
+//        }
+//        super.setAdapter(groupModels);
+//    }
 
     public void toDataFormList() {
-        String emCode=CommonUtil.getEmcode();
+        String emCode = CommonUtil.getEmcode();
         ArrayList<BillListConfig> billListConfigs = new ArrayList<>();
         BillListConfig mBillListConfig = new BillListConfig();
         mBillListConfig.setTitle("我负责的");
         mBillListConfig.setCaller(mBillPresenter.getFormCaller());
-        mBillListConfig.setCondition("vr_recordercode=\'" +emCode+ "\'");
+        mBillListConfig.setCondition("vr_recordercode=\'" + emCode + "\'");
         billListConfigs.add(mBillListConfig);
         mBillListConfig = new BillListConfig();
         mBillListConfig.setTitle("我下属的");
@@ -38,7 +56,7 @@ public class VisitRecordBillInputActivity extends BillInputActivity {
         String mCondition = "(" +
                 "vr_recordercode in ( " +
                 " select em_code from employee left join job on em_defaulthsid=jo_id  where jo_subof= " +
-                " (select em_defaulthsid from employee where em_code =\'"+emCode+"\') " +
+                " (select em_defaulthsid from employee where em_code =\'" + emCode + "\') " +
                 ")" +
                 ")";
         mBillListConfig.setCondition(mCondition);
@@ -61,17 +79,48 @@ public class VisitRecordBillInputActivity extends BillInputActivity {
                         .putExtra(Constants.Intents.CALLER, mBillPresenter.getFormCaller())
                         .putExtra(Constants.Intents.TITLE, getToolBarTitle())
                         .putExtra(Constants.Intents.ID, keyValue));
-//                startActivity(new Intent("com.modular.form.erp.activity.CommonDocDetailsActivity")
-//                        .putExtra("caller", mBillPresenter.getFormCaller())
-//                        .putExtra("keyValue", keyValue)
-//                        .putExtra("update", "1")
-//                        .putExtra("title", getToolBarTitle())
-//                        .putExtra("statusKey", mBillPresenter.getStatusField())
-//                        .putExtra("status", "已提交"));
                 finish();
                 overridePendingTransition(R.anim.anim_activity_in, R.anim.anim_activity_out);
             }
         }, 2000);
     }
 
+
+//    @Override
+//    public void toSelect(int position, BillGroupModel.BillModel model) {
+//        if ("C".equals(model.getType()) && "vr_group".equals(model.getField())) {
+//            LogUtil.i("gong", "position=" + position);
+//            selectPosition = position;
+//            doSelectDealMan();
+//        } else {
+//            super.toSelect(position, model);
+//        }
+//
+//    }
+//
+//    private void doSelectDealMan() {
+//        Intent intent = new Intent("com.modular.main.SelectCollisionActivity");
+//        SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
+//                .setTitle("选择可阅读人")
+//                .setSingleAble(false);
+//        intent.putExtra(OAConfig.MODEL_DATA, bean);
+//        startActivityForResult(intent, 0x265);
+//    }
+
+//    @Override
+//    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+//        if (requestCode == 0x265 && resultCode == 0x20 && data != null) {
+//            ArrayList<SelectEmUser> selectEmUsers = data.getParcelableArrayListExtra("data");
+//            if (!ListUtils.isEmpty(selectEmUsers)) {
+//                StringBuilder names = new StringBuilder();
+//                for (SelectEmUser selectEmUser : selectEmUsers) {
+//                    names.append(selectEmUser.getEmName() + ";");
+//                }
+//                StringUtil.removieLast(names);
+//                mBillAdapter.updateBillModelValues(selectPosition, names.toString(), names.toString());
+//            }
+//        } else {
+//            super.onActivityResult(requestCode, resultCode, data);
+//        }
+//    }
 }

app_modular/appworks/src/main/java/com/uas/appworks/presenter/CustomerDetailsPresenter.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.JSONUtil;
+import com.common.data.StringUtil;
 import com.modular.apputils.listener.OnSmartHttpListener;
 import com.modular.apputils.network.Parameter;
 import com.modular.apputils.network.Tags;
@@ -142,13 +143,15 @@ public class CustomerDetailsPresenter extends BillDetailsPresenter {
             String address = JSONUtil.getText(object, "address");
             float longitude = JSONUtil.getFloat(object, "longitude");
             float latitude = JSONUtil.getFloat(object, "latitude");
-            bindBill.setId(id);
-            bindBill.setName(name);
-            bindBill.setSubName(position);
-            bindBill.setAddress(address);
-            bindBill.setLongitude(longitude);
-            bindBill.setLatitude(latitude);
-            mCusAddress.add(bindBill);
+            if (!StringUtil.isEmpty(position)||!StringUtil.isEmpty(address)){
+                bindBill.setId(id);
+                bindBill.setName(name);
+                bindBill.setSubName(position);
+                bindBill.setAddress(address);
+                bindBill.setLongitude(longitude);
+                bindBill.setLatitude(latitude);
+                mCusAddress.add(bindBill);
+            }
         }
         ( (ICustomerDetails)mIBillDetails).setBottomDatas(mCusBusiness, mCusContacts, mCusReport, mCusAddress);
     }

app_modular/facesdk/src/main/java/com/baidu/aip/face/camera/Camera1Control.java

@@ -137,7 +137,12 @@ public class Camera1Control implements ICameraControl {
         }
         if (parameters == null) {
             parameters = camera.getParameters();
-            parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+//            parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+            List<String> focusModes = parameters.getSupportedFocusModes();
+            if(focusModes.contains(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE)){
+                parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+            }
+
         }
 
         surfaceTexture = new SurfaceTexture(11);

app_third/libbdupdatesdk/src/main/AndroidManifest.xml

@@ -36,7 +36,15 @@
         <!-- ↑↑↑ 百度移动统计SDK ↑↑↑ -->
         <!-- android:theme="@style/bdp_update_dialog_style_fullscreen" -->
 
-   
+        <provider
+            android:name="android.support.v4.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
     </application>
 
 

app_third/libbdupdatesdk/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path
+        name="external_files"
+        path="." />
+    <external-files-path name="extfiles" path="autoupdatecache/" />
+    <external-cache-path name="extcachs" path="autoupdatecache/" />
+    <cache-path name="intcachs" path="autoupdatecache/" />
+</paths>
+