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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/DataDownloadActivity.java

@@ -90,6 +90,7 @@ public class DataDownloadActivity extends BaseActivity {
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(android.os.Message msg) {
+            if (manager==null)manager=new DBManager();
             switch (msg.what) {
                 case LOAD_COMPANY_DATA:
                     Log.i("newdata", "handleMessage:" + msg.getData().getString("result"));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java

@@ -658,9 +658,13 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 } else if ("Workovertime".equals(caller)||"ExtraWork$".equals(caller)) {
                     d_startDate = "wod_startdate";
                     d_endDate = "wod_enddate";
-                    formidkey = "wo_id";
-                    detailkey_id = "wod_id";
-                    detailkey_did = "wod_woid";
+                    if ("ExtraWork$".equals(caller)){
+                        formidkey = "wod_id";//主表id  ---适应接口频繁调整
+                    }else{
+                        formidkey = "wo_id";//主表id
+                    }
+                    detailkey_id = "wod_id";//明细id
+                    detailkey_did = "wod_woid";//主表id
                     getSupportActionBar().setTitle("加班单");
                 } else if ("FeePlease!CCSQ".equals(caller)||"FeePlease!CCSQ!new".equals(caller)) {
                     startDate = "fp_prestartdate";

WeiChat/src/main/res/layout/activity_client.xml

@@ -241,12 +241,21 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
-
+                  <!--  <ImageView
+                        android:layout_toLeftOf="@id/iv_sale"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />-->
+                  
                     <ImageView
+                        android:id="@+id/iv_sale"
                         android:layout_width="240dp"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:src="@drawable/ic_sale_brief" />
+                       android:layout_height="wrap_content"
+                       android:layout_centerInParent="true"
+                       android:src="@drawable/ic_sale_brief" />
+                 <!--   <ImageView
+                        android:layout_toRightOf="@id/iv_sale"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />-->
 
                     <!--   <ImageButton style="@style/crm_ib_card_topRight"
                            android:id="@+id/ib_sale_condition" />-->