<修改>部分Dialog ui

<优化>ViewPage滑动卡顿
TTHHR · Feb 20, 2018 · f752425 · f752425
1 parent 08c180b
commit f752425
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 52 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/cn/atd3/code4a/presenter/ArticleFragmentPresenter.java b/app/src/main/java/cn/atd3/code4a/presenter/ArticleFragmentPresenter.java
@@ -35,6 +35,7 @@ public void setIntentData(Intent i, int p) {
     }
 
     public void setAdapterData(final int category) {
+
        new Thread(new Runnable() {
            @Override
            public void run() {

diff --git a/app/src/main/java/cn/atd3/code4a/view/view/ArticleFragment.java b/app/src/main/java/cn/atd3/code4a/view/view/ArticleFragment.java
@@ -55,7 +55,6 @@ public void init(int kind) {
         this.kind = kind;
     }
     public static ArticleDatabase articleDatabase;
-
     private int requestId=-1;
 
     @Nullable
@@ -65,7 +64,6 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
             if (articleDatabase ==null){
                 articleDatabase =new ArticleDatabase(getContext());
             }
-
             afp = new ArticleFragmentPresenter(this,articleDatabase);
             view = inflater.inflate(R.layout.fragment_article, null, false);//实例化
             Log.e("kind", "" + kind);
@@ -126,7 +124,6 @@ public void loadMore() {
             parent.removeView(view);
         }
 
-
         return view;
     }
 
@@ -203,7 +200,6 @@ public void run() {
         );
 
     }
-
     @Override
     public void onfinishRefresh() {
         getActivity().runOnUiThread(

diff --git a/app/src/main/java/cn/atd3/code4a/view/view/MainActivity.kt b/app/src/main/java/cn/atd3/code4a/view/view/MainActivity.kt
@@ -21,6 +21,7 @@ import cn.atd3.code4a.R
 import cn.atd3.code4a.R.color.bootstrap_gray_lighter
 import cn.atd3.code4a.model.adapter.TabFragmentAdapter
 import cn.atd3.code4a.model.model.CategoryModel
+import cn.atd3.code4a.net.Remote
 import cn.atd3.code4a.presenter.MainPresenter
 import cn.atd3.code4a.view.inter.MainViewInterface
 import cn.dxkite.common.StorageData
@@ -155,7 +156,7 @@ class MainActivity : AppCompatActivity(), MainViewInterface, NavigationView.OnNa
             Thread(
                     Runnable {
                         try {
-                   //         Remote.user.method("signin").call("TTHHR", "", true)
+       //                     Remote.user.method("signin").call("TTHHR", "", true)
                         }
                         catch (e:Exception)
                         {

diff --git a/app/src/main/java/cn/atd3/code4a/view/view/ViewArticleActivity.java b/app/src/main/java/cn/atd3/code4a/view/view/ViewArticleActivity.java
@@ -4,6 +4,7 @@
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.net.Uri;
@@ -21,6 +22,9 @@
 import android.widget.Toast;
 
 import com.beardedhen.androidbootstrap.BootstrapButton;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
+import com.qmuiteam.qmui.widget.dialog.QMUITipDialog;
 
 import cn.atd3.code4a.Constant;
 import cn.atd3.code4a.R;
@@ -40,7 +44,7 @@ public class ViewArticleActivity extends AppCompatActivity implements ArticleVie
     private TextView articleText;
     private ViewArticlePresenter vap;
     private BootstrapButton copyButton, mycomment;
-    private AlertDialog md;
+    private QMUITipDialog  md;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -52,10 +56,9 @@ protected void onCreate(Bundle savedInstanceState) {
         // 固定横屏
         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
 
-        md = new AlertDialog.Builder(ViewArticleActivity.this)
-                .setTitle(R.string.please_waiting)
-                .setView(new ProgressBar(ViewArticleActivity.this))
-                .setCancelable(false)//不可跳过
+        md = new QMUITipDialog.Builder(this)
+                .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING)
+                .setTipWord(getString(R.string.info_loading))
                 .create();
 
         vap = new ViewArticlePresenter(this,this,article);//控制器
@@ -167,44 +170,48 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_downloadfile: {
                 //下载附件
 
-                new MDDialog.Builder(ViewArticleActivity.this)
-                        .setMessages(vap.getDownFileList())
-                        .setOnItemClickListener(new MDDialog.OnItemClickListener() {
+                final QMUIDialog.MultiCheckableDialogBuilder builder = new QMUIDialog.MultiCheckableDialogBuilder(this)
+                        .addItems(vap.getDownFileList(), new DialogInterface.OnClickListener() {
                             @Override
-                            public void onItemClicked(int index) {
-                                //创建下载任务,downloadUrl就是下载链接
-                                DownloadManager.Request request = new DownloadManager.Request(Uri.parse(vap.getFileUrl(index)));
-                                // 设置Title
-                                request.setTitle(vap.getDownFileList()[index]);
-                                // 设置描述
-                                request.setDescription(getString(R.string.info_down)+vap.getDownFileList()[index]);
-                                //默认只显示下载中通知
-                                request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-                                //指定下载路径和下载文件名
-
-                                request.setDestinationInExternalPublicDir(Constant.downloadPath+"/"+vap.getArticleid()+"/", vap.getDownFileList()[index]);
-
-//                                        runOnUiThread(
-//                                                new Runnable() {
-//                                                    @Override
-//                                                    public void run() {
-//                                                        Toasty.error(ViewArticleActivity.this,Constant.debugmodeinfo==true?""+e:"error",Toast.LENGTH_SHORT).show();
-//                                                    }
-//                                                }
-//                                        );
-
-                                    Log.e("down path",Constant.downloadPath+"/"+vap.getArticleid()+"/");
-                                Log.e("file",vap.getDownFileList()[index]);
-                    //获取下载管理器
-                                DownloadManager downloadManager= (DownloadManager) ViewArticleActivity.this.getSystemService(Context.DOWNLOAD_SERVICE);
-
-                    //将下载任务加入下载队列，否则不会进行下载
-                                downloadManager.enqueue(request);
+                            public void onClick(DialogInterface dialog, int which) {
+
                             }
-                        })
-                        .setWidthMaxDp(600)
-                        .create()
-                        .show();
+                        });
+                builder.addAction(getString(R.string.button_cancel), new QMUIDialogAction.ActionListener() {
+                    @Override
+                    public void onClick(QMUIDialog dialog, int index) {
+                        dialog.dismiss();
+                    }
+                });
+                builder.addAction(getString(R.string.button_ok), new QMUIDialogAction.ActionListener() {
+                    @Override
+                    public void onClick(QMUIDialog dialog, int index) {
+
+                        for (int i = 0; i < builder.getCheckedItemIndexes().length; i++) {
+                            //创建下载任务,downloadUrl就是下载链接
+                            DownloadManager.Request request = new DownloadManager.Request(Uri.parse(vap.getFileUrl(i)));
+                            // 设置Title
+                            request.setTitle(vap.getDownFileList()[i]);
+                            // 设置描述
+                            request.setDescription(getString(R.string.info_down)+vap.getDownFileList()[i]);
+                            //默认只显示下载中通知
+                            request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
+                            //指定下载路径和下载文件名
+
+                            request.setDestinationInExternalPublicDir(Constant.downloadPath+"/"+vap.getArticleid()+"/", vap.getDownFileList()[i]);
+                            Log.e("down path",Constant.downloadPath+"/"+vap.getArticleid()+"/");
+                            Log.e("file",vap.getDownFileList()[i]);
+                            //获取下载管理器
+                            DownloadManager downloadManager= (DownloadManager) ViewArticleActivity.this.getSystemService(Context.DOWNLOAD_SERVICE);
+
+                            //将下载任务加入下载队列，否则不会进行下载
+                            downloadManager.enqueue(request);
+                        }
+
+                        dialog.dismiss();
+                    }
+                });
+                builder.show();
 
 
                 break;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -18,6 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
+        android:background="@color/bootstrap_gray_lighter"
         android:fitsSystemWindows="true"
         app:menu="@menu/activity_main_drawer" />
 

diff --git a/app/src/main/res/layout/fragment_article.xml b/app/src/main/res/layout/fragment_article.xml
@@ -41,9 +41,9 @@
         <ListView
             android:id="@+id/list_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:divider="@color/bootstrap_gray_lighter"
-            android:dividerHeight="10px"></ListView>
+            android:dividerHeight="4dp"/>
 
     </com.jwenfeng.library.pulltorefresh.PullToRefreshLayout>
 </RelativeLayout>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -10,6 +10,7 @@
     <string name="setting_language_select">Select A Language</string>
     <string name="setting_debug">Debug mode</string>
     <string name="setting_collection">push info</string>
+    <string name="info_loading">Loading</string>
     <string name="about_collection">Collect mobile information to help APP improvement, information does not contain personal privacy</string>
     <string name="setting_auth_donation">donation</string>
     <string name="setting_auth_summary">Donate to authors</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -15,6 +15,7 @@
     <string name="setting_auth_summary">向作者捐赠</string>
     <string name="setting_update">检查更新</string>
     <string name="please_waiting">请等待</string>
+    <string name="info_loading">正在加载</string>
     <string name="nav_share">分享</string>
     <string name="nav_feedback">反馈</string>
     <string name="nav_tool">工具</string>

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0-alpha09'
+        classpath 'com.android.tools.build:gradle:3.2.0-alpha03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         //BindView工具
         classpath 'com.jakewharton:butterknife-gradle-plugin:8.5.1'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jan 27 13:40:07 CST 2018
+#Tue Feb 20 08:33:27 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip