Browse Source

百度自动更新 忽略此版本按钮隐藏!

Arison 9 years ago
parent
commit
17962675cc

+ 2 - 4
WeiChat/src/main/AndroidManifest.xml

@@ -2,13 +2,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="50"
-    android:versionName="5.0">
-
+    android:versionCode="46"
+    android:versionName="4.6">
     <uses-sdk
     <uses-sdk
         android:minSdkVersion="11"
         android:minSdkVersion="11"
         android:targetSdkVersion="23" />
         android:targetSdkVersion="23" />
-
     <!-- 拨打电话 -->
     <!-- 拨打电话 -->
     <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.CALL_PHONE" />
 
 

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

@@ -484,7 +484,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
         BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
             @Override
             @Override
             public void onCheckComplete() {
             public void onCheckComplete() {
-
+              
             }
             }
         });
         });
     }
     }

+ 11 - 9
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportPlanActivity.java

@@ -24,7 +24,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
-import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -74,7 +73,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
     private void initView() {
     private void initView() {
         ViewUtils.inject(this);
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("拜访计划");
         getSupportActionBar().setTitle("拜访计划");
-        tv_date_select.setText(TimeUtils.s_long_2_str(System.currentTimeMillis()));
+        tv_date_select.setText(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd HH:mm:ss"));
         tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
         tv_address_login.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
         tv_date_select.setKeyListener(null);
         tv_date_select.setKeyListener(null);
         tv_date_select.setFocusable(false);
         tv_date_select.setFocusable(false);
@@ -155,18 +154,18 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         String formStore = "";
         String formStore = "";
         if (tv_date_select.testValidity() && tv_date_end.testValidity()
         if (tv_date_select.testValidity() && tv_date_end.testValidity()
                 && tv_customer_login.testValidity() && tv_linksman_login.testValidity()
                 && tv_customer_login.testValidity() && tv_linksman_login.testValidity()
-                && tv_address_login.testValidity() && tv_visit_theme.testValidity()){
+                && tv_address_login.testValidity() && tv_visit_theme.testValidity()) {
             formStore = "\n" +
             formStore = "\n" +
                     "{\n" +
                     "{\n" +
-                    "\"vp_date\":\"" +DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd")  +
+                    "\"vp_date\":\"" + DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
                     "\",\n" +
                     "\",\n" +
                     "\"vp_code\":\"" + tv_code +
                     "\"vp_code\":\"" + tv_code +
                     "\",\n" +
                     "\",\n" +
                     "\"vp_startdate\":\"" +
                     "\"vp_startdate\":\"" +
-                    tv_date_select.getText().toString() + " 00:00:00" +
+                    tv_date_select.getText().toString() +
                     "\",\n" +
                     "\",\n" +
                     "\"vp_enddate\":\"" +
                     "\"vp_enddate\":\"" +
-                    tv_date_end.getText().toString() + " 00:00:00" +
+                    tv_date_end.getText().toString() +
                     "\",\n" +
                     "\",\n" +
                     "\"vp_remark\":\"" +
                     "\"vp_remark\":\"" +
                     tv_visit_theme.getText().toString() +
                     tv_visit_theme.getText().toString() +
@@ -199,7 +198,7 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                     DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
                     DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd") +
                     "\"\n" +
                     "\"\n" +
                     "}";
                     "}";
-        }else {
+        } else {
             return;
             return;
         }
         }
         progressDialog.show();
         progressDialog.show();
@@ -219,11 +218,12 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
         setResult(0x20, intent);
         setResult(0x20, intent);
         finish();
         finish();
     }
     }
+
     private void showDateDialog(final FormEditText tv) {
     private void showDateDialog(final FormEditText tv) {
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.HOUR_OF_DAY);
         picker.setRange(2000, 2030);
         picker.setRange(2000, 2030);
-        picker.setSelectedItem( Calendar.getInstance().get(Calendar.YEAR),
-                Calendar.getInstance().get(Calendar.MONTH)+1,
+        picker.setSelectedItem(Calendar.getInstance().get(Calendar.YEAR),
+                Calendar.getInstance().get(Calendar.MONTH) + 1,
                 Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
                 Calendar.getInstance().get(Calendar.DAY_OF_MONTH),
                 Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
                 Calendar.getInstance().get(Calendar.HOUR_OF_DAY),
                 Calendar.getInstance().get(Calendar.MINUTE));
                 Calendar.getInstance().get(Calendar.MINUTE));
@@ -311,6 +311,8 @@ public class VisitReportPlanActivity extends BaseActivity implements View.OnClic
                         for (int i = 0; i < array.size(); i++) {
                         for (int i = 0; i < array.size(); i++) {
                             if (value.equals(array.getJSONObject(i).getString("CU_NAME"))) {
                             if (value.equals(array.getJSONObject(i).getString("CU_NAME"))) {
                                 vp_code = array.getJSONObject(i).getString("CU_CODE");
                                 vp_code = array.getJSONObject(i).getString("CU_CODE");
+                                tv_linksman_login.setText(array.getJSONObject(i).getString("CU_CONTACT"));
+                                tv_address_login.setText(array.getJSONObject(i).getString("CU_ADD1"));
                             }
                             }
                         }
                         }
                     }
                     }

+ 3 - 3
libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_btn.xml

@@ -4,9 +4,9 @@
     <item>
     <item>
         <shape>
         <shape>
             <corners android:radius="5dip" />
             <corners android:radius="5dip" />
-
-            <solid android:color="#ff44d7b3" />
-
+            <solid android:color="#EE3B3B" />
+          <!--  <solid android:color="#ff44d7b3" />-->
+           
             <padding android:bottom="0dip" android:left="0dip" android:right="0dip" android:top="0dip" />
             <padding android:bottom="0dip" android:left="0dip" android:right="0dip" android:top="0dip" />
         </shape>
         </shape>
     </item>
     </item>

+ 5 - 2
libbdupdatesdk/src/main/res/layout/bdp_update_activity_confirm_dialog.xml

@@ -84,14 +84,17 @@
                 android:text="@string/bdp_update_not_now"
                 android:text="@string/bdp_update_not_now"
                 />
                 />
             
             
-            <TextView 
+           <TextView 
                 android:id="@+id/txt_action_3"
                 android:id="@+id/txt_action_3"
                 android:layout_width="0dip"
                 android:layout_width="0dip"
                 android:layout_height="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
+                android:layout_weight="0"
                 android:textColor="#ffabbed9"
                 android:textColor="#ffabbed9"
                 android:textSize="13sp"
                 android:textSize="13sp"
                 android:gravity="center"
                 android:gravity="center"
+                android:enabled="false"
+                android:clickable="false"
+               android:visibility="gone"
                 android:text="@string/bdp_update_ignore"
                 android:text="@string/bdp_update_ignore"
                 />
                 />
         </LinearLayout>
         </LinearLayout>

+ 1 - 1
libbdupdatesdk/src/main/res/values/bdp_update_strings.xml

@@ -11,7 +11,7 @@
     <string name="bdp_update_action_download">立即升级</string>
     <string name="bdp_update_action_download">立即升级</string>
     <string name="bdp_update_action_install">立即安装</string>
     <string name="bdp_update_action_install">立即安装</string>
     <string name="bdp_update_not_now">暂不升级</string>
     <string name="bdp_update_not_now">暂不升级</string>
-    <string name="bdp_update_ignore">忽略此版本</string>
+    <string name="bdp_update_ignore"></string>
     
     
     <string name="bdp_update_new_download">发现新版本,点击更新</string>
     <string name="bdp_update_new_download">发现新版本,点击更新</string>
     <string name="bdp_update_download_complete">新版本下载完成,点击安装</string>
     <string name="bdp_update_download_complete">新版本下载完成,点击安装</string>