release 0.0.5

maoruibin · Dec 25, 2016 · 8288291 · 8288291
1 parent 2d54584
commit 8288291
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 45 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -55,7 +55,7 @@ android {
             minifyEnabled false
             zipAlignEnabled true
             // remove useless resource file
-            shrinkResources true
+            shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 
             if (signingConfigs.release != null) {
@@ -112,6 +112,9 @@ android {
         play {
             manifestPlaceholders = [UMENG_CHANNEL_VALUE: "play"]
         }
+        coolapk {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "coolapk"]
+        }
     }
 }
 
@@ -162,6 +165,7 @@ dependencies {
     compile 'com.jonathanfinerty.once:once:1.0.3'
     compile project(':library')
     compile 'com.github.maoruibin:ViewController:0.9.0'
+    compile "moe.feng:AlipayZeroSdk:1.1"
 }
 
 task showMeCache << {

diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
@@ -23,18 +23,17 @@
 </head>
 <body>
 
-<h3>Version 0.9-beta</h3>
+<h3>Version 1.0.0</h3>
 <p>
     AppPlus is a open source android application,and used to manage app,export apk,watch recent processes.
 </p>
 <ol>
-    <li><b>new:</b> add WeChat Helper (07-20)</li>
-    <li><b>new:</b> add favorite function (06-21)</li>
-    <li><b>new:</b> make lunched speed faster(06-21)</li>
+    <li><b>new:</b> add package info list (16/12/26)</li>
+    <li><b>new:</b> adapter Android N (16/12/25)</li>
 </ol>
 <p>Get the last info about AppPlus by this way <br><br>
-    Weibo &nbsp;&nbsp;<a href='http://weibo.com/u/1874136301'>@大侠咕咚</a><br>
+    Weibo &nbsp;&nbsp;<a href='http://weibo.com/maoruibin'>@大侠咕咚</a><br>
     Google+ &nbsp;&nbsp;<a href='http://plus.google.com/107689066812933417058'>@毛瑞斌</a><br>
-    Github&nbsp;&nbsp;<a href='https://github.com/maoruibin'>@GuDong</a><br>
+    Home &nbsp;&nbsp;<a href='http://gudong.name'>@GuDong</a><br>
 </p>
 </body>
diff --git a/app/src/main/assets/changelog_ch.html b/app/src/main/assets/changelog_ch.html
@@ -23,18 +23,16 @@
 </head>
 <body>
 
-<h3>Version 0.9-beta</h3>
+<h3>Version 1.0.0</h3>
 <p>
-    AppPlus是一个管理手机App、导出APK、查看运行中进程的工具应用。
+    AppPlus是一个管理手机App、导出APK、查看包信息的工具应用。
 </p>
 <ol>
-    <li><b>新增:</b> 微信助手 (07-20)</li>
-    <li><b>新增:</b> 收藏功能 (06-21)</li>
-    <li><b>优化:</b> 启动速度 (06-21)</li>
-    <li><b>优化:</b> 评分机制 (07-21)</li>
+    <li><b>新增:</b> 应用包信息查看（12/26）</li>
+    <li><b>优化:</b> 适配 Android N 版本，解决不能显示最近运行程序列表的问题 (12-25)</li>
 </ol>
 <p>获取最新AppPlus的动态，可通过以下方式<br><br>
-    微博&nbsp;&nbsp;<a href='http://weibo.com/u/1874136301'>@大侠咕咚</a><br>
-    Github&nbsp;&nbsp;<a href='https://github.com/maoruibin'>@GuDong</a><br>
+    微博&nbsp;&nbsp;<a href='http://weibo.com/maoruibin'>@大侠咕咚</a><br>
+    个人主页&nbsp;&nbsp;<a href='http://gudong.name'>@GuDong</a><br>
 </p>
 </body>
diff --git a/app/src/main/assets/donate_ch.html b/app/src/main/assets/donate_ch.html
@@ -40,10 +40,7 @@
     我因此也花费了不少时间与精力，如果这个软件帮助到你了，你又想请我喝杯咖啡，可以通过支付宝的方式，给我打赏，非常感谢。
 </p>
 <p>
-    我的支付宝账号：<b>[email protected]</b>
-</p>
-<p>
-    点击下面的按钮 复制账号并打开支付宝，即可转账打赏，再次感谢你的支持。
+    点击下面的按钮 打开支付宝转账页面，即可转账打赏，再次感谢你的支持。
 </p>
 
 </body>
diff --git a/app/src/main/java/com/gudong/appkit/ui/activity/AppInfoActivity.java b/app/src/main/java/com/gudong/appkit/ui/activity/AppInfoActivity.java
@@ -34,6 +34,7 @@ public class AppInfoActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setupToolBar(R.string.action_package, true);
         initView();
         basicViewController = new AppBasicViewController(this);
         permissionViewController = new AppPermissionViewController(this);
@@ -48,7 +49,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         String packageName = getIntent().getStringExtra("package");
         fillData(packageName);
-
     }
 
     private void fillData(String packageName) {

diff --git a/app/src/main/java/com/gudong/appkit/ui/activity/AppOperateActivity.java b/app/src/main/java/com/gudong/appkit/ui/activity/AppOperateActivity.java
@@ -172,9 +172,8 @@ public void onClick(View v) {
                 MobclickAgent.onEvent(this, "action_export");
                 break;
             case R.id.tv_detail:
-//                NavigationManager.openAppDetail(this,mAppEntity.getPackageName());
                 NavigationManager.openAppInfo(this,mAppEntity.getPackageName());
-                MobclickAgent.onEvent(this, "action_detail");
+                MobclickAgent.onEvent(this, "action_package");
                 break;
             case R.id.tv_more:
                 showMoreDialog();
@@ -198,6 +197,10 @@ public void onClick(DialogInterface dialog, int which) {
                                 MobclickAgent.onEvent(AppOperateActivity.this, "more_uninstall");
                                 break;
                             case 2:
+                                NavigationManager.openAppDetail(AppOperateActivity.this,mAppEntity.getPackageName());
+                                MobclickAgent.onEvent(AppOperateActivity.this, "watch_detail");
+                                break;
+                            case 3:
                                 NavigationManager.gotoMarket(AppOperateActivity.this,mAppEntity.getPackageName());
                                 MobclickAgent.onEvent(AppOperateActivity.this, "action_market");
                                 break;

diff --git a/app/src/main/java/com/gudong/appkit/ui/activity/MainActivity.java b/app/src/main/java/com/gudong/appkit/ui/activity/MainActivity.java
@@ -22,9 +22,6 @@
 
 package com.gudong.appkit.ui.activity;
 
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
@@ -43,8 +40,6 @@
 import android.widget.Toast;
 
 import com.gudong.appkit.R;
-import com.gudong.appkit.dao.AppEntity;
-import com.gudong.appkit.dao.DataHelper;
 import com.gudong.appkit.dao.WeChatHelper;
 import com.gudong.appkit.event.EEvent;
 import com.gudong.appkit.event.RxBus;
@@ -60,6 +55,7 @@
 
 import hotchemi.android.rate.AppRate;
 import hotchemi.android.rate.OnClickButtonListener;
+import moe.feng.alipay.zerosdk.AlipayZeroSdk;
 import rx.functions.Action1;
 
 public class MainActivity extends BaseActivity {
@@ -217,19 +213,8 @@ private void showDonateDialog() {
                 getString(R.string.action_copy_to_clipboard),new DialogInterface.OnClickListener(){
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        String alipay = "com.eg.android.AlipayGphone";
-                        AppEntity alipayApp = DataHelper.getAppByPackageName(alipay);
-                        if(alipayApp!=null){
-                            //复制到粘贴板
-                            ClipboardManager cmb = (ClipboardManager)getSystemService(Context.CLIPBOARD_SERVICE);
-                            cmb.setPrimaryClip(ClipData.newPlainText(null, "[email protected]"));
-                            Toast.makeText(MainActivity.this, R.string.copy_success, Toast.LENGTH_LONG).show();
-                            //打开支付宝
-                            try {
-                                NavigationManager.openApp(MainActivity.this,alipay);
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                            }
+                        if(AlipayZeroSdk.hasInstalledAlipayClient(MainActivity.this)){
+                            AlipayZeroSdk.startAlipayClient(MainActivity.this, "aex07094cljuqa36ku7ml36");
                         }else{
                             Toast.makeText(MainActivity.this,getString(R.string.support_exception_for_alipay), Toast.LENGTH_SHORT).show();
                         }

diff --git a/app/src/main/res/drawable/ic_android_black_24dp.xml b/app/src/main/res/drawable/ic_android_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_app.xml b/app/src/main/res/layout/activity_app.xml
@@ -121,7 +121,7 @@
                     android:id="@+id/tv_detail"
                     style="@style/ActionButton"
                     android:drawableTop="?attr/ic_menu_detail"
-                    android:text="@string/menu_pop_item_detail"/>
+                    android:text="@string/menu_pop_item_package"/>
                 <View
                     android:layout_width="@dimen/dp_1"
                     android:layout_height="match_parent"

diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml
@@ -24,6 +24,7 @@
     <array name="more_action">
         <item>打开应用</item>
         <item>卸载应用</item>
+        <item>查看应用详情</item>
         <item>去市场查看</item>
     </array>
 </resources>

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -8,10 +8,11 @@
     <string name="action_opinion">意见反馈</string>
     <string name="action_retry">重试</string>
     <string name="action_about">关于</string>
+    <string name="action_package">包信息</string>
     <string name="action_wechat_helper">微信助手</string>
     <string name="action_close">关闭</string>
     <string name="action_copy_to_clipboard">复制账号并打开支付宝</string>
-    <string name="action_grunt">授予</string>
+    <string name="action_grunt">前往授权页面</string>
     <string name="action_refuse">拒绝</string>
     <string name="copy_success">支付宝账号已复制到粘贴板 </string>
     <string name="empty"></string>
@@ -25,6 +26,7 @@
     <string name="menu_pop_item_file">导出到本地</string>
     <string name="menu_pop_item_share">分享安装包</string>
     <string name="menu_pop_item_detail">查看应用详情</string>
+    <string name="menu_pop_item_package">查看包信息</string>
     <string name="menu_pop_item_open">打开此软件</string>
     <string name="menu_pop_item_more">更多操作</string>
 

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -24,6 +24,7 @@
     <array name="more_action">
         <item>Open</item>
         <item>Uninstall</item>
+        <item>Watch detail</item>
         <item>Go market</item>
     </array>
 </resources>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,6 +8,7 @@
     <string name="action_opinion">Send opinion</string>
     <string name="action_retry">Reload</string>
     <string name="action_about">About</string>
+    <string name="action_package">Package Info</string>
     <string name="action_wechat_helper">WechatHelper</string>
     <string name="action_close">Close</string>
     <string name="action_copy_to_clipboard">Copy and open Alipay</string>
@@ -25,6 +26,7 @@
     <string name="menu_pop_item_file">Export to local</string>
     <string name="menu_pop_item_share">Share apk</string>
     <string name="menu_pop_item_detail">Watch detail</string>
+    <string name="menu_pop_item_package">Watch package info</string>
     <string name="menu_pop_item_open">Open</string>
     <string name="menu_pop_item_more">More</string>
 

diff --git a/app/src/main/res/values/style_parent.xml b/app/src/main/res/values/style_parent.xml
@@ -6,7 +6,7 @@
         <item name="theme_accent_color">@color/colorAccent</item>
 
         <item name="ic_menu_export">@drawable/ic_export_black_24dp</item>
-        <item name="ic_menu_detail">@drawable/ic_detail_black_24dp</item>
+        <item name="ic_menu_detail">@drawable/ic_android_black_24dp</item>
         <item name="ic_menu_share">@drawable/ic_share_black_24dp</item>
         <item name="ic_menu_favorite">@drawable/ic_grade_black_24dp</item>
 

diff --git a/gradle.properties b/gradle.properties
@@ -14,8 +14,8 @@
 # org.gradle.parallel=true
 #Mon Mar 07 16:31:11 CST 2016
 systemProp.http.proxyPort=1080
-VERSION_NAME=0.9-beta
-VERSION_CODE=16
+VERSION_NAME=0.9.5
+VERSION_CODE=18
 ANDROID_BUILD_SDK_MIN_VERSION=14
 ANDROID_BUILD_TARGET_SDK_VERSION=25
 ANDROID_BUILD_TOOLS_VERSION=25.0.0