Browse Source

百度升级包完成,升级功能

LiuJie 9 years ago
parent
commit
78de598f5e
32 changed files with 467 additions and 11 deletions
  1. 3 1
      WeiChat/build.gradle
  2. 37 3
      WeiChat/src/main/AndroidManifest.xml
  3. 1 1
      WeiChat/src/main/java/com/sk/weichat/bean/Friend.java
  4. 13 0
      WeiChat/src/main/java/com/sk/weichat/ui/MainActivity.java
  5. 3 0
      WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java
  6. 49 0
      WeiChat/src/main/java/com/sk/weichat/ui/me/SettingActivity.java
  7. 3 3
      WeiChat/src/main/res/drawable/bg_btn.xml
  8. 37 1
      WeiChat/src/main/res/layout/activity_setting.xml
  9. 4 0
      WeiChat/src/main/res/values/colors.xml
  10. 2 1
      WeiChat/src/main/res/values/strings.xml
  11. 1 0
      libbdupdatesdk/.gitignore
  12. BIN
      libbdupdatesdk/libs/BDAutoUpdate_APPX_SDK_20150826.jar
  13. BIN
      libbdupdatesdk/libs/android_api_3.6.9.3.jar
  14. BIN
      libbdupdatesdk/libs/need_lib.jar
  15. BIN
      libbdupdatesdk/libs/patchupdate.jar
  16. 17 0
      libbdupdatesdk/proguard-rules.pro
  17. 13 0
      libbdupdatesdk/src/androidTest/java/com/example/administrator/libbdupdatesdk/ApplicationTest.java
  18. 61 0
      libbdupdatesdk/src/main/AndroidManifest.xml
  19. BIN
      libbdupdatesdk/src/main/jniLibs/armeabi/libMD5_v1.so
  20. BIN
      libbdupdatesdk/src/main/jniLibs/armeabi/libbase64encoder_v1_4.so
  21. BIN
      libbdupdatesdk/src/main/jniLibs/x86/libMD5_v1.so
  22. BIN
      libbdupdatesdk/src/main/jniLibs/x86/libbase64encoder_v1_4.so
  23. BIN
      libbdupdatesdk/src/main/res/drawable-mdpi/bdp_update_logo.png
  24. 14 0
      libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_btn.xml
  25. 14 0
      libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_content.xml
  26. 14 0
      libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_title.xml
  27. 15 0
      libbdupdatesdk/src/main/res/drawable/bdp_update_progress_download.xml
  28. 99 0
      libbdupdatesdk/src/main/res/layout/bdp_update_activity_confirm_dialog.xml
  29. 26 0
      libbdupdatesdk/src/main/res/values/bdp_update_strings.xml
  30. 25 0
      libbdupdatesdk/src/main/res/values/bdp_update_styles.xml
  31. 15 0
      libbdupdatesdk/src/test/java/com/example/administrator/libbdupdatesdk/ExampleUnitTest.java
  32. 1 1
      settings.gradle

+ 3 - 1
WeiChat/build.gradle

@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.sk.weichat"
-        minSdkVersion 14
+        minSdkVersion 8
         targetSdkVersion 22
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_7
@@ -34,6 +34,8 @@ dependencies {
     compile project(':libedittextformlibrary')
     compile project(':libfloatingactionbutton')
     compile project(':libpsectionlistview')
+    compile project(':libbdupdatesdk')
+
     compile 'com.android.support:support-v4:22.2.0'
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.commit451:PhotoView:1.2.5'

+ 37 - 3
WeiChat/src/main/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.sk.weichat"
-    android:versionCode="1"
-    android:versionName="1.0" >
+    android:versionCode="2"
+    android:versionName="1.2" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="8"
         android:targetSdkVersion="22" />
 
     <!-- 拨打电话 -->
@@ -58,6 +58,15 @@
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!--百度自动更新-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.GET_TASKS"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 
     <application
         android:name=".MyApplication"
@@ -391,6 +400,31 @@
                 <action android:name="com.sk.weichat.ui.message.SelectCardActivity"/>
             </intent-filter>
         </activity>
+
+        <!-- 百度自动更新 -->  <!-- 自动更新SDK -->
+        <meta-data
+            android:name="BDAPPID"
+            android:value="8037149" />
+        <meta-data
+            android:name="BDAPPKEY"
+            android:value="GMZFDGbbchdQQXjpabX38rTlychRGnEF" />
+        <activity
+            android:name="com.baidu.autoupdatesdk.ConfirmDialoigActivity"
+            android:exported="false"
+            android:screenOrientation="sensor"
+            android:theme="@style/bdp_update_dialog_style_fullscreen" />
+        <receiver
+            android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
+                <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
+                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_AS" />
+                <action android:name="com.baidu.autoupdatesdk.ACTION_AS_DOWNLOAD_COMPLETE" />
+            </intent-filter>
+        </receiver>
+
+
     </application>
 
 </manifest>

+ 1 - 1
WeiChat/src/main/java/com/sk/weichat/bean/Friend.java

@@ -32,7 +32,7 @@ public class Friend implements Serializable {
 	public static final String NICKNAME_BLOG_MESSAGE = "商务圈消息";// 商务圈消息ID
 	public static final String NICKNAME_INTERVIEW_MESSAGE = "面试中心";// 面试中心ID
 
-	public static final String NICKNAME_ERP_PROCESS = "待办事宜";// 待办事宜
+	public static final String NICKNAME_ERP_PROCESS = "待审批流程";// 待办事宜
 	public static final String NICKNAME_ERP_TASK = "我的任务";// 我的任务
 	public static final String NICKNAME_ERP_ZHIHUI = "通知公告";// 我的知会
 	public static final String NICKNAME_ERP_NEWS = "新闻";// 新闻

+ 13 - 0
WeiChat/src/main/java/com/sk/weichat/ui/MainActivity.java

@@ -25,6 +25,8 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.baidu.android.pushservice.PushConstants;
 import com.baidu.android.pushservice.PushManager;
+import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
+import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.sk.weichat.AppConfig;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.NetWorkObservable.NetWorkObserver;
@@ -411,6 +413,8 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 
         // 注册网络改变回调
         MyApplication.getInstance().registerNetWorkObserver(this);
+        //更新版本
+        updateVersion();
         // 绑定监听
         ListenerManager.getInstance().addAuthStateChangeListener(this);
         // 注册消息更新广播
@@ -463,6 +467,15 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
 
     }
 
+    public void updateVersion() {
+        BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
+            @Override
+            public void onCheckComplete() {
+
+            }
+        });
+    }
+
 
     private void doUserCheck() {
         if (!MyApplication.getInstance().isNetworkActive()) {

+ 3 - 0
WeiChat/src/main/java/com/sk/weichat/ui/erp/util/CommonUtil.java

@@ -538,4 +538,7 @@ public class CommonUtil {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         ct.getApplicationContext().startActivity(intent);
     }
+
+
+
 }

+ 49 - 0
WeiChat/src/main/java/com/sk/weichat/ui/me/SettingActivity.java

@@ -6,11 +6,18 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.baidu.android.pushservice.PushManager;
+import com.baidu.autoupdatesdk.AppUpdateInfo;
+import com.baidu.autoupdatesdk.AppUpdateInfoForInstall;
+import com.baidu.autoupdatesdk.BDAutoUpdateSDK;
+import com.baidu.autoupdatesdk.CPCheckUpdateCallback;
+import com.baidu.autoupdatesdk.UICheckUpdateCallback;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.sk.weichat.MyApplication;
@@ -20,6 +27,7 @@ import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.sp.UserSp;
 import com.sk.weichat.ui.MainActivity;
 import com.sk.weichat.ui.base.ActionBackActivity;
+import com.sk.weichat.ui.erp.net.ViewUtil;
 import com.sk.weichat.ui.erp.util.CommonUtil;
 import com.sk.weichat.ui.erp.view.SwitchView;
 import com.sk.weichat.ui.tool.WebViewActivity;
@@ -41,6 +49,12 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     @ViewInject(R.id.cb_task_reply)
     private SwitchView cb_task_reply;
 
+    @ViewInject(R.id.rl_app_update)
+    private RelativeLayout  rl_app_update;
+    @ViewInject(R.id.version_value)
+    private TextView  version_value;
+    private ProgressDialog dialog;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -52,6 +66,9 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
     }
 
     private void initView() {
+        dialog = new ProgressDialog(this);
+        dialog.setIndeterminate(true);
+
         mExitBtn = (Button) findViewById(R.id.exit_btn);
 
         int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.BAIDU_PUSH);
@@ -76,6 +93,8 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
             }
         });
 
+        rl_app_update.setOnClickListener(this);
+        version_value.setText(CommonUtil.ApkVersionCode(this));
 
         mExitBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -120,6 +139,36 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
             break;
             case R.id.about_us_rl:// 关于我们
                 startActivity(new Intent(mContext, AboutActivity.class));
+                break;
+            case R.id.rl_app_update:
+                dialog.setMessage("正在检查更新,请稍等...");
+                dialog.show();
+                BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
+                    @Override
+                    public void onCheckComplete() {
+                        BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
+                                new CPCheckUpdateCallback() {
+
+                                    @Override
+                                    public void onCheckUpdateCallback(
+                                            AppUpdateInfo info,
+                                            AppUpdateInfoForInstall infoForInstall) {
+                                        if (infoForInstall != null
+                                                && !TextUtils
+                                                .isEmpty(infoForInstall
+                                                        .getInstallPath())) {
+                                        } else if (info != null) {
+                                        } else {
+                                            ViewUtil.ShowMessageTitle(
+                                                    SettingActivity.this,
+                                                    "已经是最新版,不需要更新");
+                                        }
+                                        dialog.dismiss();
+                                    }
+                                });
+                    }
+                });
+
                 break;
         }
     }

+ 3 - 3
WeiChat/src/main/res/drawable/bg_btn.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-<item android:drawable="@drawable/bg_btn_nopass" android:state_pressed="true"/>
-    <item android:drawable="@drawable/bg_btn_pass" android:state_pressed="false"/>
-    <item android:drawable="@drawable/bg_btn_pass"  />
+<item android:drawable="@color/btn_login_press" android:state_pressed="true"/>
+    <item android:drawable="@color/btn_login_nomarl" android:state_pressed="false"/>
+    <item android:drawable="@color/btn_login_nomarl"  />
 </selector>

+ 37 - 1
WeiChat/src/main/res/layout/activity_setting.xml

@@ -168,11 +168,47 @@
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/item_line"/>
+            <RelativeLayout
+                android:clickable="true"
+                android:id="@+id/rl_app_update"
+                style="@style/IMTbleLine">
+
+                <TextView
+                    android:id="@+id/version_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerVertical="true"
+                    android:gravity="center"
+                    android:text="@string/app_version"
+                    android:textColor="@color/black"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/version_value"
+                    style="@style/IMTbleLine_TextValue"
+                    android:layout_toLeftOf="@+id/version_arrow_img"
+                    android:layout_toRightOf="@+id/version_text"
+                    android:textColor="@color/dark_dark_grey" />
+
+                <ImageView
+                    android:id="@+id/version_arrow_img"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
+                    android:alpha="0.26"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:background="@drawable/set_list_next"
+                    android:contentDescription="@string/app_name" />
+            </RelativeLayout>
 
             <Button
                 android:id="@+id/exit_btn"
                 android:background="@drawable/bg_btn"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_marginBottom="9dp"
                 android:layout_marginTop="9dp"

+ 4 - 0
WeiChat/src/main/res/values/colors.xml

@@ -15,6 +15,10 @@
     <color name="bar_color">#e6e6e6</color>
     <color name="bg_main">@color/white</color>
     <color name="refresh">@color/black</color>
+
+    <color name="btn_login_nomarl">#7BB4DC</color>
+    <color name="btn_login_press">#B9D2E3</color>
+
     <!--end gongpengming-->
 
 

+ 2 - 1
WeiChat/src/main/res/values/strings.xml

@@ -9,7 +9,7 @@
     <string name="loading_button">取消</string>
     <string name="error_button">再次尝试</string>
 
-    <string name="app_name">优信</string>
+    <string name="app_name">UU互联</string>
     <string name="data_exception">数据异常,请稍后重试</string>
     <string name="net_exception">网络异常,请稍后重试</string>
     <string name="please_wait">请稍等&#8230;</string>
@@ -287,6 +287,7 @@
     <string name="push_setting">允许推送</string>
     <string name="use_help">使用帮助</string>
     <string name="about_us">关于我们</string>
+    <string name="app_version">当前版本</string>
     <string name="exit_tips">确定要退出此账号吗?</string>
     <string name="exit_current_account">退出当前账号</string>
     <string name="deleteing">删除中&#8230;</string>

+ 1 - 0
libbdupdatesdk/.gitignore

@@ -0,0 +1 @@
+/build

BIN
libbdupdatesdk/libs/BDAutoUpdate_APPX_SDK_20150826.jar


BIN
libbdupdatesdk/libs/android_api_3.6.9.3.jar


BIN
libbdupdatesdk/libs/need_lib.jar


BIN
libbdupdatesdk/libs/patchupdate.jar


+ 17 - 0
libbdupdatesdk/proguard-rules.pro

@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

+ 13 - 0
libbdupdatesdk/src/androidTest/java/com/example/administrator/libbdupdatesdk/ApplicationTest.java

@@ -0,0 +1,13 @@
+package com.example.administrator.libbdupdatesdk;
+
+import android.app.Application;
+import android.test.ApplicationTestCase;
+
+/**
+ * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
+ */
+public class ApplicationTest extends ApplicationTestCase<Application> {
+    public ApplicationTest() {
+        super(Application.class);
+    }
+}

+ 61 - 0
libbdupdatesdk/src/main/AndroidManifest.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.baidu.integrationsdk.lib"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <application>
+
+        <!-- ↓↓↓ 百度移动统计SDK ↓↓↓ -->
+        <!-- 是否开启错误日志统计,默认为false -->
+        <meta-data
+            android:name="BaiduMobAd_EXCEPTION_LOG"
+            android:value="true" />
+        <!-- 日志发送策略,可选值:APP_START、ONCE_A_DAY、SET_TIME_INTERVAL,默认为APP_START -->
+        <meta-data
+            android:name="BaiduMobAd_SEND_STRATEGY"
+            android:value="APP_START" />
+        <!-- 日志发送策略 为SET_TIME_INTERVAL时,需设定时间间隔(取消下行注释)。取值为1-24的整数,默认为1 -->
+        <!-- <meta-data android:name="BaiduMobAd_TIME_INTERVAL" android:value="2" /> -->
+        <!-- 日志仅在wifi网络下发送,默认为false -->
+        <meta-data
+            android:name="BaiduMobAd_ONLY_WIFI"
+            android:value="false" />
+        <!-- 是否获取基站位置信息 ,默认为true -->
+        <meta-data
+            android:name="BaiduMobAd_CELL_LOCATION"
+            android:value="true" />
+        <!-- 是否获取GPS位置信息,默认为true -->
+        <meta-data
+            android:name="BaiduMobAd_GPS_LOCATION"
+            android:value="true" />
+        <!-- 是否获取WIFI位置信息,默认为true -->
+        <meta-data
+            android:name="BaiduMobAd_WIFI_LOCATION"
+            android:value="true" />
+        <!-- ↑↑↑ 百度移动统计SDK ↑↑↑ -->
+        <!-- android:theme="@style/bdp_update_dialog_style_fullscreen" -->
+
+        <receiver
+            android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
+                <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
+                <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_AS" />
+                <action android:name="com.baidu.autoupdatesdk.ACTION_AS_DOWNLOAD_COMPLETE" />
+            </intent-filter>
+        </receiver>
+    </application>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+
+</manifest>

BIN
libbdupdatesdk/src/main/jniLibs/armeabi/libMD5_v1.so


BIN
libbdupdatesdk/src/main/jniLibs/armeabi/libbase64encoder_v1_4.so


BIN
libbdupdatesdk/src/main/jniLibs/x86/libMD5_v1.so


BIN
libbdupdatesdk/src/main/jniLibs/x86/libbase64encoder_v1_4.so


BIN
libbdupdatesdk/src/main/res/drawable-mdpi/bdp_update_logo.png


+ 14 - 0
libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_btn.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape>
+            <corners android:radius="5dip" />
+
+            <solid android:color="#ff44d7b3" />
+
+            <padding android:bottom="0dip" android:left="0dip" android:right="0dip" android:top="0dip" />
+        </shape>
+    </item>
+
+</selector>

+ 14 - 0
libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_content.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape>
+            <corners android:bottomLeftRadius="3dip" android:bottomRightRadius="3dip" android:topRightRadius="0dip" android:topLeftRadius="0dip" />
+
+            <solid android:color="#ffffffff" />
+
+            <padding android:bottom="0dip" android:left="0dip" android:right="0dip" android:top="0dip" />
+        </shape>
+    </item>
+
+</selector>

+ 14 - 0
libbdupdatesdk/src/main/res/drawable/bdp_update_bg_dialog_title.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape>
+            <corners android:topRightRadius="3dip" android:topLeftRadius="3dip" android:bottomLeftRadius="0dip" android:bottomRightRadius="0dip" />
+
+            <solid android:color="#ff57b7fe" />
+
+            <padding android:bottom="0dip" android:left="0dip" android:right="0dip" android:top="0dip" />
+        </shape>
+    </item>
+
+</selector>

+ 15 - 0
libbdupdatesdk/src/main/res/drawable/bdp_update_progress_download.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@android:id/background">
+        <shape>
+            <solid android:color="#ff475867"/>
+        </shape>
+    </item>
+	<item android:id="@android:id/progress">
+	    <clip>
+	        <shape>
+	            <solid android:color="#ff129e00"/>
+	        </shape>
+        </clip>
+	</item>
+</layer-list>

+ 99 - 0
libbdupdatesdk/src/main/res/layout/bdp_update_activity_confirm_dialog.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@null" >
+    
+    <TextView 
+        android:id="@+id/txt_title"
+        android:layout_width="match_parent"
+        android:layout_height="40dip"
+        android:paddingLeft="18dip"
+        android:gravity="center_vertical"
+        android:textColor="#ffffffff"
+        android:textSize="16sp"
+        android:background="@drawable/bdp_update_bg_dialog_title"
+        />
+    
+    <LinearLayout 
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="18dip"
+        android:paddingRight="18dip"
+        android:paddingTop="16dip"
+        android:paddingBottom="14dip"
+        android:background="@drawable/bdp_update_bg_dialog_content"
+        android:orientation="vertical">
+        
+        <TextView 
+            android:id="@+id/txt_main_tip"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="14dip"
+            android:singleLine="true"
+            android:ellipsize="end"
+            android:textColor="#ff58b6ff"
+            android:textSize="14sp"
+            />
+        
+        <ScrollView 
+	        android:layout_width="match_parent"
+	        android:layout_height="64dip"
+	        android:layout_marginBottom="10dip"
+	        android:fadingEdge="vertical"
+	        android:fadingEdgeLength="20dip"
+	        android:requiresFadingEdge="vertical"
+	        >
+	        
+	        <TextView 
+	            android:id="@+id/txt_minor_tip"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content"
+	            android:textColor="#ff333333"
+	            android:textSize="13sp"
+	            />
+	    </ScrollView>
+	    
+        <Button 
+            android:id="@+id/btn_action_1"
+            android:layout_width="match_parent"
+            android:layout_height="40dip"
+            android:layout_marginBottom="10dip"
+            android:textColor="#ffffffff"
+            android:textSize="14sp"
+            android:background="@drawable/bdp_update_bg_dialog_btn"
+            />
+        
+        <LinearLayout 
+            android:id="@+id/lin_other_btns"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:weightSum="2"
+            android:gravity="center"
+            android:orientation="horizontal">
+            
+            <TextView 
+                android:id="@+id/txt_action_2"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textColor="#ffabbed9"
+                android:textSize="13sp"
+                android:gravity="center"
+                android:text="@string/bdp_update_not_now"
+                />
+            
+            <TextView 
+                android:id="@+id/txt_action_3"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textColor="#ffabbed9"
+                android:textSize="13sp"
+                android:gravity="center"
+                android:text="@string/bdp_update_ignore"
+                />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>

+ 26 - 0
libbdupdatesdk/src/main/res/values/bdp_update_strings.xml

@@ -0,0 +1,26 @@
+<resources>
+
+    <string name="bdp_update_request_net_error">网络错误,请重试</string>
+    
+    <string name="bdp_update_title_download">发现新版本</string>
+    <string name="bdp_update_title_install">发现新版本安装包</string>
+    <string name="bdp_update_title_as">提示</string>
+    <string name="bdp_update_download_main_tip">%1$s → %2$s / %3$s</string>
+    <string name="bdp_update_install_main_tip">%1$s → %2$s</string>
+    <string name="bdp_update_minor_tip">更新内容:</string>
+    <string name="bdp_update_action_download">立即升级</string>
+    <string name="bdp_update_action_install">立即安装</string>
+    <string name="bdp_update_not_now">暂不升级</string>
+    <string name="bdp_update_ignore">忽略此版本</string>
+    
+    <string name="bdp_update_new_download">发现新版本,点击更新</string>
+    <string name="bdp_update_download_complete">新版本下载完成,点击安装</string>
+    
+    <string name="bdp_update_as_notify_title">百度手机助手</string>
+    <string name="bdp_update_as_notify_tip">百度手机助手</string>
+    <string name="bdp_update_as_download_complete">百度手机助手下载完成</string>
+    <string name="bdp_update_as_install_tip">推荐您使用百度手机助手进行升级。您尚未安装百度手机助手,请先安装。</string>
+    <string name="bdp_update_as_action_install">安装</string>
+    <string name="bdp_update_as_action_cancel">取消</string>
+
+</resources>

+ 25 - 0
libbdupdatesdk/src/main/res/values/bdp_update_styles.xml

@@ -0,0 +1,25 @@
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="bdp_update_dialog_style" parent="android:Theme.Dialog">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item> 
+        <item name="android:windowNoTitle">true</item><!--除去title-->
+        <item name="android:windowContentOverlay">@null</item> 
+        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Translucent</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+    </style>
+    
+    <style name="bdp_update_dialog_style_fullscreen" parent="@style/bdp_update_dialog_style">
+        <item name="android:windowFullscreen">true</item>
+    </style>
+    
+    <style name="bdp_update_progress_download">
+        <item name="android:indeterminateOnly">false</item>
+        <item name="android:progressDrawable">@drawable/bdp_update_progress_download</item>
+        <item name="android:minHeight">8dip</item>
+        <item name="android:maxHeight">8dip</item>
+    </style>
+
+</resources>

+ 15 - 0
libbdupdatesdk/src/test/java/com/example/administrator/libbdupdatesdk/ExampleUnitTest.java

@@ -0,0 +1,15 @@
+package com.example.administrator.libbdupdatesdk;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * To work on unit tests, switch the Test Artifact in the Build Variants view.
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

+ 1 - 1
settings.gradle

@@ -1,2 +1,2 @@
-include ':pullToRefershLibraryMy', ':materialdialogs', ':MPAndroidChart', ':libedittextformlibrary', ':libfloatingactionbutton', ':librarymenudrawer', ':libpsectionlistview'
+include ':pullToRefershLibraryMy', ':materialdialogs', ':MPAndroidChart', ':libedittextformlibrary', ':libfloatingactionbutton', ':librarymenudrawer', ':libpsectionlistview', ':libbdupdatesdk'
 include ':WeiChat'