Merge remote-tracking branch 'origin/master'

app/src/main/java/com/sunwin/visitorapp/db/LogModel.java

@@ -11,9 +11,9 @@ public class LogModel {
     public enum Type{
 
         UserLoginIn("登录"),UserLoginOut("登出"),
-        UserSearch("用户查询"),UserEdit("用户编辑"),UserDelete("用户删除"),
-        BlackListSearch("黑名单查询"),BlackListEdit("黑名单编辑"),BlackListDelete("黑名单删除"),
-        RoleSearch("角色查询"),RoleEdit("角色编辑"),RoleDelete("角色删除");
+        UserEdit("用户编辑"),UserDelete("用户删除"),
+        BlackListEdit("黑名单编辑"),BlackListDelete("黑名单删除"),
+        RoleEdit("角色编辑"),RoleDelete("角色删除");
 
         private String name;
         Type(String name){

app/src/main/java/com/sunwin/visitorapp/fragment/BlackListManageFr.java

@@ -77,7 +77,6 @@ public class BlackListManageFr extends Fragment {
 
 
     private void refreshData(){
-        LogModel.AddLog(LogModel.Type.BlackListSearch);
         adapter.setList(DatabaseManager.getInstance().getQueryAll(BlackUserModel.class));
     }
     @SuppressLint("ResourceAsColor")

app/src/main/java/com/sunwin/visitorapp/fragment/RoleManageFr.java

@@ -87,11 +87,9 @@ public class RoleManageFr extends Fragment {
         return root;
     }
     private void refreshData(){
-        LogModel.AddLog(LogModel.Type.RoleSearch);
         adapter.setList(DatabaseManager.getInstance().getQueryAll(RoleModel.class));
     }
     private void search(String key){
-        LogModel.AddLog(LogModel.Type.RoleSearch);
         adapter.setList(DatabaseManager.getInstance().getQueryByWhere(RoleModel.class,"name",key));
     }
     private void createDialog(Context context, ViewGroup parent, RoleModel model){

app/src/main/java/com/sunwin/visitorapp/fragment/UserManageFr.java

@@ -103,12 +103,12 @@ public class UserManageFr extends Fragment {
     }
 
     private void refreshData(){
-        LogModel.AddLog(LogModel.Type.UserSearch);
+
         adapter.setList(DatabaseManager.getInstance().getQueryAll(UserManagerModel.class));
     }
 
     private void search(String key){
-        LogModel.AddLog(LogModel.Type.UserSearch);
+
         adapter.setList(DatabaseManager.getInstance().getQueryByWhere(UserManagerModel.class,"name",key));
     }