Merge pull request #55 from xuexiangjys/dev/1.1.2

Dev/1.1.2

Author: xuexiangjys

README.md

@@ -63,7 +63,7 @@ allprojects {
 dependencies {
   ...
   //androidx项目
-  implementation 'com.github.xuexiangjys:XUI:1.1.1'
+  implementation 'com.github.xuexiangjys:XUI:1.1.2'
 
   implementation 'androidx.appcompat:appcompat:1.1.0'
   implementation 'androidx.recyclerview:recyclerview:1.1.0'
@@ -217,6 +217,10 @@ C*y | 1￥ | 微信
 *钰晗 | 6￥ | 支付宝
 *娜 | 3￥ | 微信
 *米 | 20￥ | 微信
+*忘 | 10￥ | 微信
+*清红 | 1￥ | 支付宝
+*口 | 5￥ | 微信
+
 
 ## 联系方式
 

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.xuexiang.xuidemo"
         minSdkVersion 17
         targetSdkVersion build_versions.target_sdk
-        versionCode 12
-        versionName "1.1.1"
+        versionCode 13
+        versionName "1.1.2"
 
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
@@ -102,8 +102,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.8.0'
 
     //XUI框架
-//    implementation project(':xui_lib')
-    implementation 'com.github.xuexiangjys:XUI:1.1.1'
+    implementation project(':xui_lib')
+//    implementation 'com.github.xuexiangjys:XUI:1.1.1'
 //    implementation 'com.qmuiteam:qmui:1.2.0'
 
     //工具类
@@ -115,7 +115,7 @@ dependencies {
     implementation 'com.github.xuexiangjys.XRouter:xrouter-runtime:1.0.1'
     annotationProcessor 'com.github.xuexiangjys.XRouter:xrouter-compiler:1.0.1'
     //XPage页面框架
-    implementation 'com.github.xuexiangjys.XPage:xpage-lib:2.2.8'
+    implementation 'com.github.xuexiangjys.XPage:xpage-lib:2.2.9'
     annotationProcessor project(':widget_compiler')
     //ButterKnife
     implementation deps.butterknife.runtime
@@ -159,6 +159,10 @@ dependencies {
     implementation 'com.github.xuexiangjys.AgentWeb:agentweb-download:1.0.0'//选填
     implementation 'com.github.xuexiangjys.AgentWeb:agentweb-filechooser:1.0.0'//选填
 
+    //数据库
+    implementation 'com.github.xuexiangjys.XOrmlite:xormlite-runtime:1.0.1'
+    annotationProcessor 'com.github.xuexiangjys.XOrmlite:xormlite-compiler:1.0.1'
+
     //侧边栏菜单
     implementation 'com.yarolegovich:sliding-root-nav:1.1.0'
 

app/src/main/java/com/xuexiang/xuidemo/DemoDataProvider.java

@@ -135,7 +135,7 @@ private static List<NineGridInfo> getMediaDemos(int length, int type) {
         NineGridInfo info;
         for (int i = 0; i < length; i++) {
             info = new NineGridInfo("我是一只喵，快乐的星猫～～～", getRandomMedias((int) (Math.random() * 10 + 0.5), type))
-                .setShowType(NineGridImageView.STYLE_FILL);
+                    .setShowType(NineGridImageView.STYLE_FILL);
             list.add(info);
         }
         return list;
@@ -458,4 +458,59 @@ public static List<ElemeGroupedItem> getElemeGroupItems() {
         }.getType());
     }
 
+    /**
+     * @return 省市区数据
+     */
+    public static List<ProvinceInfo> getProvinceInfos() {
+        return JsonUtil.fromJson(ResourceUtils.readStringFromAssert("province.json"), new TypeToken<List<ProvinceInfo>>() {
+        }.getType());
+    }
+
+    /**
+     * 获取时间段
+     *
+     * @param interval 时间间隔（分钟）
+     * @return
+     */
+    public static String[] getTimePeriod(int interval) {
+        return getTimePeriod(24, interval);
+    }
+
+    /**
+     * 获取时间段
+     *
+     * @param interval 时间间隔（分钟）
+     * @return
+     */
+    public static String[] getTimePeriod(int totalHour, int interval) {
+        String[] time = new String[totalHour * 60 / interval];
+        int point, hour, min;
+        for (int i = 0; i < time.length; i++) {
+            point = i * interval;
+            hour = point / 60;
+            min = point - hour * 60;
+            time[i] = (hour < 9 ? "0" + hour : "" + hour) + ":" + (min < 9 ? "0" + min : "" + min);
+        }
+        return time;
+    }
+
+
+    /**
+     * 获取时间段
+     *
+     * @param interval 时间间隔（分钟）
+     * @return
+     */
+    public static String[] getTimePeriod(int startHour, int totalHour, int interval) {
+        String[] time = new String[totalHour * 60 / interval];
+        int point, hour, min;
+        for (int i = 0; i < time.length; i++) {
+            point = i * interval + startHour * 60;
+            hour = point / 60;
+            min = point - hour * 60;
+            time[i] = (hour < 9 ? "0" + hour : "" + hour) + ":" + (min < 9 ? "0" + min : "" + min);
+        }
+        return time;
+    }
+
 }

app/src/main/java/com/xuexiang/xuidemo/MyApp.java

@@ -8,6 +8,8 @@
 import com.google.android.cameraview.CameraView;
 import com.luck.picture.lib.tools.PictureFileUtils;
 import com.mikepenz.iconics.Iconics;
+import com.xuexiang.xormlite.annotation.DataBase;
+import com.xuexiang.xormlite.enums.DataBaseType;
 import com.xuexiang.xui.XUI;
 import com.xuexiang.xuidemo.utils.sdkinit.AutoCameraStrategy;
 import com.xuexiang.xuidemo.utils.sdkinit.BuglyInit;
@@ -24,6 +26,7 @@
  * @author xuexiang
  * @since 2018/11/7 下午1:12
  */
+@DataBase(name = "XUI", type = DataBaseType.INTERNAL)
 public class MyApp extends Application {
 
     @Override

app/src/main/java/com/xuexiang/xuidemo/adapter/NewsListAdapter.java

@@ -1,6 +1,6 @@
 package com.xuexiang.xuidemo.adapter;
 
-import com.scwang.smartrefresh.layout.adapter.SmartViewHolder;
+import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;
 import com.xuexiang.xui.widget.imageview.ImageLoader;
 import com.xuexiang.xui.widget.imageview.RadiusImageView;
 import com.xuexiang.xuidemo.DemoDataProvider;
@@ -22,10 +22,16 @@ public class NewsListAdapter extends BroccoliRecyclerAdapter<NewInfo> {
     private boolean mIsAnim;
 
     public NewsListAdapter(boolean isAnim) {
-        super(DemoDataProvider.getEmptyNewInfo(), R.layout.adapter_news_list_item);
+        super(DemoDataProvider.getEmptyNewInfo());
         mIsAnim = isAnim;
     }
 
+
+    @Override
+    protected int getItemLayoutId(int viewType) {
+        return R.layout.adapter_news_list_item;
+    }
+
     /**
      * 绑定控件
      *
@@ -34,7 +40,7 @@ public NewsListAdapter(boolean isAnim) {
      * @param position
      */
     @Override
-    protected void onBindData(SmartViewHolder holder, NewInfo model, int position) {
+    protected void onBindData(RecyclerViewHolder holder, NewInfo model, int position) {
         holder.text(R.id.tv_user_name, model.getUserName());
         holder.text(R.id.tv_tag, model.getTag());
         holder.text(R.id.tv_title, model.getTitle());
@@ -54,7 +60,7 @@ protected void onBindData(SmartViewHolder holder, NewInfo model, int position) {
      * @param broccoli
      */
     @Override
-    protected void onBindBroccoli(SmartViewHolder holder, Broccoli broccoli) {
+    protected void onBindBroccoli(RecyclerViewHolder holder, Broccoli broccoli) {
         if (mIsAnim) {
             broccoli.addPlaceholder(PlaceholderHelper.getParameter(holder.findView(R.id.iv_avatar)))
                     .addPlaceholder(PlaceholderHelper.getParameter(holder.findView(R.id.tv_user_name)))

app/src/main/java/com/xuexiang/xuidemo/adapter/PreviewRecycleAdapter.java

@@ -16,9 +16,11 @@
 
 package com.xuexiang.xuidemo.adapter;
 
+import androidx.annotation.NonNull;
+
 import com.bumptech.glide.Glide;
-import com.scwang.smartrefresh.layout.adapter.SmartRecyclerAdapter;
-import com.scwang.smartrefresh.layout.adapter.SmartViewHolder;
+import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;
+import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;
 import com.xuexiang.xui.widget.imageview.IconImageView;
 import com.xuexiang.xui.widget.imageview.preview.loader.GlideMediaLoader;
 import com.xuexiang.xuidemo.R;
@@ -30,32 +32,26 @@
  * @author xuexiang
  * @since 2018/12/7 下午5:40
  */
-public class PreviewRecycleAdapter extends SmartRecyclerAdapter<ImageViewInfo> {
+public class PreviewRecycleAdapter extends BaseRecyclerAdapter<ImageViewInfo> {
 
-    public PreviewRecycleAdapter() {
-        super(R.layout.adapter_item_image_preview);
+    @Override
+    protected int getItemLayoutId(int viewType) {
+        return R.layout.adapter_item_image_preview;
     }
 
-    /**
-     * 绑定布局控件
-     *
-     * @param holder
-     * @param model
-     * @param position
-     */
     @Override
-    protected void onBindViewHolder(SmartViewHolder holder, ImageViewInfo model, int position) {
-        if (model != null) {
+    protected void bindData(@NonNull RecyclerViewHolder holder, int position, ImageViewInfo item) {
+        if (item != null) {
             IconImageView imageView = holder.findViewById(R.id.iv);
 
-            imageView.setIsShowIcon(model.getVideoUrl() != null);
+            imageView.setIsShowIcon(item.getVideoUrl() != null);
 
             Glide.with(imageView.getContext())
-                    .load(model.getUrl())
+                    .load(item.getUrl())
                     .apply(GlideMediaLoader.getRequestOptions())
                     .into(imageView);
 
-            imageView.setTag(R.id.iv, model.getUrl());
+            imageView.setTag(R.id.iv, item.getUrl());
         }
     }
 }

app/src/main/java/com/xuexiang/xuidemo/adapter/SearchRecordTagAdapter.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2019 xuexiangjys(xuexiangjys@163.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.xuexiang.xuidemo.adapter;
+
+import androidx.annotation.NonNull;
+
+import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;
+import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;
+import com.xuexiang.xuidemo.R;
+import com.xuexiang.xuidemo.base.db.entity.SearchRecord;
+
+/**
+ * @author xuexiang
+ * @since 2019-12-04 23:21
+ */
+public class SearchRecordTagAdapter extends BaseRecyclerAdapter<SearchRecord> {
+
+    @Override
+    protected int getItemLayoutId(int viewType) {
+        return R.layout.adapter_search_record_tag_item;
+    }
+
+    @Override
+    protected void bindData(@NonNull RecyclerViewHolder holder, int position, SearchRecord item) {
+        if (item != null) {
+            holder.text(R.id.tv_tag, item.getContent());
+        }
+    }
+}

app/src/main/java/com/xuexiang/xuidemo/adapter/base/BroccoliRecyclerAdapter.java

@@ -1,10 +1,12 @@
 package com.xuexiang.xuidemo.adapter.base;
 
-import androidx.annotation.LayoutRes;
 import android.view.View;
 
-import com.scwang.smartrefresh.layout.adapter.SmartRecyclerAdapter;
-import com.scwang.smartrefresh.layout.adapter.SmartViewHolder;
+import androidx.annotation.NonNull;
+
+import com.xuexiang.xui.adapter.recyclerview.BaseRecyclerAdapter;
+import com.xuexiang.xui.adapter.recyclerview.RecyclerViewHolder;
+import com.xuexiang.xui.adapter.recyclerview.XRecyclerAdapter;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -18,26 +20,21 @@
  * @author XUE
  * @since 2019/4/8 16:33
  */
-public abstract class BroccoliRecyclerAdapter<T> extends SmartRecyclerAdapter<T> {
+public abstract class BroccoliRecyclerAdapter<T> extends BaseRecyclerAdapter<T> {
     /**
      * 是否已经加载成功
      */
     private boolean mHasLoad = false;
     private Map<View, Broccoli> mBroccoliMap = new HashMap<>();
 
-    public BroccoliRecyclerAdapter(Collection<T> collection, @LayoutRes int layoutId) {
-        super(collection, layoutId);
+    public BroccoliRecyclerAdapter(Collection<T> collection) {
+        super(collection);
     }
 
-    /**
-     * 绑定布局控件
-     *
-     * @param holder
-     * @param model
-     * @param position
-     */
+
+
     @Override
-    protected void onBindViewHolder(SmartViewHolder holder, T model, int position) {
+    protected void bindData(@NonNull RecyclerViewHolder holder, int position, T item) {
         Broccoli broccoli = mBroccoliMap.get(holder.itemView);
         if (broccoli == null) {
             broccoli = new Broccoli();
@@ -46,7 +43,7 @@ protected void onBindViewHolder(SmartViewHolder holder, T model, int position) {
         if (mHasLoad) {
             broccoli.removeAllPlaceholders();
 
-            onBindData(holder, model, position);
+            onBindData(holder, item, position);
         } else {
             onBindBroccoli(holder, broccoli);
             broccoli.show();
@@ -60,17 +57,17 @@ protected void onBindViewHolder(SmartViewHolder holder, T model, int position) {
      * @param model
      * @param position
      */
-    protected abstract void onBindData(SmartViewHolder holder, T model, int position);
+    protected abstract void onBindData(RecyclerViewHolder holder, T model, int position);
 
     /**
      * 绑定占位控件
      *
      * @param broccoli
      */
-    protected abstract void onBindBroccoli(SmartViewHolder holder, Broccoli broccoli);
+    protected abstract void onBindBroccoli(RecyclerViewHolder holder, Broccoli broccoli);
 
     @Override
-    public SmartRecyclerAdapter<T> refresh(Collection<T> collection) {
+    public XRecyclerAdapter refresh(Collection<T> collection) {
         mHasLoad = true;
         return super.refresh(collection);
     }

app/src/main/java/com/xuexiang/xuidemo/base/BaseHomeFragment.java

@@ -32,6 +32,7 @@
 import com.xuexiang.xuidemo.activity.MainActivity;
 import com.xuexiang.xuidemo.adapter.WidgetItemAdapter;
 import com.xuexiang.xuidemo.fragment.AboutFragment;
+import com.xuexiang.xuidemo.fragment.SearchComponentFragment;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -63,6 +64,17 @@ public void onClick(View v) {
                 getContainer().openMenu();
             }
         });
+        titleBar.addAction(new TitleBar.ImageAction(R.drawable.icon_action_query) {
+            @Override
+            @SingleClick
+            public void performAction(View view) {
+                openNewPage(SearchComponentFragment.class);
+            }
+            @Override
+            public int rightPadding() {
+                return DensityUtils.dp2px(10);
+            }
+        });
         titleBar.addAction(new TitleBar.ImageAction(R.drawable.icon_action_about) {
             @Override
             @SingleClick