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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -167,7 +167,7 @@ public class Constants {
 
 
     //用于创建Banner表
-    public  static final String CREATE_BANNER = "create table step ("
+    public static final String CREATE_BANNER = "create table step ("
             + "_id INTEGER PRIMARY KEY AUTOINCREMENT, "
             + "curDate TEXT, "
             + "totalSteps TEXT)";
@@ -288,11 +288,11 @@ public class Constants {
     public final static int SUCCESS_ERP = 5;//ERP登录成功
     public final static int SUCCESS_INITDATA = 7;
     public final static int FIRST_MSG_REQUEST = 17022801;
-    
+
     //新功能红点
-    public final static String  new_dingyue="dingyue";
-    public final static String  new_signin="signin";
-    public final static String  new_signout="signout";
-    public final static String  new_oa="oa_menu";
-    public final static String  new_business="business";
+    public final static String new_dingyue = "dingyue";
+    public final static String new_signin = "signin";
+    public final static String new_signout = "signout";
+    public final static String new_oa = "oa_menu";
+    public final static String new_business = "business";
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/ViewUtil.java

@@ -113,7 +113,6 @@ public class ViewUtil {
                     }
                     if (!params.containsKey("master")) {
                         params.put("master", CommonUtil.getSharedPreferences(ct, "erp_master"));
-
                     }
                     if (!params.containsKey("sessionUser"))
                         params.put("sessionUser", CommonUtil.getSharedPreferences(ct, "erp_username"));

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -232,8 +232,8 @@ public class TaskAddErpActivity extends BaseActivity implements View.OnClickList
         progressDialog.show();
         Map<String, Object> formStoreMap = new HashMap<>();
         formStoreMap.put("taskorschedule", "Task");
-        formStoreMap.put("startdate", et_startime.getText().toString());
-        formStoreMap.put("enddate", et_endtime.getText().toString());
+        formStoreMap.put("startdate", et_startime.getText().toString()+ ":00" );
+        formStoreMap.put("enddate", et_endtime.getText().toString()+ ":00" );
         formStoreMap.put("name", et_title.getText().toString());
         formStoreMap.put("description", et_task_detail.getText().toString());
         formStoreMap.put("resourcename", resourcename);

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

@@ -7,14 +7,12 @@
         android:id="@+id/ad_vp"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-
         <RadioGroup
             android:id="@+id/rg"
-            android:layout_width="200dp"
+            android:layout_width="100dp"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             android:layout_centerHorizontal="true"
@@ -50,16 +48,6 @@
                 android:layout_weight="1"
                 android:button="@drawable/oa_rbbg" />
         </RadioGroup>
-
-        <ImageView
-            android:id="@+id/btn"
-            android:layout_width="200dp"
-            android:layout_height="300dp"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="40dp"
-            android:padding="10dp"
-            android:src="@drawable/to_login"
-            android:visibility="gone" />
     </RelativeLayout>
+
 </FrameLayout>