chore: 版本更新至 5.14.2

fix: 添加 onConfigurationChanged 日志辅助闪退确定问题

See merge request halo/android/assistant-android!407

.editorconfig

@@ -0,0 +1,555 @@
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+max_line_length = 120
+tab_width = 4
+ij_continuation_indent_size = 8
+ij_formatter_off_tag = @formatter:off
+ij_formatter_on_tag = @formatter:on
+ij_formatter_tags_enabled = false
+ij_smart_tabs = false
+ij_visual_guides = none
+ij_wrap_on_typing = false
+
+[*.java]
+ij_java_align_consecutive_assignments = false
+ij_java_align_consecutive_variable_declarations = false
+ij_java_align_group_field_declarations = false
+ij_java_align_multiline_annotation_parameters = false
+ij_java_align_multiline_array_initializer_expression = false
+ij_java_align_multiline_assignment = false
+ij_java_align_multiline_binary_operation = false
+ij_java_align_multiline_chained_methods = false
+ij_java_align_multiline_extends_list = false
+ij_java_align_multiline_for = true
+ij_java_align_multiline_method_parentheses = false
+ij_java_align_multiline_parameters = true
+ij_java_align_multiline_parameters_in_calls = false
+ij_java_align_multiline_parenthesized_expression = false
+ij_java_align_multiline_records = true
+ij_java_align_multiline_resources = true
+ij_java_align_multiline_ternary_operation = false
+ij_java_align_multiline_text_blocks = false
+ij_java_align_multiline_throws_list = false
+ij_java_align_subsequent_simple_methods = false
+ij_java_align_throws_keyword = false
+ij_java_align_types_in_multi_catch = true
+ij_java_annotation_parameter_wrap = off
+ij_java_array_initializer_new_line_after_left_brace = false
+ij_java_array_initializer_right_brace_on_new_line = false
+ij_java_array_initializer_wrap = off
+ij_java_assert_statement_colon_on_next_line = false
+ij_java_assert_statement_wrap = off
+ij_java_assignment_wrap = off
+ij_java_binary_operation_sign_on_next_line = false
+ij_java_binary_operation_wrap = off
+ij_java_blank_lines_after_anonymous_class_header = 0
+ij_java_blank_lines_after_class_header = 0
+ij_java_blank_lines_after_imports = 1
+ij_java_blank_lines_after_package = 1
+ij_java_blank_lines_around_class = 1
+ij_java_blank_lines_around_field = 0
+ij_java_blank_lines_around_field_in_interface = 0
+ij_java_blank_lines_around_initializer = 1
+ij_java_blank_lines_around_method = 1
+ij_java_blank_lines_around_method_in_interface = 1
+ij_java_blank_lines_before_class_end = 0
+ij_java_blank_lines_before_imports = 1
+ij_java_blank_lines_before_method_body = 0
+ij_java_blank_lines_before_package = 0
+ij_java_block_brace_style = end_of_line
+ij_java_block_comment_add_space = false
+ij_java_block_comment_at_first_column = true
+ij_java_builder_methods = none
+ij_java_call_parameters_new_line_after_left_paren = false
+ij_java_call_parameters_right_paren_on_new_line = false
+ij_java_call_parameters_wrap = off
+ij_java_case_statement_on_separate_line = true
+ij_java_catch_on_new_line = false
+ij_java_class_annotation_wrap = split_into_lines
+ij_java_class_brace_style = end_of_line
+ij_java_class_count_to_use_import_on_demand = 99
+ij_java_class_names_in_javadoc = 1
+ij_java_do_not_indent_top_level_class_members = false
+ij_java_do_not_wrap_after_single_annotation = false
+ij_java_do_not_wrap_after_single_annotation_in_parameter = false
+ij_java_do_while_brace_force = never
+ij_java_doc_add_blank_line_after_description = true
+ij_java_doc_add_blank_line_after_param_comments = false
+ij_java_doc_add_blank_line_after_return = false
+ij_java_doc_add_p_tag_on_empty_lines = true
+ij_java_doc_align_exception_comments = true
+ij_java_doc_align_param_comments = true
+ij_java_doc_do_not_wrap_if_one_line = false
+ij_java_doc_enable_formatting = true
+ij_java_doc_enable_leading_asterisks = true
+ij_java_doc_indent_on_continuation = false
+ij_java_doc_keep_empty_lines = true
+ij_java_doc_keep_empty_parameter_tag = true
+ij_java_doc_keep_empty_return_tag = true
+ij_java_doc_keep_empty_throws_tag = true
+ij_java_doc_keep_invalid_tags = true
+ij_java_doc_param_description_on_new_line = false
+ij_java_doc_preserve_line_breaks = false
+ij_java_doc_use_throws_not_exception_tag = true
+ij_java_else_on_new_line = false
+ij_java_enum_constants_wrap = off
+ij_java_extends_keyword_wrap = off
+ij_java_extends_list_wrap = off
+ij_java_field_annotation_wrap = split_into_lines
+ij_java_finally_on_new_line = false
+ij_java_for_brace_force = never
+ij_java_for_statement_new_line_after_left_paren = false
+ij_java_for_statement_right_paren_on_new_line = false
+ij_java_for_statement_wrap = off
+ij_java_generate_final_locals = false
+ij_java_generate_final_parameters = false
+ij_java_if_brace_force = never
+ij_java_imports_layout = $android.**,$androidx.**,$com.**,$junit.**,$net.**,$org.**,$java.**,$javax.**,$*,|,android.**,|,androidx.**,|,com.**,|,junit.**,|,net.**,|,org.**,|,java.**,|,javax.**,|,*,|
+ij_java_indent_case_from_switch = true
+ij_java_insert_inner_class_imports = false
+ij_java_insert_override_annotation = true
+ij_java_keep_blank_lines_before_right_brace = 2
+ij_java_keep_blank_lines_between_package_declaration_and_header = 2
+ij_java_keep_blank_lines_in_code = 2
+ij_java_keep_blank_lines_in_declarations = 2
+ij_java_keep_builder_methods_indents = false
+ij_java_keep_control_statement_in_one_line = true
+ij_java_keep_first_column_comment = true
+ij_java_keep_indents_on_empty_lines = false
+ij_java_keep_line_breaks = true
+ij_java_keep_multiple_expressions_in_one_line = false
+ij_java_keep_simple_blocks_in_one_line = false
+ij_java_keep_simple_classes_in_one_line = false
+ij_java_keep_simple_lambdas_in_one_line = false
+ij_java_keep_simple_methods_in_one_line = false
+ij_java_label_indent_absolute = false
+ij_java_label_indent_size = 0
+ij_java_lambda_brace_style = end_of_line
+ij_java_layout_static_imports_separately = true
+ij_java_line_comment_add_space = false
+ij_java_line_comment_add_space_on_reformat = false
+ij_java_line_comment_at_first_column = true
+ij_java_method_annotation_wrap = split_into_lines
+ij_java_method_brace_style = end_of_line
+ij_java_method_call_chain_wrap = off
+ij_java_method_parameters_new_line_after_left_paren = false
+ij_java_method_parameters_right_paren_on_new_line = false
+ij_java_method_parameters_wrap = off
+ij_java_modifier_list_wrap = false
+ij_java_multi_catch_types_wrap = normal
+ij_java_names_count_to_use_import_on_demand = 99
+ij_java_new_line_after_lparen_in_annotation = false
+ij_java_new_line_after_lparen_in_record_header = false
+ij_java_parameter_annotation_wrap = off
+ij_java_parentheses_expression_new_line_after_left_paren = false
+ij_java_parentheses_expression_right_paren_on_new_line = false
+ij_java_place_assignment_sign_on_next_line = false
+ij_java_prefer_longer_names = true
+ij_java_prefer_parameters_wrap = false
+ij_java_record_components_wrap = normal
+ij_java_repeat_synchronized = true
+ij_java_replace_instanceof_and_cast = false
+ij_java_replace_null_check = true
+ij_java_replace_sum_lambda_with_method_ref = true
+ij_java_resource_list_new_line_after_left_paren = false
+ij_java_resource_list_right_paren_on_new_line = false
+ij_java_resource_list_wrap = off
+ij_java_rparen_on_new_line_in_annotation = false
+ij_java_rparen_on_new_line_in_record_header = false
+ij_java_space_after_closing_angle_bracket_in_type_argument = false
+ij_java_space_after_colon = true
+ij_java_space_after_comma = true
+ij_java_space_after_comma_in_type_arguments = true
+ij_java_space_after_for_semicolon = true
+ij_java_space_after_quest = true
+ij_java_space_after_type_cast = true
+ij_java_space_before_annotation_array_initializer_left_brace = false
+ij_java_space_before_annotation_parameter_list = false
+ij_java_space_before_array_initializer_left_brace = false
+ij_java_space_before_catch_keyword = true
+ij_java_space_before_catch_left_brace = true
+ij_java_space_before_catch_parentheses = true
+ij_java_space_before_class_left_brace = true
+ij_java_space_before_colon = true
+ij_java_space_before_colon_in_foreach = true
+ij_java_space_before_comma = false
+ij_java_space_before_do_left_brace = true
+ij_java_space_before_else_keyword = true
+ij_java_space_before_else_left_brace = true
+ij_java_space_before_finally_keyword = true
+ij_java_space_before_finally_left_brace = true
+ij_java_space_before_for_left_brace = true
+ij_java_space_before_for_parentheses = true
+ij_java_space_before_for_semicolon = false
+ij_java_space_before_if_left_brace = true
+ij_java_space_before_if_parentheses = true
+ij_java_space_before_method_call_parentheses = false
+ij_java_space_before_method_left_brace = true
+ij_java_space_before_method_parentheses = false
+ij_java_space_before_opening_angle_bracket_in_type_parameter = false
+ij_java_space_before_quest = true
+ij_java_space_before_switch_left_brace = true
+ij_java_space_before_switch_parentheses = true
+ij_java_space_before_synchronized_left_brace = true
+ij_java_space_before_synchronized_parentheses = true
+ij_java_space_before_try_left_brace = true
+ij_java_space_before_try_parentheses = true
+ij_java_space_before_type_parameter_list = false
+ij_java_space_before_while_keyword = true
+ij_java_space_before_while_left_brace = true
+ij_java_space_before_while_parentheses = true
+ij_java_space_inside_one_line_enum_braces = false
+ij_java_space_within_empty_array_initializer_braces = false
+ij_java_space_within_empty_method_call_parentheses = false
+ij_java_space_within_empty_method_parentheses = false
+ij_java_spaces_around_additive_operators = true
+ij_java_spaces_around_annotation_eq = true
+ij_java_spaces_around_assignment_operators = true
+ij_java_spaces_around_bitwise_operators = true
+ij_java_spaces_around_equality_operators = true
+ij_java_spaces_around_lambda_arrow = true
+ij_java_spaces_around_logical_operators = true
+ij_java_spaces_around_method_ref_dbl_colon = false
+ij_java_spaces_around_multiplicative_operators = true
+ij_java_spaces_around_relational_operators = true
+ij_java_spaces_around_shift_operators = true
+ij_java_spaces_around_type_bounds_in_type_parameters = true
+ij_java_spaces_around_unary_operator = false
+ij_java_spaces_within_angle_brackets = false
+ij_java_spaces_within_annotation_parentheses = false
+ij_java_spaces_within_array_initializer_braces = false
+ij_java_spaces_within_braces = false
+ij_java_spaces_within_brackets = false
+ij_java_spaces_within_cast_parentheses = false
+ij_java_spaces_within_catch_parentheses = false
+ij_java_spaces_within_for_parentheses = false
+ij_java_spaces_within_if_parentheses = false
+ij_java_spaces_within_method_call_parentheses = false
+ij_java_spaces_within_method_parentheses = false
+ij_java_spaces_within_parentheses = false
+ij_java_spaces_within_record_header = false
+ij_java_spaces_within_switch_parentheses = false
+ij_java_spaces_within_synchronized_parentheses = false
+ij_java_spaces_within_try_parentheses = false
+ij_java_spaces_within_while_parentheses = false
+ij_java_special_else_if_treatment = true
+ij_java_subclass_name_suffix = Impl
+ij_java_ternary_operation_signs_on_next_line = false
+ij_java_ternary_operation_wrap = off
+ij_java_test_name_suffix = Test
+ij_java_throws_keyword_wrap = off
+ij_java_throws_list_wrap = off
+ij_java_use_external_annotations = false
+ij_java_use_fq_class_names = false
+ij_java_use_relative_indents = false
+ij_java_use_single_class_imports = true
+ij_java_variable_annotation_wrap = off
+ij_java_visibility = public
+ij_java_while_brace_force = never
+ij_java_while_on_new_line = false
+ij_java_wrap_comments = false
+ij_java_wrap_first_method_in_call_chain = false
+ij_java_wrap_long_lines = false
+
+[.editorconfig]
+ij_editorconfig_align_group_field_declarations = false
+ij_editorconfig_space_after_colon = false
+ij_editorconfig_space_after_comma = true
+ij_editorconfig_space_before_colon = false
+ij_editorconfig_space_before_comma = false
+ij_editorconfig_spaces_around_assignment_operators = true
+
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
+ij_continuation_indent_size = 4
+ij_xml_align_attributes = false
+ij_xml_align_text = false
+ij_xml_attribute_wrap = normal
+ij_xml_block_comment_add_space = false
+ij_xml_block_comment_at_first_column = true
+ij_xml_keep_blank_lines = 2
+ij_xml_keep_indents_on_empty_lines = false
+ij_xml_keep_line_breaks = false
+ij_xml_keep_line_breaks_in_text = true
+ij_xml_keep_whitespaces = false
+ij_xml_keep_whitespaces_around_cdata = preserve
+ij_xml_keep_whitespaces_inside_cdata = false
+ij_xml_line_comment_at_first_column = true
+ij_xml_space_after_tag_name = false
+ij_xml_space_around_equals_in_attribute = false
+ij_xml_space_inside_empty_tag = true
+ij_xml_text_wrap = normal
+ij_xml_use_custom_settings = true
+
+[{*.gant,*.groovy,*.gy}]
+ij_groovy_align_group_field_declarations = false
+ij_groovy_align_multiline_array_initializer_expression = false
+ij_groovy_align_multiline_assignment = false
+ij_groovy_align_multiline_binary_operation = false
+ij_groovy_align_multiline_chained_methods = false
+ij_groovy_align_multiline_extends_list = false
+ij_groovy_align_multiline_for = true
+ij_groovy_align_multiline_list_or_map = true
+ij_groovy_align_multiline_method_parentheses = false
+ij_groovy_align_multiline_parameters = true
+ij_groovy_align_multiline_parameters_in_calls = false
+ij_groovy_align_multiline_resources = true
+ij_groovy_align_multiline_ternary_operation = false
+ij_groovy_align_multiline_throws_list = false
+ij_groovy_align_named_args_in_map = true
+ij_groovy_align_throws_keyword = false
+ij_groovy_array_initializer_new_line_after_left_brace = false
+ij_groovy_array_initializer_right_brace_on_new_line = false
+ij_groovy_array_initializer_wrap = off
+ij_groovy_assert_statement_wrap = off
+ij_groovy_assignment_wrap = off
+ij_groovy_binary_operation_wrap = off
+ij_groovy_blank_lines_after_class_header = 0
+ij_groovy_blank_lines_after_imports = 1
+ij_groovy_blank_lines_after_package = 1
+ij_groovy_blank_lines_around_class = 1
+ij_groovy_blank_lines_around_field = 0
+ij_groovy_blank_lines_around_field_in_interface = 0
+ij_groovy_blank_lines_around_method = 1
+ij_groovy_blank_lines_around_method_in_interface = 1
+ij_groovy_blank_lines_before_imports = 1
+ij_groovy_blank_lines_before_method_body = 0
+ij_groovy_blank_lines_before_package = 0
+ij_groovy_block_brace_style = end_of_line
+ij_groovy_block_comment_add_space = false
+ij_groovy_block_comment_at_first_column = true
+ij_groovy_call_parameters_new_line_after_left_paren = false
+ij_groovy_call_parameters_right_paren_on_new_line = false
+ij_groovy_call_parameters_wrap = off
+ij_groovy_catch_on_new_line = false
+ij_groovy_class_annotation_wrap = split_into_lines
+ij_groovy_class_brace_style = end_of_line
+ij_groovy_class_count_to_use_import_on_demand = 5
+ij_groovy_do_while_brace_force = never
+ij_groovy_else_on_new_line = false
+ij_groovy_enable_groovydoc_formatting = true
+ij_groovy_enum_constants_wrap = off
+ij_groovy_extends_keyword_wrap = off
+ij_groovy_extends_list_wrap = off
+ij_groovy_field_annotation_wrap = split_into_lines
+ij_groovy_finally_on_new_line = false
+ij_groovy_for_brace_force = never
+ij_groovy_for_statement_new_line_after_left_paren = false
+ij_groovy_for_statement_right_paren_on_new_line = false
+ij_groovy_for_statement_wrap = off
+ij_groovy_if_brace_force = never
+ij_groovy_import_annotation_wrap = 2
+ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
+ij_groovy_indent_case_from_switch = true
+ij_groovy_indent_label_blocks = true
+ij_groovy_insert_inner_class_imports = false
+ij_groovy_keep_blank_lines_before_right_brace = 2
+ij_groovy_keep_blank_lines_in_code = 2
+ij_groovy_keep_blank_lines_in_declarations = 2
+ij_groovy_keep_control_statement_in_one_line = true
+ij_groovy_keep_first_column_comment = true
+ij_groovy_keep_indents_on_empty_lines = false
+ij_groovy_keep_line_breaks = true
+ij_groovy_keep_multiple_expressions_in_one_line = false
+ij_groovy_keep_simple_blocks_in_one_line = false
+ij_groovy_keep_simple_classes_in_one_line = true
+ij_groovy_keep_simple_lambdas_in_one_line = true
+ij_groovy_keep_simple_methods_in_one_line = true
+ij_groovy_label_indent_absolute = false
+ij_groovy_label_indent_size = 0
+ij_groovy_lambda_brace_style = end_of_line
+ij_groovy_layout_static_imports_separately = true
+ij_groovy_line_comment_add_space = false
+ij_groovy_line_comment_add_space_on_reformat = false
+ij_groovy_line_comment_at_first_column = true
+ij_groovy_method_annotation_wrap = split_into_lines
+ij_groovy_method_brace_style = end_of_line
+ij_groovy_method_call_chain_wrap = off
+ij_groovy_method_parameters_new_line_after_left_paren = false
+ij_groovy_method_parameters_right_paren_on_new_line = false
+ij_groovy_method_parameters_wrap = off
+ij_groovy_modifier_list_wrap = false
+ij_groovy_names_count_to_use_import_on_demand = 3
+ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
+ij_groovy_parameter_annotation_wrap = off
+ij_groovy_parentheses_expression_new_line_after_left_paren = false
+ij_groovy_parentheses_expression_right_paren_on_new_line = false
+ij_groovy_prefer_parameters_wrap = false
+ij_groovy_resource_list_new_line_after_left_paren = false
+ij_groovy_resource_list_right_paren_on_new_line = false
+ij_groovy_resource_list_wrap = off
+ij_groovy_space_after_assert_separator = true
+ij_groovy_space_after_colon = true
+ij_groovy_space_after_comma = true
+ij_groovy_space_after_comma_in_type_arguments = true
+ij_groovy_space_after_for_semicolon = true
+ij_groovy_space_after_quest = true
+ij_groovy_space_after_type_cast = true
+ij_groovy_space_before_annotation_parameter_list = false
+ij_groovy_space_before_array_initializer_left_brace = false
+ij_groovy_space_before_assert_separator = false
+ij_groovy_space_before_catch_keyword = true
+ij_groovy_space_before_catch_left_brace = true
+ij_groovy_space_before_catch_parentheses = true
+ij_groovy_space_before_class_left_brace = true
+ij_groovy_space_before_closure_left_brace = true
+ij_groovy_space_before_colon = true
+ij_groovy_space_before_comma = false
+ij_groovy_space_before_do_left_brace = true
+ij_groovy_space_before_else_keyword = true
+ij_groovy_space_before_else_left_brace = true
+ij_groovy_space_before_finally_keyword = true
+ij_groovy_space_before_finally_left_brace = true
+ij_groovy_space_before_for_left_brace = true
+ij_groovy_space_before_for_parentheses = true
+ij_groovy_space_before_for_semicolon = false
+ij_groovy_space_before_if_left_brace = true
+ij_groovy_space_before_if_parentheses = true
+ij_groovy_space_before_method_call_parentheses = false
+ij_groovy_space_before_method_left_brace = true
+ij_groovy_space_before_method_parentheses = false
+ij_groovy_space_before_quest = true
+ij_groovy_space_before_record_parentheses = false
+ij_groovy_space_before_switch_left_brace = true
+ij_groovy_space_before_switch_parentheses = true
+ij_groovy_space_before_synchronized_left_brace = true
+ij_groovy_space_before_synchronized_parentheses = true
+ij_groovy_space_before_try_left_brace = true
+ij_groovy_space_before_try_parentheses = true
+ij_groovy_space_before_while_keyword = true
+ij_groovy_space_before_while_left_brace = true
+ij_groovy_space_before_while_parentheses = true
+ij_groovy_space_in_named_argument = true
+ij_groovy_space_in_named_argument_before_colon = false
+ij_groovy_space_within_empty_array_initializer_braces = false
+ij_groovy_space_within_empty_method_call_parentheses = false
+ij_groovy_spaces_around_additive_operators = true
+ij_groovy_spaces_around_assignment_operators = true
+ij_groovy_spaces_around_bitwise_operators = true
+ij_groovy_spaces_around_equality_operators = true
+ij_groovy_spaces_around_lambda_arrow = true
+ij_groovy_spaces_around_logical_operators = true
+ij_groovy_spaces_around_multiplicative_operators = true
+ij_groovy_spaces_around_regex_operators = true
+ij_groovy_spaces_around_relational_operators = true
+ij_groovy_spaces_around_shift_operators = true
+ij_groovy_spaces_within_annotation_parentheses = false
+ij_groovy_spaces_within_array_initializer_braces = false
+ij_groovy_spaces_within_braces = true
+ij_groovy_spaces_within_brackets = false
+ij_groovy_spaces_within_cast_parentheses = false
+ij_groovy_spaces_within_catch_parentheses = false
+ij_groovy_spaces_within_for_parentheses = false
+ij_groovy_spaces_within_gstring_injection_braces = false
+ij_groovy_spaces_within_if_parentheses = false
+ij_groovy_spaces_within_list_or_map = false
+ij_groovy_spaces_within_method_call_parentheses = false
+ij_groovy_spaces_within_method_parentheses = false
+ij_groovy_spaces_within_parentheses = false
+ij_groovy_spaces_within_switch_parentheses = false
+ij_groovy_spaces_within_synchronized_parentheses = false
+ij_groovy_spaces_within_try_parentheses = false
+ij_groovy_spaces_within_tuple_expression = false
+ij_groovy_spaces_within_while_parentheses = false
+ij_groovy_special_else_if_treatment = true
+ij_groovy_ternary_operation_wrap = off
+ij_groovy_throws_keyword_wrap = off
+ij_groovy_throws_list_wrap = off
+ij_groovy_use_flying_geese_braces = false
+ij_groovy_use_fq_class_names = false
+ij_groovy_use_fq_class_names_in_javadoc = true
+ij_groovy_use_relative_indents = false
+ij_groovy_use_single_class_imports = true
+ij_groovy_variable_annotation_wrap = off
+ij_groovy_while_brace_force = never
+ij_groovy_while_on_new_line = false
+ij_groovy_wrap_chain_calls_after_dot = false
+ij_groovy_wrap_long_lines = false
+
+[{*.kt,*.kts,*.main.kts}]
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = false
+ij_kotlin_allow_trailing_comma_on_call_site = false
+ij_kotlin_assignment_wrap = normal
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_add_space = false
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = true
+ij_kotlin_call_parameters_wrap = on_every_item
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_continuation_indent_for_chained_calls = false
+ij_kotlin_continuation_indent_for_expression_bodies = false
+ij_kotlin_continuation_indent_in_argument_lists = false
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = true
+ij_kotlin_import_nested_classes = false
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_add_space_on_reformat = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_method_parameters_wrap = on_every_item
+ij_kotlin_name_count_to_use_star_import = 5
+ij_kotlin_name_count_to_use_star_import_for_members = 3
+ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**,io.ktor.**
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_use_custom_formatting_for_modifiers = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false

.gitlab-ci.yml

@@ -38,7 +38,6 @@ send_sonar_report:
   dependencies: []    #禁止传递来的artifact
   script:
     - group=`echo $CI_PROJECT_PATH | sed 's#/#-#g'`
-    - docker login -u "${HARBOR_REGISTRY_USERNAME}" -p "${HARBOR_REGISTRY_PASSWORD}" "${HARBOR_REGISTRY}"
     - docker run -e PROJECTKEY=$group -e EMAIL=$GITLAB_USER_EMAIL --name send-email --rm hub.shanqu.cc/platform/send-sonar-report:latest
   only:
     - dev

.gitmodules

@@ -5,3 +5,6 @@
 [submodule "assistant_flutter"]
 	path = assistant_flutter
 	url = git@git.shanqu.cc:halo/android/flutter-module.git
+[submodule "vspace-bridge"]
+	path = vspace-bridge
+	url = git@git.shanqu.cc:cwzs/android/vspace-bridge.git

app/build.gradle

@@ -47,12 +47,10 @@ android {
         multiDexEnabled true
 
         ndk {
-            // 如果不添加 `arm64` 调用系统的 PackageManager 的方法读取安装包信息的时候会出现 native 层闪退，草
-            // 添加了 `arm64` 以后部分 5.0 的设备会报用错 so 的问题，
-            // couldn't find DSO to load: libimagepipeline.so caused by: dlopen failed: "/data/data/com.gh.gamecenter/lib-main/libimagepipeline.so" is 64-bit instead of 32-bit result: 0
-            // 以 OPPO R7PLUS 为例，明明设备是骁龙 615，ARMv8-64 bit 的设备却不支持 arm64 的 abi，限制了只使用 java 后还是报错，只有 5.0，5.1 设备无法复现 : (
-            // 惊了
-            abiFilters "armeabi-v7a", "arm64-v8a", "x86"
+            // x86 本来是为了模拟器用户使用 RenderScript 用的，但是其实用到 RenderScript 的人本来就不多 (一天不到 100)，用模拟器的人就更少了
+            // 加了 x86 反而会导致用户没法使用微博登录，因为微博没有提供 x86 的 SO ...
+            // 还会增大 APK 体积，所以还是去掉吧。数据可见 https://sentry.shanqu.cc/organizations/lightgame/issues/144232/?project=22
+            abiFilters "armeabi-v7a", "arm64-v8a"
         }
 
         renderscriptTargetApi 18
@@ -74,6 +72,7 @@ android {
          */
         buildConfigField "String", "API_HOST", "\"${API_HOST}\""
         buildConfigField "String", "NEW_API_HOST", "\"${NEW_API_HOST}\""
+        buildConfigField "String", "VAPI_HOST", "\"${VAPI_HOST}\""
         buildConfigField "String", "WECHAT_APPID", "\"${WECHAT_APPID}\""
         buildConfigField "String", "WECHAT_SECRET", "\"${WECHAT_SECRET}\""
         buildConfigField "String", "TENCENT_APPID", "\"${TENCENT_APPID}\""
@@ -157,14 +156,16 @@ android {
 
             buildConfigField "String", "DEV_API_HOST", "\"${DEV_API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_DEV_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${DEV_VAPI_HOST}\""
         }
 
-        // publish release host˛
+        // publish release host
         publish {
             dimension "env"
 
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
         }
 
         tea {
@@ -172,6 +173,7 @@ android {
 
             buildConfigField "String", "DEV_API_HOST", "\"${API_HOST}\""
             buildConfigField "String", "NEW_DEV_API_HOST", "\"${NEW_API_HOST}\""
+            buildConfigField "String", "DEV_VAPI_HOST", "\"${VAPI_HOST}\""
 
             manifestPlaceholders.put("APPLOG_SCHEME", "rangersapplog.byAx6uYt".toLowerCase())
         }
@@ -197,6 +199,7 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
+    debugImplementation "com.squareup.leakcanary:leakcanary-android-process:${leakcanary}"
 
 //    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
     debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
@@ -220,8 +223,6 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
 
-    implementation "com.google.android:flexbox:${flexbox}"
-
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "com.contrarywind:Android-PickerView:${pickerView}"
@@ -238,12 +239,10 @@ dependencies {
     })
     implementation "com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-exo_player2:$gsyVideo"
 
-    implementation "androidx.work:work-runtime:${workManager}"
+//    implementation "androidx.work:work-runtime:${workManager}"
 
     implementation "com.llew.huawei:verifier:${verifier}"
 
-    implementation "com.lg:skeleton:${skeleton}"
-
     teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
 
     implementation "net.lingala.zip4j:zip4j:${zip4j}"
@@ -255,8 +254,6 @@ dependencies {
 
     implementation "io.github.florent37:shapeofview:${shapeOfView}"
 
-    implementation "io.github.sinaweibosdk:core:${weiboSDK}"
-
     implementation "com.lg:apksig:${apksig}"
 
     implementation "com.lg:gid:${gid}"
@@ -264,7 +261,15 @@ dependencies {
     compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
     kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
-    implementation(project(':module_common')) {
+    implementation project(':vspace-bridge:vspace')
+
+    implementation (project(':module_common')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
+    implementation(project(':module_login')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
+    implementation(project(':module_energy')) {
         exclude group: 'androidx.swiperefreshlayout'
     }
 }
@@ -382,7 +387,7 @@ andResGuard {
             "R.drawable.ic_recommend_function",
             "R.drawable.ic_recommend_gift",
             "R.drawable.ic_recommend_role",
-            "R.drawable.login_btn_bg",
+            "R.drawable.download_button_normal_style",
             "R.drawable.ic_quick_login_check",
             "R.drawable.ic_quick_login_uncheck",
             "R.anim.anim_auth_in",
@@ -397,6 +402,9 @@ andResGuard {
             "R.id.bottomShareTv",
             "R.id.recommendStarPref",
             "R.id.recommendStar",
+            "R.id.iv_vmode_badge",
+            "R.id.tv_vmode",
+            "R.id.iv_vmode",
             "R.drawable.help_search_delete",
             "R.drawable.suggest_type_normal",
             "R.drawable.suggest_type_crash",

app/proguard-rules.txt

@@ -39,6 +39,9 @@
 -keepclassmembers interface com.j256.* { *; }
 -dontwarn com.j256.**
 
+# 避免 gson 找不到 enum
+-keepclassmembers enum * { *; }
+
 ### AutoScrollViewPager
 -keep class cn.trinea.android.* { *; }
 -keepclassmembers class cn.trinea.android.* { *; }
@@ -70,8 +73,12 @@
 -keep class com.gh.gamecenter.entity.* {*;}
 -keep class com.gh.gamecenter.common.entity.* {*;}
 -keep class com.gh.gamecenter.qa.entity.* {*;}
+-keep class com.gh.gamecenter.login.entity.* {*;}
+-keep class com.gh.gamecenter.energy.entity.* {*;}
 -keep class com.gh.gamecenter.retrofit.* {*;}
 -keep class com.gh.gamecenter.eventbus.* {*;}
+-keep class com.gh.gamecenter.common.eventbus.* {*;}
+-keep class com.gh.gamecenter.energy.eventbus.* {*;}
 -keep class com.gh.gamecenter.video.detail.* {*;}
 -keep class com.gh.gamecenter.home.gamecollection.* {*;}
 

app/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.gh.gamecenter">
 
+    <queries>
+        <package android:name="com.gh.gamecenter" />
+    </queries>
     <!-- 允许应用程序访问网络连接 -->
     <uses-permission android:name="android.permission.INTERNET" />
     <!-- 允许应用程序写入外部存储，如SD卡上写文件 -->
@@ -13,10 +16,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <!-- 允许应用程序获取网络信息状态 -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <!-- 允许应用程序读取电话状态 -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <!-- 允许应用程序获取当前或最近运行的应用 -->
-    <uses-permission android:name="android.permission.GET_TASKS" />
     <!-- 允许访问振动设备 -->
     <uses-permission android:name="android.permission.VIBRATE" />
     <!-- 允许应用程序改变Wi-Fi连接状态 -->
@@ -25,6 +24,9 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <!-- 允许应用程序快捷方式 -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <!-- 应用安装相关 -->
+    <uses-permission android:name="com.android.permission.GET_INSTALLED_APPS" />
+
     <!-- 前台服务权限-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
@@ -56,6 +58,14 @@
         android:name="android.permission.READ_CONTACTS"
         tools:node="remove" />
 
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        tools:node="remove" />
+
+    <uses-permission
+        android:name="android.permission.GET_TASKS"
+        tools:node="remove" />
+
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
@@ -70,7 +80,6 @@
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:networkSecurityConfig="@xml/network_security_config"
         android:resizeableActivity="true"
         android:theme="@style/AppCompatTheme.APP"
         tools:replace="android:name,android:allowBackup"
@@ -257,11 +266,6 @@
             android:name=".category.CategoryListActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.gh.gamecenter.LoginActivity"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-
         <activity
             android:name="com.gh.gamecenter.UserInfoActivity"
             android:screenOrientation="portrait" />
@@ -570,15 +574,6 @@
             android:name=".forum.search.ForumOrUserSearchActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".energy.EnergyCenterActivity"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".energy.EnergyHouseActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".personal.NewPersonalActivity"
             android:screenOrientation="portrait" />
@@ -651,14 +646,6 @@
             android:name=".gamecollection.detail.GameCollectionPosterActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Dialog" />
-
-
         <activity
             android:name=".home.skip.PackageSkipActivity"
             android:screenOrientation="portrait" />
@@ -732,6 +719,14 @@
             android:name="com.gh.gamecenter.toolbox.ToolBoxBlockActivity"
             android:screenOrientation="portrait" />
 
+        <activity android:name="com.gh.vspace.VDownloadManagerActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
+        <activity android:name="com.gh.vspace.VSpaceLoadingActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
             android:screenOrientation="portrait" />
@@ -741,11 +736,16 @@
             android:screenOrientation="portrait" />
 
         <activity
-            android:name="${applicationId}.wxapi.WXEntryActivity"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar"></activity>
+            android:name="com.gh.gamecenter.mypost.MyPostActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".VerifyPhoneActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".BbsCertificationActivity"
+            android:screenOrientation="portrait" />
 
         <!--        <activity-->
         <!--            android:name="${applicationId}.douyinapi.DouYinEntryActivity"-->
@@ -769,17 +769,17 @@
             android:enabled="true"
             android:exported="true"/>
 
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
-            <!-- If you are using androidx.startup to initialize other components -->
-            <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
-                android:value="androidx.startup"
-                tools:node="remove" />
-        </provider>
+<!--        <provider-->
+<!--            android:name="androidx.startup.InitializationProvider"-->
+<!--            android:authorities="${applicationId}.androidx-startup"-->
+<!--            android:exported="false"-->
+<!--            tools:node="merge">-->
+<!--            &lt;!&ndash; If you are using androidx.startup to initialize other components &ndash;&gt;-->
+<!--            <meta-data-->
+<!--                android:name="androidx.work.WorkManagerInitializer"-->
+<!--                android:value="androidx.startup"-->
+<!--                tools:node="remove" />-->
+<!--        </provider>-->
 
         <receiver
             android:name="com.gh.gamecenter.receiver.DownloadReceiver"

app/src/main/assets/lottie/switch_turnoff_dark.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-关闭","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[87,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[31,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[33,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[6.5,6.5]},{"t":18,"s":[4.5,4.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,4]},{"t":18,"s":[1.5,6]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":20,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.156862750649,0.533333361149,0.878431379795,1]},{"t":18,"s":[1,1,1,1]}],"ix":4},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[8]}],"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnoff_light.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-关闭","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[87,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[31,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[33,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[6.5,6.5]},{"t":18,"s":[4.5,4.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,4]},{"t":18,"s":[1.5,6]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":5,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.141176477075,0.588235318661,1,1]},{"t":18,"s":[0.933333337307,0.933333337307,0.933333337307,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnon.json

@@ -1 +0,0 @@
-{"v":"5.6.9","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-打开","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[33,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[89,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[87,33,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[4.5,4.5]},{"t":18,"s":[6.5,6.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.966666666667,0.966666666667,0.966666666667,0.420000005762],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,6]},{"t":18,"s":[1.5,4]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":5,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"sy":[{"c":{"a":0,"k":[0,0,0,1],"ix":2},"o":{"a":0,"k":5,"ix":3},"a":{"a":0,"k":120,"ix":5},"s":{"a":0,"k":1,"ix":8},"d":{"a":0,"k":0,"ix":6},"ch":{"a":0,"k":100,"ix":7},"bm":{"a":0,"k":5,"ix":1},"no":{"a":0,"k":0,"ix":9},"ty":2,"nm":"内阴影"}],"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.933332979679,0.933332979679,0.933332979679,1]},{"t":18,"s":[0.141176477075,0.588235318661,1,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnon_dark.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-打开","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[33,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[89,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[87,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[4.5,4.5]},{"t":18,"s":[6.5,6.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,6]},{"t":18,"s":[1.5,4]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":20,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[1,1,1,1]},{"t":18,"s":[0.156862750649,0.533333361149,0.878431379795,1]}],"ix":4},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[8]},{"t":18,"s":[100]}],"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/assets/lottie/switch_turnon_light.json

@@ -0,0 +1 @@
+{"v":"5.9.1","fr":60,"ip":0,"op":36,"w":120,"h":66,"nm":"开关动画-打开","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"按钮手柄","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.667,"y":0},"t":0,"s":[33,33,0],"to":[7.682,0,0],"ti":[-13.443,0,0]},{"i":{"x":0.333,"y":1},"o":{"x":0.333,"y":0},"t":18,"s":[89,33,0],"to":[2.306,0,0],"ti":[-1.318,0,0]},{"t":24,"s":[87,33,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"指示器-on","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0]},{"t":18,"s":[100]}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[33,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[4.5,4.5]},{"t":18,"s":[6.5,6.5]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"椭圆路径 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":40,"ix":4},"w":{"a":0,"k":1.5,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"描边 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"椭圆形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"指示器-off","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[87,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.667,0.667],"y":[0,0]},"t":0,"s":[1.5,6]},{"t":18,"s":[1.5,4]}],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0.75,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":5,"ix":5},"r":1,"bm":0,"nm":"填充 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":90,"ix":6},"o":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[100]},{"t":18,"s":[0]}],"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"按钮背景","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[60,33,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[40,22],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":12,"ix":4},"nm":"矩形路径 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.667],"y":[0]},"t":0,"s":[0.933332979679,0.933332979679,0.933332979679,1]},{"t":18,"s":[0.141176477075,0.588235318661,1,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"filling","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0.118,0.006],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[300,300],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"变换"}],"nm":"矩形","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":37,"st":0,"bm":0}],"markers":[]}

app/src/main/java/com/gh/base/BaseRichEditorActivity.kt

@@ -210,7 +210,7 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mViewModel.setUploadVideoListener(this)
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
-        mRichEditor.enableForceDark(NightModeUtils.isNightMode(this))
+        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
         mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
@@ -743,10 +743,10 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
 
     override fun isAutoResetViewBackgroundEnabled(): Boolean =true
 
-    override fun onNightModeChange() {
-        super.onNightModeChange()
-        updateStatusBarColor(R.color.black, R.color.white)
-        mRichEditor.enableForceDark(NightModeUtils.isNightMode(this))
+    override fun onDarkModeChanged() {
+        super.onDarkModeChanged()
+        updateStatusBarColor(R.color.background_white, R.color.background_white)
+        mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this))
     }
 
     companion object {

app/src/main/java/com/gh/base/DarkModeSwitchHelper.kt

@@ -0,0 +1,86 @@
+package com.gh.base
+
+import android.view.Gravity
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.DarkModeUtils
+import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.common.utils.dip2px
+import com.lzf.easyfloat.EasyFloat
+import com.lzf.easyfloat.enums.ShowPattern
+import com.lzf.easyfloat.enums.SidePattern
+
+object DarkModeSwitchHelper {
+
+    fun showDarkModeSwitchFloatingView(activity: AppCompatActivity) {
+        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            EasyFloat.with(activity)
+                .setLayout(R.layout.layout_day_mode_night_mode_switch)
+                .setTag("night_mode_switch_floating_view")
+                .setAnimator(null)
+                .setGravity(Gravity.TOP.xor(Gravity.END), 0, 114F.dip2px())
+                .setSidePattern(SidePattern.RESULT_SIDE)
+                .setDragEnable(true)
+                .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
+                .registerCallback {
+                    createResult { _, _, view ->
+                        view?.setOnClickListener {
+                            showDarkModeSwitchDialog(activity)
+                        }
+                    }
+                }
+                .show()
+        }
+    }
+
+    fun dismissDarkModeSwitchFloatingView() {
+        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            EasyFloat.dismiss("night_mode_switch_floating_view")
+        }
+    }
+
+    private fun showDarkModeSwitchDialog(activity: AppCompatActivity) {
+        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
+            //切换深色模式
+            var mode = "普通模式"
+            var positive = "跟随系统模式"
+            var negative = "深色模式"
+            if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
+                mode = "跟随系统模式"
+                positive = "普通模式"
+                negative = "深色模式"
+            } else if (DarkModeUtils.isAppDarkModeEnabledFromSp()) {
+                mode = "深色模式"
+                positive = "跟随系统模式"
+                negative = "普通模式"
+            }
+            DialogHelper.showDialog(
+                context = activity,
+                title = "选择模式",
+                content = "当前为 $mode",
+                confirmText = positive,
+                cancelText = negative,
+                confirmClickCallback = {
+                    if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
+                        DarkModeUtils.updateAppDarkModeStatusToSp(false)
+                        DarkModeUtils.updateFollowSystemDarkModeToSp(false)
+                    } else {
+                        DarkModeUtils.updateFollowSystemDarkModeToSp(true)
+                    }
+                    DarkModeUtils.initDarkMode()
+                },
+                cancelClickCallback = {
+                    if (DarkModeUtils.isFollowSystemDarkModeFromSp()) {
+                        DarkModeUtils.updateAppDarkModeStatusToSp(true)
+                    } else {
+                        DarkModeUtils.updateAppDarkModeStatusToSp(!DarkModeUtils.isAppDarkModeEnabledFromSp())
+                    }
+                    DarkModeUtils.updateFollowSystemDarkModeToSp(false)
+                    DarkModeUtils.initDarkMode()
+                },
+                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+            )
+        }
+    }
+}

app/src/main/java/com/gh/base/DownloadToolbarActivity.kt

@@ -6,7 +6,6 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.R
@@ -72,7 +71,7 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
     }
 
     private fun updateDownloadCountHint(updateList: List<GameUpdateEntity>?) {
-        if (mDownloadCountHint == null || updateList.isNullOrEmpty()) return
+        if (mDownloadCountHint == null) return
         val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList)
         if (count != null) {
             mDownloadCountHint!!.visibility = View.VISIBLE
@@ -102,12 +101,10 @@ abstract class DownloadToolbarActivity : ToolBarActivity() {
         }
     }
 
-    override fun onNightModeChange() {
-        super.onNightModeChange()
+    override fun onDarkModeChanged() {
+        super.onDarkModeChanged()
         if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) {
-            (getMenuItem(R.id.menu_download).actionView.findViewById(R.id.menu_download_iv) as ImageView).setImageDrawable(
-                ContextCompat.getDrawable(this, R.drawable.toolbar_download)
-            )
+            (getMenuItem(R.id.menu_download).actionView.findViewById(R.id.menu_download_iv) as ImageView).setImageResource(R.drawable.toolbar_download)
         }
     }
 }

app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt

@@ -9,12 +9,13 @@ import com.gh.download.DownloadManager
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.SplashScreenActivity
 import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.energy.EnergyCenterActivity
+import com.gh.gamecenter.energy.view.EnergyCenterActivity
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.forum.list.ForumListActivity
 import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
+import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 
 // TODO：移动到对应的模块
@@ -57,7 +58,11 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            NightModeSwitchHelper.showNightModeSwitchFloatingView(activity)
+            DarkModeSwitchHelper.showDarkModeSwitchFloatingView(activity)
+        }
+
+        if (activity is AppCompatActivity && activity !is SplashScreenActivity) {
+            VHelper.showFeedbackDialogIfLastSuccessfulLaunchedGameExitUnexpectedly(activity)
         }
     }
 
@@ -73,7 +78,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     override fun onActivityPaused(activity: Activity) {
         FloatingBackViewManager.dismissBackView()
         if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            NightModeSwitchHelper.dismissNightModeSwitchFloatingView()
+            DarkModeSwitchHelper.dismissDarkModeSwitchFloatingView()
         }
     }
 

app/src/main/java/com/gh/base/NightModeSwitchHelper.kt

@@ -1,109 +0,0 @@
-package com.gh.base
-
-import android.os.Build
-import android.view.Gravity
-import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.NightModeUtils
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.common.utils.dip2px
-import com.lzf.easyfloat.EasyFloat
-import com.lzf.easyfloat.enums.ShowPattern
-import com.lzf.easyfloat.enums.SidePattern
-import com.squareup.picasso.Picasso
-
-object NightModeSwitchHelper {
-
-    fun showNightModeSwitchFloatingView(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.with(activity)
-                .setLayout(R.layout.layout_day_mode_night_mode_switch)
-                .setTag("night_mode_switch_floating_view")
-                .setAnimator(null)
-                .setGravity(Gravity.TOP.xor(Gravity.END), 0, 114F.dip2px())
-                .setSidePattern(SidePattern.RESULT_SIDE)
-                .setDragEnable(true)
-                .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
-                .registerCallback {
-                    createResult { _, _, view ->
-                        val url = "https://ps.w.org/dark-mode-for-wp-dashboard/assets/icon-128x128.png"
-                        view?.findViewById<ImageView>(R.id.iconIv)?.let {
-                            Picasso.with(activity).load(url).into(it)
-                        }
-                        view?.setOnClickListener {
-                            showNightModeSwitchDialog(activity)
-                        }
-                    }
-                }
-                .show()
-        }
-    }
-
-    fun dismissNightModeSwitchFloatingView() {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.dismiss("night_mode_switch_floating_view")
-        }
-    }
-
-    private fun showNightModeSwitchDialog(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            //切换深色模式
-            var mode = "普通模式"
-            var positive = "跟随系统模式"
-            var negative ="深色模式"
-            if (NightModeUtils.getSystemMode()) {
-                mode = "跟随系统模式"
-                positive = "普通模式"
-                negative = "深色模式"
-            } else if (NightModeUtils.getNightMode()) {
-                mode = "深色模式"
-                positive = "跟随系统模式"
-                negative = "普通模式"
-            }
-            DialogHelper.showDialog(
-                context = activity,
-                title = "选择模式",
-                content = "当前为 $mode",
-                confirmText = positive,
-                cancelText = negative,
-                confirmClickCallback = {
-                    if (NightModeUtils.getSystemMode()) {
-                        NightModeUtils.setNightMode(false)
-                        NightModeUtils.setSystemMode(false)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_NO
-                        }
-                    } else {
-                        NightModeUtils.setSystemMode(true)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode =
-                                AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-                        }
-                    }
-                    NightModeUtils.initNightMode()
-                },
-                cancelClickCallback = {
-                    if (NightModeUtils.getSystemMode()) {
-                        NightModeUtils.setNightMode(true)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
-                        }
-                    } else {
-                        val nightMode = NightModeUtils.getNightMode()
-                        NightModeUtils.setNightMode(!NightModeUtils.getNightMode())
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode =
-                                if (nightMode) AppCompatDelegate.MODE_NIGHT_NO else AppCompatDelegate.MODE_NIGHT_YES
-                        }
-                    }
-                    NightModeUtils.setSystemMode(false)
-                    NightModeUtils.initNightMode()
-                },
-                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-            )
-        }
-    }
-}

app/src/main/java/com/gh/common/DefaultJsApi.kt

@@ -25,16 +25,20 @@ import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.energy.EnergyCenterActivity
-import com.gh.gamecenter.energy.EnergyHouseActivity
-import com.gh.gamecenter.entity.Badge
+import com.gh.gamecenter.energy.utils.EnergyTaskHelper
+import com.gh.gamecenter.energy.view.EnergyCenterActivity
+import com.gh.gamecenter.energy.view.EnergyHouseActivity
 import com.gh.gamecenter.entity.MtaEvent
 import com.gh.gamecenter.help.QaFeedbackDialogFragment
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.entity.Badge
+import com.gh.gamecenter.login.user.LoginTag
+import com.gh.gamecenter.login.view.LoginActivity
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
 import com.gh.gamecenter.security.BindPhoneActivity
-import com.gh.gamecenter.user.LoginTag
-import com.gh.gamecenter.user.UserRepository
+import com.gh.gamecenter.login.user.UserRepository
+import com.gh.gamecenter.login.utils.LoginHelper
+import com.gh.gamecenter.login.utils.QuickLoginHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import org.json.JSONObject

app/src/main/java/com/gh/common/DefaultUrlHandler.kt

@@ -21,6 +21,8 @@ import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.entity.CommunityEntity
+import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.core.AppExecutor
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.EnvHelper
@@ -502,6 +504,13 @@ object DefaultUrlHandler {
 
     @JvmStatic
     fun transformNormalScheme(context: Context, url: String, entrance: String): Boolean {
+        val b = transformNewNormalScheme(context, url, entrance)
+        if (b) return b
+        return transformOldNormalScheme(context, url, entrance)
+    }
+
+    @JvmStatic
+    fun transformOldNormalScheme(context: Context, url: String, entrance: String): Boolean {
         val uri = Uri.parse(url)
         if (uri.host == "www.ghzs666.com"
             || uri.host == "www.ghzs.com"
@@ -513,8 +522,7 @@ object DefaultUrlHandler {
             uri.path?.apply {
                 when {
                     contains("game") -> {
-                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last()
-                        ?: ""
+                        val gameId = uri.getQueryParameter("gameId") ?: uri.pathSegments.last() ?: ""
                         DirectUtils.directToGameDetail(context, gameId, entrance, autoDownload = false, traceEvent = null)
                     }
                     contains("question") -> {
@@ -580,6 +588,55 @@ object DefaultUrlHandler {
         return false
     }
 
+    @JvmStatic
+    fun transformNewNormalScheme(context: Context, url: String, entrance: String): Boolean {
+        val uri = Uri.parse(url)
+        if (uri.host == "www.ghzs666.com"
+            || uri.host == "www.ghzs.com"
+            || uri.host == "ask.ghzs.com"
+            || uri.host == "m.ghzs.com"
+            || uri.host == "m.ghzs666.com"
+            || uri.host == "dev-bbs-mobile.ghzs.com"
+        ) {
+            Utils.log(uri.path)
+            uri.path?.apply {
+                val splits = split("/")
+                when {
+                    //https://m.ghzs666.com/bbs/thread-帖子ID
+                    splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("thread-") -> {
+                        val articleId = splits[2].substring(7)
+                        DirectUtils.directToCommunityArticle(
+                            context, articleId, "",
+                            entrance, "文章链接"
+                        )
+                    }
+                    //https://m.ghzs666.com/article/文章ID
+                    splits.size >= 3 && splits[1] == "article" -> {
+                        val articleId = splits[2]
+                        DirectUtils.directToArticle(context, articleId, entrance)
+                    }
+                    //https://m.ghzs666.com/column/专题ID
+                    splits.size >= 3 && splits[1] == "column" -> {
+                        val columnId = splits[2]
+                        DirectUtils.directToSubject(context, columnId, "", entrance)
+                    }
+                    //https://m.ghzs666.com/zone/游戏ID
+                    splits.size >= 3 && splits[1] == "zone" -> {
+                        DirectUtils.directToWebView(context, url, entrance)
+                    }
+                    //https://m.ghzs666.com/bbs/video-视频ID
+                    splits.size >= 3 && splits[1] == "bbs" && splits[2].startsWith("video-") -> {
+                        val videoId = splits[2].substring(6)
+                        DirectUtils.directToVideoDetail(context, videoId, entrance)
+                    }
+                    else -> return false
+                }
+            }
+            return true
+        }
+        return false
+    }
+
     /**
      * 将 url 转换为 LinkEntity (实际只有 type 和 link 两个字段，仅供日志，不保证能用)
      */

app/src/main/java/com/gh/common/FixedRateJobHelper.kt

@@ -9,6 +9,7 @@ import com.gh.common.videolog.VideoRecordUtils
 import com.gh.download.DownloadDataHelper
 import com.gh.gamecenter.entity.TimeEntity
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.core.runOnUiThread
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
@@ -47,7 +48,9 @@ object FixedRateJobHelper {
 
                 // 提交曝光数据
                 if ((mExecuteCount * CHECKER_PERIOD) % EXPOSURE_PERIOD == 0L) {
-                    ExposureManager.commitSavedExposureEvents(true)
+                    runOnUiThread {
+                        ExposureManager.commitSavedExposureEvents(true)
+                    }
                 }
 
                 // 分片检测下载进度
@@ -60,7 +63,9 @@ object FixedRateJobHelper {
 
                 // 提交普通 loghub 数据
                 if ((mExecuteCount * CHECKER_PERIOD) % LOGHUB_PERIOD == 0L) {
-                    LoghubUtils.commitSavedLoghubEvents()
+                    runOnUiThread {
+                        LoghubUtils.commitSavedLoghubEvents(true)
+                    }
                 }
 
                 // 更新游戏屏蔽信息

app/src/main/java/com/gh/common/chain/BrowserInstallHandler.kt

@@ -0,0 +1,21 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.download.server.BrowserInstallHelper
+import com.gh.gamecenter.core.utils.EmptyCallback
+import com.gh.gamecenter.entity.GameEntity
+
+class BrowserInstallHandler:ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        BrowserInstallHelper.showBrowserInstallHintDialog(context, gameEntity.isVGame(), object : EmptyCallback {
+            override fun onCallback() {
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
+                }
+            }
+        })
+    }
+}

app/src/main/java/com/gh/common/chain/CertificationHandler.kt

@@ -0,0 +1,18 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.common.dialog.CertificationDialog
+import com.gh.gamecenter.entity.GameEntity
+
+class CertificationHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        CertificationDialog.showCertificationDialog(context, gameEntity) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/common/chain/ChainBuilder.kt

@@ -0,0 +1,28 @@
+package com.gh.common.chain
+
+class ChainBuilder {
+
+    private val handlers: MutableList<ChainHandler> = ArrayList()
+
+    private var processEndCallback: ((Any?) -> Unit)? = null
+
+    fun setProcessEndCallback(callback: (Any?) -> Unit): ChainBuilder {
+        processEndCallback = callback
+        return this
+    }
+
+    fun addHandler(handler: ChainHandler): ChainBuilder {
+        handlers.add(handler)
+        return this
+    }
+
+    fun buildHandlerChain(): ChainHandler? {
+        for (i in handlers.indices) {
+            handlers[i].processEndCallback = processEndCallback
+            if (i + 1 < handlers.size) {
+                handlers[i].setNext(handlers[i + 1])
+            }
+        }
+        return if (handlers.isEmpty()) null else handlers[0]
+    }
+}

app/src/main/java/com/gh/common/chain/ChainHandler.kt

@@ -0,0 +1,24 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.gamecenter.entity.GameEntity
+
+abstract class ChainHandler {
+    private var next: ChainHandler? = null
+    var processEndCallback: ((Any?) -> Unit)? = null
+
+    fun setNext(next: ChainHandler?) {
+        this.next = next
+    }
+
+    fun getNext(): ChainHandler? {
+        return next
+    }
+
+    fun hasNext(): Boolean {
+        return next != null
+    }
+
+    abstract fun handleRequest(context: Context, gameEntity: GameEntity)
+
+}

app/src/main/java/com/gh/common/chain/CheckDownloadHandler.kt

@@ -0,0 +1,21 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.utils.safelyGetInRelease
+import com.gh.gamecenter.entity.GameEntity
+
+class CheckDownloadHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
+        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(isSubscribe)
+            }
+        }
+
+    }
+}

app/src/main/java/com/gh/common/chain/CheckStoragePermissionHandler.kt

@@ -0,0 +1,21 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.gamecenter.common.utils.PermissionHelper
+import com.gh.gamecenter.core.utils.EmptyCallback
+import com.gh.gamecenter.entity.GameEntity
+
+class CheckStoragePermissionHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
+            override fun onCallback() {
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
+                }
+            }
+        })
+    }
+}

app/src/main/java/com/gh/common/chain/DownloadDialogHelperHandler.kt

@@ -0,0 +1,23 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.common.util.DownloadDialogHelper
+import com.gh.gamecenter.common.utils.safelyGetInRelease
+import com.gh.gamecenter.core.utils.EmptyCallback
+import com.gh.gamecenter.entity.GameEntity
+
+class DownloadDialogHelperHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
+        DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
+            override fun onCallback() {
+                if (hasNext()) {
+                    getNext()?.handleRequest(context, gameEntity)
+                } else {
+                    processEndCallback?.invoke(null)
+                }
+            }
+        })
+    }
+}

app/src/main/java/com/gh/common/chain/GamePermissionHandler.kt

@@ -0,0 +1,19 @@
+package com.gh.common.chain
+
+import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
+
+class GamePermissionHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/common/chain/OverseaDownloadHandler.kt

@@ -0,0 +1,18 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.entity.GameEntity
+
+class OverseaDownloadHandler:ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        DialogUtils.showOverseaDownloadDialog(context, gameEntity) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/common/chain/PackageCheckHandler.kt

@@ -0,0 +1,19 @@
+package com.gh.common.chain
+
+import android.content.Context
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.common.dialog.PackageCheckDialogFragment
+import com.gh.gamecenter.entity.GameEntity
+
+class PackageCheckHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        PackageCheckDialogFragment.show((context as AppCompatActivity), gameEntity) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/common/chain/ValidateVSpaceHandler.kt

@@ -0,0 +1,18 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.vspace.VHelper
+
+class ValidateVSpaceHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        VHelper.validateVSpaceBeforeAction(context, gameEntity, true) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/common/chain/VersionNumberHandler.kt

@@ -0,0 +1,18 @@
+package com.gh.common.chain
+
+import android.content.Context
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.entity.GameEntity
+
+class VersionNumberHandler : ChainHandler() {
+
+    override fun handleRequest(context: Context, gameEntity: GameEntity) {
+        DialogUtils.showVersionNumberDialog(context, gameEntity) {
+            if (hasNext()) {
+                getNext()?.handleRequest(context, gameEntity)
+            } else {
+                processEndCallback?.invoke(null)
+            }
+        }
+    }
+}

app/src/main/java/com/gh/common/constant/Config.java

@@ -8,6 +8,7 @@ import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
 
+import com.gh.gamecenter.common.utils.DarkModeUtils;
 import com.gh.gamecenter.common.utils.EnvHelper;
 import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.core.utils.GsonUtils;
@@ -20,10 +21,12 @@ import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
-import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.common.eventbus.EBReuse;
+import com.gh.gamecenter.entity.VSetting;
 import com.gh.gamecenter.common.retrofit.BiResponse;
 import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
+import com.gh.vspace.VHelper;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
@@ -44,6 +47,7 @@ public class Config {
     // 这个 API_HOST 在测试包里会随着选择的环境切换，正式包里会一直保持正式 host
     public static final String API_HOST = EnvHelper.getHost();
     public static final String NEW_API_HOST = EnvHelper.getNewHost();
+    public static final String VAPI_HOST = EnvHelper.getVHost();
 
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
@@ -59,6 +63,9 @@ public class Config {
 
     private static SettingsEntity mSettingsEntity;
     private static NewSettingsEntity mNewSettingsEntity;
+
+    private static NewSettingsEntity.NightMode mNightModeSetting;
+    private static VSetting mVSetting;
     private static GameGuidePopupEntity mGameGuidePopupEntity;
     private static SharedPreferences mDefaultSharedPreferences;
 
@@ -87,7 +94,6 @@ public class Config {
     }
 
 
-
     public static boolean isShowDownload(String gameId) {
 
         if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true;
@@ -112,6 +118,17 @@ public class Config {
         return false;
     }
 
+    /**
+     * 是否启用畅玩游戏
+     */
+    public static boolean isVGameEnabled() {
+        if (getSettings() == null) {
+            return false;
+        }
+
+        return !"off".equals(getSettings().getGameSmooth());
+    }
+
 
     public static boolean isShowPlugin(String gameId) {
         SharedPreferences preferences = getPreferences();
@@ -177,11 +194,15 @@ public class Config {
         getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply();
         mSettingsEntity = settingsEntity;
 
-        // 更新 FIX_ARTICLE_KEY 状态
+        // 更新设置状态
         mSettingsEntity.showArticleEntrance();
+        mSettingsEntity.showCommunityEntrance();
 
         // 加载完设置后刷新下
         PackageHelper.initList();
+
+        // 初始化畅玩相关的东西
+        VHelper.init(HaloApp.getInstance());
     }
 
     @Nullable
@@ -199,6 +220,17 @@ public class Config {
         return mSettingsEntity;
     }
 
+    @Nullable
+    public static NewSettingsEntity.NightMode getNightModeSetting() {
+        if (mNightModeSetting != null) {
+            return mNightModeSetting;
+        } else if (mNewSettingsEntity != null && mNewSettingsEntity.getNightMode() != null) {
+            return mNewSettingsEntity.getNightMode();
+        } else {
+            return null;
+        }
+    }
+
     @Nullable
     public static NewSettingsEntity getNewSettingsEntity() {
         if (mNewSettingsEntity == null) {
@@ -214,6 +246,21 @@ public class Config {
         return mNewSettingsEntity;
     }
 
+    @Nullable
+    public static VSetting getVSettingEntity() {
+        if (mVSetting == null) {
+            try {
+                String json = SPUtils.getString(Constants.SP_V_SETTINGS);
+                if (!TextUtils.isEmpty(json)) {
+                    mVSetting = GsonUtils.fromJson(json, VSetting.class);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return mVSetting;
+    }
+
     @Nullable
     public static GameGuidePopupEntity getGameGuidePopupEntity() {
         return mGameGuidePopupEntity;
@@ -242,7 +289,7 @@ public class Config {
 
     public static SharedPreferences getPreferences() {
         if (mDefaultSharedPreferences == null) {
-            mDefaultSharedPreferences =  PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
+            mDefaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
         }
 
         return mDefaultSharedPreferences;
@@ -303,10 +350,49 @@ public class Config {
                     @Override
                     public void onSuccess(NewSettingsEntity data) {
                         mNewSettingsEntity = data;
+                        if (mNightModeSetting != null) {
+                            mNewSettingsEntity.setNightMode(mNightModeSetting);
+                        }
                         SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
                     }
                 });
 
+        if (mVSetting == null) {
+            RetrofitManager.getInstance()
+                    .getVApi().getSettings(BuildConfig.VERSION_NAME)
+                    .subscribeOn(Schedulers.io())
+                    .subscribe(new BiResponse<VSetting>() {
+                        @Override
+                        public void onSuccess(VSetting data) {
+                            mVSetting = data;
+                            SPUtils.setString(Constants.SP_V_SETTINGS, GsonUtils.toJson(data));
+                        }
+                    });
+        }
+
+        if (mNightModeSetting == null) {
+            RetrofitManager.getInstance()
+                    .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(new BiResponse<NewSettingsEntity>() {
+                        @Override
+                        public void onSuccess(NewSettingsEntity data) {
+                            mNightModeSetting = data.getNightMode();
+                            if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) {
+                                DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true);
+                                DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true);
+                                DarkModeUtils.INSTANCE.initDarkMode();
+                            }
+
+                            if (mNewSettingsEntity != null) {
+                                mNewSettingsEntity.setNightMode(mNightModeSetting);
+                                SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data));
+                            }
+                        }
+                    });
+        }
+
         RetrofitManager.getInstance()
                 .getApi().getGameGuidePopup(Build.MANUFACTURER, Build.VERSION.RELEASE, Build.MODEL, channel, BuildConfig.VERSION_NAME)
                 .subscribeOn(Schedulers.io())

app/src/main/java/com/gh/common/databind/BindingAdapters.java

@@ -19,55 +19,65 @@ import androidx.core.content.ContextCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.gamecenter.common.callback.OnViewClickListener;
+import com.gh.common.chain.BrowserInstallHandler;
+import com.gh.common.chain.CertificationHandler;
+import com.gh.common.chain.ChainBuilder;
+import com.gh.common.chain.ChainHandler;
+import com.gh.common.chain.CheckDownloadHandler;
+import com.gh.common.chain.DownloadDialogHelperHandler;
+import com.gh.common.chain.GamePermissionHandler;
+import com.gh.common.chain.OverseaDownloadHandler;
+import com.gh.common.chain.PackageCheckHandler;
+import com.gh.common.chain.ValidateVSpaceHandler;
+import com.gh.common.chain.VersionNumberHandler;
 import com.gh.common.constant.Config;
-import com.gh.common.dialog.CertificationDialog;
-import com.gh.common.dialog.PackageCheckDialogFragment;
 import com.gh.common.exposure.ExposureEvent;
+import com.gh.common.filter.RegionSetting;
+import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.history.HistoryHelper;
 import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorDownloadManager;
 import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.common.util.CheckLoginUtils;
-import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.common.util.DownloadDialogHelper;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
-import com.gh.gamecenter.common.utils.ImageUtils;
 import com.gh.common.util.LogUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.common.util.NewsUtils;
-import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
-import com.gh.common.util.RealNameHelper;
 import com.gh.common.util.ReservationHelper;
-import com.gh.common.view.DownloadProgressBar;
-import com.gh.gamecenter.common.view.DrawableView;
+import com.gh.common.view.DownloadButton;
 import com.gh.common.view.GameIconView;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
-import com.gh.download.server.BrowserInstallHelper;
 import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
-import com.gh.gamecenter.baselist.LoadStatus;
+import com.gh.gamecenter.common.baselist.LoadStatus;
+import com.gh.gamecenter.common.callback.OnViewClickListener;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.gamecenter.common.utils.DarkModeUtils;
+import com.gh.gamecenter.common.view.DrawableView;
+import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
-import com.gh.gamecenter.entity.LinkEntity;
+import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.entity.ServerCalendarEntity;
 import com.gh.gamecenter.entity.TagStyleEntity;
 import com.gh.gamecenter.entity.TestEntity;
-import com.gh.gamecenter.eventbus.EBReuse;
+import com.gh.gamecenter.common.eventbus.EBReuse;
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment;
 import com.gh.gamecenter.manager.PackagesManager;
 import com.gh.gamecenter.qa.entity.CommunityVideoEntity;
+import com.gh.vspace.VDownloadManagerActivity;
+import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
@@ -331,7 +341,7 @@ public class BindingAdapters {
     }
 
     // 大图下的进度条
-    public static void setDownloadButton(DownloadProgressBar progressBar,
+    public static void setDownloadButton(DownloadButton progressBar,
                                          GameEntity gameEntity,
                                          ExposureEvent traceEvent,
                                          @Nullable View.OnClickListener clickCallBack,
@@ -354,62 +364,77 @@ public class BindingAdapters {
         // 点击事件
         progressBar.setOnClickListener(v -> {
             if (clickCallBack != null) clickCallBack.onClick(v);
-            switch (progressBar.getDownloadType()) {
+            switch (progressBar.getButtonStyle()) {
                 case DOWNLOADING_PLUGIN:
                 case DOWNLOADING_NORMAL:
-                    Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
-                            gameEntity.getApk().get(0).getUrl(), entrance);
-                    v.getContext().startActivity(intent);
+                    if (gameEntity.isVGame()) {
+                        v.getContext().startActivity(VDownloadManagerActivity.getIntent(v.getContext(), true));
+                    } else {
+                        Intent intent = DownloadManagerActivity.getDownloadMangerIntent(v.getContext(),
+                                gameEntity.getApk().get(0).getUrl(), entrance);
+                        v.getContext().startActivity(intent);
+                    }
                     break;
                 case NONE:
                     Utils.toast(v.getContext(), "该游戏已关闭下载");
                     break;
                 case NORMAL:
                 case PLUGIN:
-                    if (gameEntity.getApk().size() == 1) {
-                        ApkEntity apk = gameEntity.getApk().get(0);
-                        DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.getUrl());
-                        if (gameEntity.getSimulator() != null) {
-                            boolean isInstalled = PackageUtils.isInstalledFromAllPackage(v.getContext(), gameEntity.getSimulator().getApk().getPackageName());
-                            if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
-                                SimulatorDownloadManager.getInstance().showDownloadDialog(v.getContext(), gameEntity.getSimulator(),
-                                        SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), null);
-                                return;
+                    final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.getId());
+                    if (gameH5Download != null) {
+                        DialogUtils.showGameH5DownloadDialog(v.getContext(), gameEntity, gameH5Download);
+                    } else {
+                        if (gameEntity.getApk().size() == 1) {
+                            ApkEntity apk = gameEntity.getApk().get(0);
+                            DownloadEntity downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.getUrl());
+                            if (gameEntity.getSimulator() != null) {
+                                boolean isInstalled = PackageUtils.isInstalledFromAllPackage(v.getContext(), gameEntity.getSimulator().getApk().getPackageName());
+                                if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled) {
+                                    SimulatorDownloadManager.getInstance().showDownloadDialog(v.getContext(), gameEntity.getSimulator(),
+                                            SimulatorDownloadManager.SimulatorLocation.LAUNCH, gameEntity.getId(), gameEntity.getName(), null);
+                                    return;
+                                }
+                            }
+
+                            ChainBuilder builder = new ChainBuilder();
+                            builder.addHandler(new ValidateVSpaceHandler());
+                            builder.addHandler(new GamePermissionHandler());
+                            builder.addHandler(new BrowserInstallHandler());
+                            builder.addHandler(new PackageCheckHandler());
+                            builder.addHandler(new DownloadDialogHelperHandler());
+                            builder.addHandler(new CertificationHandler());
+                            builder.addHandler(new VersionNumberHandler());
+                            builder.addHandler(new OverseaDownloadHandler());
+                            builder.addHandler(new CheckDownloadHandler());
+
+                            builder.setProcessEndCallback(o -> {
+                                download(progressBar, gameEntity, traceEvent, (boolean) o, entrance, location);
+                                return null;
+                            });
+                            final ChainHandler chainHandler = builder.buildHandlerChain();
+                            if (chainHandler != null) {
+                                chainHandler.handleRequest(v.getContext(), gameEntity);
+                            }
+                        } else {
+                            ChainBuilder builder = new ChainBuilder();
+                            builder.addHandler(new GamePermissionHandler());
+                            builder.addHandler(new CertificationHandler());
+                            builder.addHandler(new VersionNumberHandler());
+
+                            builder.setProcessEndCallback(o -> {
+                                DownloadDialog.showDownloadDialog(
+                                        v.getContext(),
+                                        gameEntity,
+                                        traceEvent,
+                                        entrance,
+                                        location + ":" + gameEntity.getName());
+                                return null;
+                            });
+                            final ChainHandler chainHandler = builder.buildHandlerChain();
+                            if (chainHandler != null) {
+                                chainHandler.handleRequest(v.getContext(), gameEntity);
                             }
                         }
-                        RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
-                            GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                                BrowserInstallHelper.showBrowserInstallHintDialog(v.getContext(), () -> {
-                                    PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, () -> {
-                                        DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk, () -> {
-                                            CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
-                                                DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
-                                                    DialogUtils.showOverseaDownloadDialog(v.getContext(), gameEntity, () -> {
-                                                        DialogUtils.checkDownload(v.getContext(), apk.getSize(),
-                                                                isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location));
-                                                    });
-                                                });
-                                            });
-                                        });
-                                    });
-                                });
-                            });
-                        });
-                    } else {
-                        RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
-                            GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                                CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> {
-                                    DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> {
-                                        DownloadDialog.showDownloadDialog(
-                                                v.getContext(),
-                                                gameEntity,
-                                                traceEvent,
-                                                entrance,
-                                                location + ":" + gameEntity.getName());
-                                    });
-                                });
-                            });
-                        });
                     }
                     break;
                 case LAUNCH_OR_OPEN:
@@ -428,6 +453,12 @@ public class BindingAdapters {
                             }
                             return;
                         }
+
+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch((AppCompatActivity) v.getContext(), gameEntity.getApk().get(0).getPackageName());
+                            return;
+                        }
+
                         PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
                     } else {
                         DownloadDialog.showDownloadDialog(
@@ -441,20 +472,25 @@ public class BindingAdapters {
                 case INSTALL_PLUGIN:
                 case INSTALL_NORMAL:
                     if (gameEntity.getApk().size() == 1) {
-                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl());
+                        DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+                        String packageName = gameEntity.getApk().get(0).getPackageName();
+
+                        if (gameEntity.isVGame()) {
+                            VHelper.installOrLaunch(v.getContext(), packageName);
+                            return;
+                        }
+
                         if (downloadEntity != null) {
                             PackageInstaller.install(v.getContext(), downloadEntity);
                         }
                     }
                     break;
                 case RESERVABLE:
-                    RealNameHelper.checkIfAuth(v.getContext(), gameEntity, () -> {
-                        GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
-                            CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
-                                ReservationHelper.reserve(v.getContext(), gameEntity.getId(), () -> {
-                                    LogUtils.logReservation(gameEntity, traceEvent);
-                                    updateReservation(progressBar, gameEntity);
-                                });
+                    GamePermissionDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity, gameEntity.getInfo(), () -> {
+                        CheckLoginUtils.checkLogin(progressBar.getContext(), "", () -> {
+                            ReservationHelper.reserve(v.getContext(), gameEntity.getId(), () -> {
+                                LogUtils.logReservation(gameEntity, traceEvent);
+                                updateReservation(progressBar, gameEntity);
                             });
                         });
                     });
@@ -498,10 +534,10 @@ public class BindingAdapters {
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
             }
             return;
         }
@@ -516,17 +552,17 @@ public class BindingAdapters {
                 } else {
                     progressBar.setText("查看");
                 }
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
                 if (offStatus != null && "dialog".equals(offStatus)) {
                     progressBar.setText("查看");
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 } else if ("updating".equals(offStatus)) {
                     progressBar.setText("更新中");
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.UPDATING);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
                 } else {
                     progressBar.setText("暂无");
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 }
             }
 
@@ -534,14 +570,14 @@ public class BindingAdapters {
             String status = GameUtils.getDownloadBtnText(progressBar.getContext(), gameEntity, PluginLocation.only_game);
             switch (status) {
                 case "插件化":
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
                     break;
                 case "打开":
                 case "启动":
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     break;
                 default:
-                    progressBar.setDownloadType(DownloadProgressBar.DownloadType.NORMAL);
+                    progressBar.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
                     break;
             }
             progressBar.setText(status);
@@ -549,7 +585,7 @@ public class BindingAdapters {
 
         // 显示下载过程状态
         if (gameEntity.getApk().size() == 1) {
-            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk().get(0).getUrl());
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
             if (downloadEntity != null) {
                 progressBar.setProgress((int) (downloadEntity.getPercent() * 10));
                 switch (downloadEntity.getStatus()) {
@@ -560,18 +596,18 @@ public class BindingAdapters {
                     case waiting:
                         progressBar.setText(R.string.downloading);
                         if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                         } else {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                         }
                         break;
                     case done:
                         progressBar.setText(R.string.install);
                         if (downloadEntity.isPluggable()
                                 && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
                         } else {
-                            progressBar.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
+                            progressBar.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                         }
                         break;
                     case cancel:
@@ -580,6 +616,7 @@ public class BindingAdapters {
                     case uncertificated:
                     case unqualified:
                     case unavailable:
+                    case banned:
                         break;
                     default:
                         break;
@@ -592,9 +629,9 @@ public class BindingAdapters {
      * 当页面完全重建时，若存在重建的DialogFragment，则需要手动恢复该DialogFragment之前配置的回调(因为DialogFragment重建时只会从arguments中获取之前的配置内容，
      * 而arguments无法传递回调)，或者dismiss该DialogFragment
      */
-    private static void restoreDialogFragment(DownloadProgressBar progressBar) {
+    private static void restoreDialogFragment(DownloadButton progressBar) {
         GamePermissionDialogFragment gamePermissionDialogFragment =
-                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getSimpleName()));
+                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getName()));
         if (gamePermissionDialogFragment != null) {
             gamePermissionDialogFragment.dismissAllowingStateLoss();
         }
@@ -618,28 +655,28 @@ public class BindingAdapters {
     }*/
 
 
-    private static void updateReservation(DownloadProgressBar progressBar, GameEntity gameEntity) {
+    private static void updateReservation(DownloadButton progressBar, GameEntity gameEntity) {
         // 显示预约
         if (gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.getId())) {
                 progressBar.setText("预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
             } else {
                 progressBar.setText("已预约");
-                progressBar.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+                progressBar.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
             }
         }
     }
 
 
     // 开始下载
-    private static void download(DownloadProgressBar progressBar,
+    private static void download(DownloadButton progressBar,
                                  GameEntity gameEntity,
                                  ExposureEvent traceEvent,
                                  boolean isSubscribe,
                                  String entrance,
                                  String location) {
-        String str = progressBar.getText();
+        String str = progressBar.getText().toString();
         String method;
         if (str.contains("更新")) {
             method = "更新";
@@ -661,8 +698,8 @@ public class BindingAdapters {
                     traceEvent);
 
             progressBar.setProgress(0);
-            progressBar.setDownloadType("插件化".equals(method) ?
-                    DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN : DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
+            progressBar.setButtonStyle("插件化".equals(method) ?
+                    DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN : DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
         } else {
             Utils.toast(progressBar.getContext(), msg);
         }
@@ -693,15 +730,16 @@ public class BindingAdapters {
                     tagStyle.add(typeTag);
                 } else {
                     TagStyleEntity typeTag = new TagStyleEntity();
+                    boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext());
                     typeTag.setName(test.getType() != null ? test.getType() : "");
-                    typeTag.setBackground("FFF3E0");
-                    typeTag.setColor("FA8500");
+                    typeTag.setBackground("1AFFA142");
+                    typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142");
                     tagStyle.add(typeTag);
 
                     TagStyleEntity timeTag = new TagStyleEntity();
                     timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                    timeTag.setBackground("E0FFF9");
-                    timeTag.setColor("00A887");
+                    timeTag.setBackground("1A06CEA8");
+                    timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8");
                     tagStyle.add(timeTag);
                 }
             } else {
@@ -774,7 +812,7 @@ public class BindingAdapters {
     public static void setCommunityVideoDuration(TextView mVideoDuration, List<CommunityVideoEntity> videos) {
         if (videos != null && videos.size() > 0) {
             CommunityVideoEntity videoEntity = videos.get(0);
-            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_80, 999F));
+            mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F));
             mVideoDuration.setText(videoEntity.getDuration());
             mVideoDuration.setVisibility(View.VISIBLE);
         } else {

app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt

@@ -6,13 +6,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.common.view.CustomLinkMovementMethod
-import com.gh.gamecenter.R
+import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.DialogApplyModeratorBinding
 
 
@@ -45,7 +45,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
         val startText = "版主考核群："
         val text = "$startText$mGroupNumber\n感谢你对论坛建设的支持\n请加入版主考核群并联系群主进行版主资格考核"
         binding.desTv.text = SpanBuilder(text)
-            .click(startText.length, startText.length + mGroupNumber.length, R.color.theme_font,true) {
+            .click(requireContext(), startText.length, startText.length + mGroupNumber.length, R.color.theme_font,true) {
                 DirectUtils.directToQqGroup(
                     requireContext(),
                     mGroupKey
@@ -87,7 +87,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 }
             }.show(
                 activity.supportFragmentManager,
-                ApplyModeratorDialogFragment::class.java.simpleName
+                ApplyModeratorDialogFragment::class.java.name
             )
         }
     }

app/src/main/java/com/gh/common/dialog/CertificationDialog.kt

@@ -27,7 +27,7 @@ import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.AuthDialogEntity
 import com.gh.gamecenter.entity.AuthDialogLevel
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.user.UserManager
 import com.google.gson.reflect.TypeToken
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.lightgame.utils.AppManager

app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt

@@ -8,7 +8,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Message
-import android.preference.PreferenceManager
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -53,8 +52,7 @@ class DeviceRemindDialog(context: Context, val entity: DeviceDialogEntity, val g
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
             if (downloadEntity.status == DownloadStatus.done && downloadEntity.name == gameEntity.name) {
-                val sp = PreferenceManager.getDefaultSharedPreferences(getContext())
-                val autoInstall = sp.getBoolean(AUTO_INSTALL_SP_KEY, true)
+                val autoInstall = SPUtils.getBoolean(AUTO_INSTALL_SP_KEY, true)
                 if (autoInstall) {
                     dismiss()
                 }

app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt

@@ -57,7 +57,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
                         if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px()
                     }
                     siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F)
-                    siteTv.setTextColor(R.color.theme_font.toColor())
+                    siteTv.setTextColor(R.color.theme_font.toColor(requireContext()))
                     siteTv.text = site.text
                     siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG
                     siteTv.setOnClickListener {

app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt

@@ -114,7 +114,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     return
                 }
             }
-            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.simpleName) as? InstallPermissionDialogFragment
+            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment
             if (installPermissionDialogFragment != null) {
                 installPermissionDialogFragment.mCallBack = callBack
                 installPermissionDialogFragment.isXapk = isXapk
@@ -128,7 +128,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.isXapk = isXapk
                     this.url = downloadEntity.url
                 }
-                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.simpleName)
+                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.name)
             }
         }
     }

app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt

@@ -0,0 +1,166 @@
+package com.gh.common.dialog
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.TextPaint
+import android.text.style.ClickableSpan
+import android.view.*
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.FragmentActivity
+import androidx.fragment.app.FragmentTransaction
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.R
+import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.gamecenter.databinding.DialogPrivacyProtocolNewBinding
+import com.gh.gamecenter.entity.DialogEntity
+import splitties.bundle.put
+
+class NewPrivacyPolicyDialogFragment: BaseDialogFragment() {
+
+    private var mCallBack: ((isSuccess: Boolean) -> Unit)? = null
+    private val mBinding by lazy { DialogPrivacyProtocolNewBinding.inflate(layoutInflater) }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return mBinding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        updateView()
+    }
+
+    private fun updateView() {
+        val contentText = SpannableStringBuilder("1.您可以通过《光环助手隐私政策》以及《儿童隐私保护声明》，了解我们如何收集、使用、存储、保护、对外提供您的个人信息以及您享有的权利\n" +
+                "2.您可以通过《接入第三方SDK目录》了解本产品接入的第三方SDK的具体信息\n" +
+                "3.您可以通过《应用权限列表》了解权限申请与使用情况说明\n" +
+                "4.如果您是14周岁以下的未成年人，您需要和您监护人一起仔细阅读《儿童隐私保护声明》，并在征得您监护人同意后，使用我们的产品、服务或向我们提供信息")
+
+        val privacyPolicyText = "《光环助手隐私政策》"
+        val childrenPrivacyPolicyText = "《儿童隐私保护声明》"
+        val thirdPartySdkText = "《接入第三方SDK目录》"
+        val permissionListText = "《应用权限列表》"
+
+        val hypertextList = arrayListOf(
+            privacyPolicyText,
+            childrenPrivacyPolicyText,
+            thirdPartySdkText,
+            permissionListText
+        )
+
+        val positionListPairList = arrayListOf<Pair<Int, Int>>()
+
+        for (hypertext in hypertextList) {
+            var start = 0
+            var index = 0
+            while (index != -1) {
+                index = contentText.indexOf(hypertext, start)
+                start = index + hypertext.length
+                if (index != -1) {
+                    positionListPairList.add(Pair(index, start))
+                }
+            }
+        }
+
+        for (hypertextPositionPair in positionListPairList) {
+            contentText.setSpan(object : ClickableSpan() {
+                override fun updateDrawState(ds: TextPaint) {
+                    super.updateDrawState(ds)
+                    ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font)
+                    ds.isUnderlineText = false
+                }
+
+                override fun onClick(widget: View) {
+                    val privacyPolicyUrl = requireContext().getString(R.string.privacy_policy_url)
+                    val childrenPrivacyPolicyUrl = requireContext().getString(R.string.children_policy_url)
+                    val thirdPartySdkUrl = requireContext().getString(R.string.sdk_list_url)
+                    val permissionListUrl = requireContext().getString(R.string.permission_and_usage_url)
+
+                    val selectedUrl = when (contentText.substring(hypertextPositionPair.first, hypertextPositionPair.second)) {
+                        privacyPolicyText -> privacyPolicyUrl
+                        childrenPrivacyPolicyText -> childrenPrivacyPolicyUrl
+                        thirdPartySdkText -> thirdPartySdkUrl
+                        permissionListText -> permissionListUrl
+                        else -> ""
+                    }
+
+                    DirectUtils.directToExternalBrowser(requireContext(), selectedUrl)
+                }
+            }, hypertextPositionPair.first, hypertextPositionPair.second, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+
+        mBinding.contentTv.movementMethod = CustomLinkMovementMethod.getInstance()
+        mBinding.contentTv.text = contentText
+
+        mBinding.refuseTv.setOnClickListener {
+            mCallBack?.invoke(false)
+            dismissAllowingStateLoss()
+        }
+        mBinding.agreeTv.setOnClickListener {
+            mCallBack?.invoke(true)
+            dismissAllowingStateLoss()
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val createDialog = super.onCreateDialog(savedInstanceState)
+        createDialog.setCanceledOnTouchOutside(false)
+        createDialog.setOnKeyListener(object : DialogInterface.OnKeyListener {
+            override fun onKey(dialog: DialogInterface?, keyCode: Int, event: KeyEvent?): Boolean {
+                if (keyCode == KeyEvent.KEYCODE_BACK) {
+                    return true
+                }
+                return false
+            }
+        })
+
+        val window = createDialog.window
+        window?.setGravity(Gravity.CENTER)
+        return createDialog
+    }
+
+    override fun onStart() {
+        super.onStart()
+        val width = 300F.dip2px()
+        val height = ViewGroup.LayoutParams.WRAP_CONTENT
+        dialog?.window?.setLayout(width, height)
+    }
+
+    companion object {
+        const val KEY_DATA = "data"
+
+        @JvmStatic
+        fun show(activity: FragmentActivity,
+                 privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
+                 callBack: ((isSuccess: Boolean) -> Unit)?) {
+            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(NewPrivacyPolicyDialogFragment::class.java.name) as? NewPrivacyPolicyDialogFragment
+            if (privacyDialogFragment != null) {
+                privacyDialogFragment.mCallBack = callBack
+                val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
+                transaction.show(privacyDialogFragment)
+                transaction.commit()
+            } else {
+                privacyDialogFragment = NewPrivacyPolicyDialogFragment().apply {
+                    mCallBack = callBack
+                }
+            }
+            privacyDialogFragment.arguments = Bundle().apply {
+                put(KEY_DATA, privacyPolicyEntity)
+            }
+            privacyDialogFragment.show(
+                activity.supportFragmentManager,
+                NewPrivacyPolicyDialogFragment::class.java.name
+            )
+        }
+    }
+}

app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt

@@ -15,21 +15,24 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.util.*
+import com.gh.common.util.DirectUtils
 import com.gh.common.util.LogUtils
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
 import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.entity.LinkEntity
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.gamecenter.core.utils.DisplayUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.SpanBuilder
 import com.gh.gamecenter.databinding.FragmentPackageCheckBinding
 import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.entity.DetectionObjectEntity
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.LinkEntity
 import com.gh.gamecenter.entity.PackageDialogEntity
 import com.gh.gamecenter.eventbus.EBPackage
 import com.halo.assistant.HaloApp
@@ -105,8 +108,11 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             val spanBuilder = SpanBuilder(it.linkHintText).build()
             it.links.forEachIndexed { index, link ->
                 val linkSpan = SpanBuilder(link.title ?: "").click(
-                    0, (link.title
-                        ?: "").length, R.color.theme_font, true
+                    requireContext(),
+                    0,
+                    (link.title ?: "").length,
+                    R.color.theme_font,
+                    true
                 ) {
                     LogUtils.uploadPackageCheck("pkg_check_pop_click", "点击链接", gameEntity, link.text, link.title, "", "")
                     DirectUtils.directToLinkPage(requireContext(), link, "包名检测弹窗", "")
@@ -350,12 +356,12 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (!activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) return
 
             var dialogFragment =
-                activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.simpleName) as? PackageCheckDialogFragment
+                activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.name) as? PackageCheckDialogFragment
             if (dialogFragment == null) {
                 dialogFragment = PackageCheckDialogFragment()
                 dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack
-                dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.simpleName)
+                dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.name)
             } else {
                 dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack

app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt

@@ -167,7 +167,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         fun show(activity: FragmentActivity,
                  privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
                  callBack: ((isSuccess: Boolean) -> Unit)?) {
-            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.simpleName) as? PrivacyPolicyDialogFragment
+            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.name) as? PrivacyPolicyDialogFragment
             if (privacyDialogFragment != null) {
                 privacyDialogFragment.mCallBack = callBack
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
@@ -183,7 +183,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
             }
             privacyDialogFragment.show(
                 activity.supportFragmentManager,
-                PrivacyPolicyDialogFragment::class.java.simpleName
+                PrivacyPolicyDialogFragment::class.java.name
             )
         }
     }

app/src/main/java/com/gh/common/exposure/ExposureConverters.kt

@@ -1,62 +0,0 @@
-package com.gh.common.exposure
-
-import androidx.room.TypeConverter
-import com.gh.gamecenter.common.entity.ExposureEntity
-import com.gh.gamecenter.common.exposure.meta.Meta
-import com.gh.gamecenter.core.utils.GsonUtils
-import java.util.*
-import kotlin.collections.ArrayList
-
-class ExposureConverters {
-
-    @TypeConverter
-    fun convertPayload2String(any: ExposureEntity): String {
-        return GsonUtils.toJson(any)
-    }
-
-    @TypeConverter
-    fun convertString2Payload(string: String): ExposureEntity {
-        return GsonUtils.fromJson(string, ExposureEntity::class.java)
-    }
-
-    @TypeConverter
-    fun convertSource2String(sourceList: List<ExposureSource>): String {
-        return GsonUtils.toJson(sourceList)
-    }
-
-    @TypeConverter
-    fun convertString2Source(sourceList: String): List<ExposureSource> {
-        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureSource>::class.java))) as List<ExposureSource>
-    }
-
-    @TypeConverter
-    fun convertETrace2String(sourceList: List<ExposureEvent>?): String {
-        return GsonUtils.toJson(sourceList)
-    }
-
-    @TypeConverter
-    fun convertStringToETrace(sourceList: String): List<ExposureEvent> {
-        return ArrayList(Arrays.asList(GsonUtils.fromJson(sourceList, Array<ExposureEvent>::class.java))) as List<ExposureEvent>
-    }
-
-    @TypeConverter
-    fun convertExposeType2String(exposureType: ExposureType): String {
-        return exposureType.toString()
-    }
-
-    @TypeConverter
-    fun convertStringToExposeType(exposureType: String): ExposureType {
-        return ExposureType.valueOf(exposureType)
-    }
-
-    @TypeConverter
-    fun convertMeta2String(any: Meta): String {
-        return GsonUtils.toJson(any)
-    }
-
-    @TypeConverter
-    fun convertString2Meta(string: String): Meta {
-        return GsonUtils.fromJson(string, Meta::class.java)
-    }
-
-}

app/src/main/java/com/gh/common/exposure/ExposureDatabase.kt

@@ -1,23 +0,0 @@
-package com.gh.common.exposure
-
-import androidx.room.Database
-import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
-import android.content.Context
-
-@TypeConverters(ExposureConverters::class)
-@Database(entities = [ExposureEvent::class], version = 1, exportSchema = false)
-abstract class ExposureDatabase : RoomDatabase() {
-    companion object {
-        private const val DATABASE = "exposure_database"
-
-        fun buildDatabase(context: Context): ExposureDatabase {
-            return Room.databaseBuilder(context, ExposureDatabase::class.java, DATABASE)
-                    .fallbackToDestructiveMigration()
-                    .build()
-        }
-    }
-
-    abstract fun logHubEventDao(): ExposureEventDao
-}

app/src/main/java/com/gh/common/exposure/ExposureEvent.kt

@@ -2,35 +2,135 @@ package com.gh.common.exposure
 
 import android.os.Parcelable
 import androidx.annotation.Keep
-import androidx.room.Entity
 import androidx.room.PrimaryKey
+import com.gh.common.exposure.time.TimeUtil
+import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.gamecenter.common.exposure.meta.Meta
 import com.gh.gamecenter.common.exposure.meta.MetaUtil
-import com.gh.common.exposure.time.TimeUtil
 import com.gh.gamecenter.common.utils.getFirstElementDividedByDivider
-import com.gh.download.server.BrowserInstallHelper
-import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.gamecenter.entity.GameEntity
 import com.lightgame.download.DownloadEntity
+import com.lightgame.utils.Utils
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 import java.util.*
-import kotlin.collections.ArrayList
 
 @Keep
 @Parcelize
-@Entity(tableName = "exposureEvent")
 data class ExposureEvent(
     var payload: ExposureEntity,
-    val source: List<ExposureSource>,
+    var source: List<ExposureSource>,
     var eTrace: List<ExposureEvent>? = arrayListOf(),
-    val event: ExposureType,
+    var event: ExposureType,
     val meta: Meta = MetaUtil.getMeta(),
-    val time: Int = TimeUtil.currentTime(),
+    var time: Int = TimeUtil.currentTime(),
+    var timeInMillisecond: Long = System.currentTimeMillis(),
     @PrimaryKey
-    val id: String = UUID.randomUUID().toString()
+    var id: String = UUID.randomUUID().toString(),
 ) : Parcelable {
+
+    @Transient
+    @IgnoredOnParcel
+    var next: ExposureEvent? = null
+
+    @Transient
+    @IgnoredOnParcel
+    var flags = 0
+
+    private fun initExposureEventData(
+        gameEntity: GameEntity?,
+        source: List<ExposureSource>,
+        eTrace: List<ExposureEvent>? = null,
+        event: ExposureType = ExposureType.EXPOSURE
+    ) {
+        this.payload = ExposureEntity(
+            gameId = gameEntity?.id?.getFirstElementDividedByDivider(DownloadEntity.GAME_ID_DIVIDER),
+            gameName = eTrace?.firstOrNull()?.payload?.gameName
+                ?: gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR),
+            gameVersion = eTrace?.firstOrNull()?.payload?.gameVersion
+                ?: gameEntity?.gameVersion,
+            subjectId = eTrace?.firstOrNull()?.payload?.subjectId
+                ?: gameEntity?.subjectId
+                ?: gameEntity?.subjectData?.id,
+            isMirrorData = eTrace?.firstOrNull()?.payload?.isMirrorData
+                ?: gameEntity?.shouldUseMirrorInfo() ?: false,
+            isWebDownload = BrowserInstallHelper.isUseBrowserToInstallEnabled() && BrowserInstallHelper.shouldUseBrowserToInstall(), // 实时的值，不用从 eTrace 里取
+            sequence = eTrace?.firstOrNull()?.payload?.sequence ?: gameEntity?.sequence,
+            outerSequence = eTrace?.firstOrNull()?.payload?.outerSequence
+                ?: gameEntity?.outerSequence,
+            platform = eTrace?.firstOrNull()?.payload?.platform ?: gameEntity?.platform,
+            downloadType = gameEntity?.downloadType,
+            downloadCompleteType = gameEntity?.downloadCompleteType,
+            displayType = eTrace?.firstOrNull()?.payload?.displayType
+                ?: gameEntity?.displayContent,
+            isPlatformRecommend = gameEntity?.isPlatformRecommend,
+            // ugly
+            welcomeDialogId = gameEntity?.welcomeDialogId
+                ?: eTrace?.firstOrNull()?.payload?.welcomeDialogId,
+            welcomeDialogLinkTitle = gameEntity?.welcomeDialogTitle
+                ?: eTrace?.firstOrNull()?.payload?.welcomeDialogLinkTitle
+        )
+        this.id = UUID.randomUUID().toString()
+        this.timeInMillisecond = System.currentTimeMillis()
+        this.time = TimeUtil.currentTime()
+        this.source = source
+        this.eTrace = eTrace
+        this.event = event
+        this.also {
+            it.payload.categoryId = eTrace?.firstOrNull()?.payload?.categoryId
+            it.payload.categoryV2Id = eTrace?.firstOrNull()?.payload?.categoryV2Id
+            it.payload.testServerId = eTrace?.firstOrNull()?.payload?.testServerId
+            it.payload.blockId = eTrace?.firstOrNull()?.payload?.blockId
+
+            it.payload.setContainerInfo(
+                eTrace?.firstOrNull()?.payload?.containerId ?: gameEntity?.containerId,
+                eTrace?.firstOrNull()?.payload?.containerType ?: gameEntity?.containerType
+            )
+
+            it.payload.sourcePage = eTrace?.firstOrNull()?.payload?.sourcePage
+            it.payload.sourcePageId = eTrace?.firstOrNull()?.payload?.sourcePageId
+            it.payload.sourcePageName = eTrace?.firstOrNull()?.payload?.sourcePageName
+            gameEntity?.exposureEvent = it
+        }
+    }
+
+    fun recycle() {
+        if (inUse()) {
+            Utils.log(
+                EXPOSURE_EVENT_LOG_TAG,
+                "This ExposureEvent $this cannot be recycled because it is still in use."
+            )
+            return
+        }
+        recycleUnchecked()
+    }
+
+    private fun recycleUnchecked() {
+        this.flags = FLAG_IN_USE
+        synchronized(sPoolSync) {
+            if (sPoolSize < EXPOSURE_EVENT_MAX_POOL_SIZE) {
+                next = sPool
+                sPool = this
+                sPoolSize++
+                Utils.log(EXPOSURE_EVENT_LOG_TAG, "This ExposureEvent $this Recycled")
+            }
+        }
+    }
+
+    private fun inUse(): Boolean {
+        return flags == FLAG_IN_USE
+    }
+
     companion object {
+        private val sPoolSync = Any()
+        private var sPool: ExposureEvent? = null
+        private var sPoolSize: Int = 0
+
+        private const val EXPOSURE_EVENT_MAX_POOL_SIZE: Int = 300
+        private const val FLAG_IN_USE = 1
+        private const val EXPOSURE_EVENT_LOG_TAG = "ExposureEvent"
 
         @JvmStatic
         fun createEvent(
@@ -42,54 +142,33 @@ data class ExposureEvent(
             if (gameEntity?.getApk()?.size == 1) {
                 gameEntity.gameVersion = gameEntity.getApk().elementAtOrNull(0)?.version ?: ""
             }
-            return ExposureEvent(
-                payload = ExposureEntity(
-                    gameId = gameEntity?.id?.getFirstElementDividedByDivider(DownloadEntity.GAME_ID_DIVIDER),
-                    gameName = eTrace?.firstOrNull()?.payload?.gameName
-                        ?: gameEntity?.name?.removeSuffix(Constants.GAME_NAME_DECORATOR),
-                    gameVersion = eTrace?.firstOrNull()?.payload?.gameVersion
-                        ?: gameEntity?.gameVersion,
-                    subjectId = eTrace?.firstOrNull()?.payload?.subjectId
-                        ?: gameEntity?.subjectId
-                        ?: gameEntity?.subjectData?.id,
-                    isMirrorData = eTrace?.firstOrNull()?.payload?.isMirrorData
-                        ?: gameEntity?.shouldUseMirrorInfo() ?: false,
-                    isWebDownload = BrowserInstallHelper.isUseBrowserToInstallEnabled() && BrowserInstallHelper.shouldUseBrowserToInstall(), // 实时的值，不用从 eTrace 里取
-                    sequence = eTrace?.firstOrNull()?.payload?.sequence ?: gameEntity?.sequence,
-                    outerSequence = eTrace?.firstOrNull()?.payload?.outerSequence
-                        ?: gameEntity?.outerSequence,
-                    platform = eTrace?.firstOrNull()?.payload?.platform ?: gameEntity?.platform,
-                    downloadType = gameEntity?.downloadType,
-                    downloadCompleteType = gameEntity?.downloadCompleteType,
-                    displayType = eTrace?.firstOrNull()?.payload?.displayType
-                        ?: gameEntity?.displayContent,
-                    isPlatformRecommend = gameEntity?.isPlatformRecommend,
-                    // ugly
-                    welcomeDialogId = gameEntity?.welcomeDialogId
-                        ?: eTrace?.firstOrNull()?.payload?.welcomeDialogId,
-                    welcomeDialogLinkTitle = gameEntity?.welcomeDialogTitle
-                        ?: eTrace?.firstOrNull()?.payload?.welcomeDialogLinkTitle
-                ),
+            synchronized(sPoolSync) {
+                if (sPool != null) {
+                    val exposureEvent = sPool
+                    sPool = exposureEvent?.next
+                    exposureEvent?.next = null
+                    exposureEvent?.flags = 0
+                    sPoolSize--
+                    exposureEvent?.initExposureEventData(gameEntity, source, eTrace, event)
+                    Utils.log(
+                        EXPOSURE_EVENT_LOG_TAG,
+                        "ExposureEvent 对象 $this 正在被循环使用, 当前对象池数量还有 $sPoolSize"
+                    )
+                    return exposureEvent!!
+                }
+            }
+            Utils.log(
+                EXPOSURE_EVENT_LOG_TAG,
+                "new ExposureEvent 对象"
+            )
+            val exposureEvent = ExposureEvent(
+                payload = ExposureEntity(),
                 source = source,
                 eTrace = eTrace,
                 event = event
-            ).also {
-                it.payload.categoryId = eTrace?.firstOrNull()?.payload?.categoryId
-                it.payload.categoryV2Id = eTrace?.firstOrNull()?.payload?.categoryV2Id
-                it.payload.testServerId = eTrace?.firstOrNull()?.payload?.testServerId
-                it.payload.blockId = eTrace?.firstOrNull()?.payload?.blockId
-
-                it.payload.setContainerInfo(
-                    eTrace?.firstOrNull()?.payload?.containerId ?: gameEntity?.containerId,
-                    eTrace?.firstOrNull()?.payload?.containerType ?: gameEntity?.containerType
-                )
-
-                it.payload.sourcePage = eTrace?.firstOrNull()?.payload?.sourcePage
-                it.payload.sourcePageId = eTrace?.firstOrNull()?.payload?.sourcePageId
-                it.payload.sourcePageName = eTrace?.firstOrNull()?.payload?.sourcePageName
-
-                gameEntity?.exposureEvent = it
-            }
+            )
+            exposureEvent.initExposureEventData(gameEntity, source, eTrace, event)
+            return exposureEvent
         }
 
         @JvmStatic

app/src/main/java/com/gh/common/exposure/ExposureEventDao.kt

@@ -1,18 +0,0 @@
-package com.gh.common.exposure
-
-import androidx.room.*
-
-@Dao
-interface ExposureEventDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertMany(eventList: List<ExposureEvent>)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insert(event: ExposureEvent)
-
-    @Query("SELECT * FROM exposureEvent")
-    fun getAll(): List<ExposureEvent>
-
-    @Delete
-    fun deleteMany(eventList: List<ExposureEvent>)
-}

app/src/main/java/com/gh/common/exposure/ExposureManager.kt

@@ -1,14 +1,11 @@
 package com.gh.common.exposure
 
 import com.aliyun.sls.android.producer.Log
-import com.gh.gamecenter.common.loghub.LoghubHelper
-import com.gh.gamecenter.common.utils.toJson
-import com.gh.gamecenter.common.utils.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.loghub.LoghubHelper
 import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
-import com.halo.assistant.HaloApp
+import com.gh.gamecenter.common.utils.toJson
 import com.lightgame.utils.Utils
-import java.util.concurrent.ExecutorService
 
 /**
  * A handful tool for committing logs to aliyun loghub.
@@ -26,40 +23,17 @@ object ExposureManager {
 
     // exposureCache 用来过滤掉具有相同 id 的曝光事件，避免重复发送事件
     private val exposureSet by lazy { hashSetOf<ExposureEvent>() }
-    private var exposureExecutor: ExecutorService? = null
     private val exposureCache by lazy { FixedSizeLinkedHashSet<String>(300) }
-    private val exposureDao by lazy { ExposureDatabase.buildDatabase(HaloApp.getInstance().application).logHubEventDao() }
-
-    @JvmStatic
-    fun init(excutor: ExecutorService) {
-        exposureExecutor = excutor
-        exposureExecutor?.execute {
-            tryWithDefaultCatch {
-                val eventList = exposureDao.getAll()
-                exposureSet.addAll(eventList)
-            }
-        }
-    }
 
     /**
      * Log a single exposure event.
      */
     fun log(event: ExposureEvent) {
-        exposureExecutor?.execute {
-            try {
-                if (!exposureCache.contains(event.id)) {
-                    // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-
-                    exposureSet.add(event)
-                    exposureDao.insert(event)
-                    exposureCache.add(event.id)
-
-                } else {
-                    Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
-                }
-            } catch (e: Exception) {
-                e.printStackTrace()
-            }
+        if (!exposureCache.contains(event.id)) {
+            exposureSet.add(event)
+            exposureCache.add(event.id)
+        } else {
+            Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
         }
     }
 
@@ -67,51 +41,37 @@ object ExposureManager {
      * Log a collection of exposure event.
      */
     fun log(eventList: List<ExposureEvent>) {
-        exposureExecutor?.execute {
-            for (event in eventList) {
-                try {
-                    if (!exposureCache.contains(event.id)) {
-                        // Catch `android.database.sqlite.SQLiteFullException: database or disk is full` exception.
-                        exposureSet.add(event)
-                        exposureDao.insert(event)
-                        exposureCache.add(event.id)
-                    } else {
-                        Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
-                    }
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
+        for (event in eventList) {
+            if (!exposureCache.contains(event.id)) {
+                exposureSet.add(event)
+                exposureCache.add(event.id)
+            } else {
+                Utils.log("Exposure", "遇到重复曝光事件，自动过滤 （${event.id} - ${event.payload.gameName}）")
             }
-            commitSavedExposureEvents()
         }
+        commitSavedExposureEvents()
     }
 
     /**
-     * @param forced Ignore all restrictions.
+     * @param forcedUpload Ignore all restrictions.
      */
-    fun commitSavedExposureEvents(forced: Boolean = false) {
-        exposureExecutor?.execute {
-            tryWithDefaultCatch {
-                // TODO 初始化 loghubHelper 去掉这个 tryCatch 块
-                if (exposureSet.size < STORE_SIZE && !forced || exposureSet.size == 0) return@execute
+    fun commitSavedExposureEvents(forcedUpload: Boolean = false) {
+        if (exposureSet.size < STORE_SIZE && !forcedUpload || exposureSet.size == 0) return
 
-                val exposureList = exposureSet.toList()
-                uploadExposures(exposureList)
+        uploadExposures(exposureSet.toList(), forcedUpload)
 
-                Utils.log("Exposure", "提交了${exposureList.size}条曝光记录")
-                exposureSet.removeAll(exposureList)
-                exposureDao.deleteMany(exposureList)
-            }
-        }
+        Utils.log("Exposure", "提交了${exposureSet.size}条曝光记录")
+        exposureSet.clear()
     }
 
     private fun eliminateMultipleBrackets(jsonWithMultipleBracket: String): String {
         return jsonWithMultipleBracket.replace("[[", "[").replace("]]", "]")
     }
 
-    private fun uploadExposures(eventList: List<ExposureEvent>) {
+    private fun uploadExposures(eventList: List<ExposureEvent>, forced: Boolean) {
         eventList.forEach {
-            LoghubHelper.uploadLog(buildLog(it), LOG_STORE)
+            LoghubHelper.uploadLog(buildLog(it), LOG_STORE, forced)
+            it.recycle()
         }
     }
 
@@ -121,9 +81,12 @@ object ExposureManager {
         putContent("event", event.event.toString())
         putContent("source", eliminateMultipleBrackets(event.source.toJson()))
         putContent("meta", event.meta.toJson())
-        putContent("e-traces", if (event.eTrace != null) {
-            eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
-        } else "")
+        putContent("real_millisecond", event.timeInMillisecond.toString())
+        putContent(
+            "e-traces", if (event.eTrace != null) {
+                eliminateMultipleBrackets(event.eTrace?.toJson() ?: "")
+            } else ""
+        )
         logTime = event.time.toLong()
     }
 

app/src/main/java/com/gh/common/exposure/ExposureUtils.kt

@@ -7,6 +7,7 @@ import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.manager.PackagesManager
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 
@@ -75,44 +76,41 @@ object ExposureUtils {
         exposureEvent.payload.host = host
         exposureEvent.payload.path = path
         ExposureManager.log(exposureEvent)
-        ExposureManager.commitSavedExposureEvents(forced = true)
+        ExposureManager.commitSavedExposureEvents(forcedUpload = true)
     }
 
     @JvmStatic
-    fun getDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
-        return if (PackageUtils.isInstalled(
+    fun getDownloadType(apkEntity: ApkEntity, gameId: String, isVGame: Boolean): DownloadType {
+        return when {
+            isVGame -> getVGameDownloadType(apkEntity, gameId)
+            PackageUtils.isInstalled(
                 HaloApp.getInstance().application,
                 apkEntity.packageName
-            )
-        ) {
-            if (PackageUtils.isSignedByGh(
-                    HaloApp.getInstance().application,
-                    apkEntity.packageName
-                )
-            ) {
-                if (PackageUtils.isCanUpdate(apkEntity, gameId)) {
-                    DownloadType.PLUGIN_UPDATE
-                } else {
-                    if (Version(apkEntity.version).isHigherThan(
-                            PackageUtils.getVersionNameByPackageName(
-                                apkEntity.packageName
-                            )
-                        )
-                    ) {
-                        DownloadType.UPDATE
-                    } else {
-                        DownloadType.DOWNLOAD
-                    }
-                }
-            } else {
-                if (!TextUtils.isEmpty(apkEntity.ghVersion)) {
-                    DownloadType.PLUGIN_DOWNLOAD
-                } else {
-                    DownloadType.UPDATE
-                }
-            }
-        } else {
-            DownloadType.DOWNLOAD
+            ) -> getInstallDownloadType(apkEntity, gameId)
+            else -> DownloadType.DOWNLOAD
+        }
+    }
+
+    private fun getVGameDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
+        return when {
+            PackagesManager.isCanUpdate(gameId, apkEntity.packageName) -> DownloadType.FUN_UPDATE
+            else -> DownloadType.FUN_DOWNLOAD
+        }
+    }
+
+    private fun getInstallDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
+        return when {
+            PackageUtils.isSignedByGh(HaloApp.getInstance().application, apkEntity.packageName) -> getUpdateDownloadType(apkEntity, gameId)
+            !TextUtils.isEmpty(apkEntity.ghVersion) -> DownloadType.PLUGIN_DOWNLOAD
+            else -> DownloadType.UPDATE
+        }
+    }
+
+    private fun getUpdateDownloadType(apkEntity: ApkEntity, gameId: String): DownloadType {
+        return when {
+            PackageUtils.isCanUpdate(apkEntity, gameId) -> DownloadType.PLUGIN_UPDATE
+            Version(apkEntity.version).isHigherThan(PackageUtils.getVersionNameByPackageName(apkEntity.packageName)) -> DownloadType.UPDATE
+            else -> DownloadType.DOWNLOAD
         }
     }
 
@@ -143,6 +141,10 @@ object ExposureUtils {
 
         PLUGIN_UPDATE,
 
-        PLUGIN_DOWNLOAD
+        PLUGIN_DOWNLOAD,
+
+        FUN_DOWNLOAD,
+
+        FUN_UPDATE
     }
 }

app/src/main/java/com/gh/common/filter/RegionSetting.kt

@@ -5,17 +5,45 @@ import com.google.gson.annotations.SerializedName
 
 @Keep
 data class RegionSetting(
-        @SerializedName("game_mirror")
-        var mirrorGameIdSet: HashSet<String>,
-        @SerializedName("game_block")
-        var filterGameIdSet: HashSet<String>,
-        @SerializedName("channel_control")
-        var channelControl: ChannelControl) {
+    @SerializedName("game_mirror")
+    var mirrorGameIdSet: HashSet<String>,
+    @SerializedName("game_block")
+    var filterGameIdSet: HashSet<String>,
+    @SerializedName("channel_control")
+    var channelControl: ChannelControl,
+    @SerializedName("game_h5_download")
+    var gameH5DownloadList: List<GameH5Download>,
+    @SerializedName("game_special_download")
+    var gameSpecialDownloadInfoList: List<GameSpecialDownloadInfo>
+) {
 
     @Keep
     data class ChannelControl(
-            @SerializedName("game_category")
-            var gameCategory: String,
-            @SerializedName("effect")
-            var effect: Boolean)
+        @SerializedName("game_category")
+        var gameCategory: String,
+        @SerializedName("effect")
+        var effect: Boolean
+    )
+
+    @Keep
+    data class GameH5Download(
+        @SerializedName("game_id")
+        var gameId: String,// 游戏id
+        @SerializedName("h5_link")
+        var h5Link: String,// 网页链接
+        @SerializedName("download_link")
+        var downloadLink: String,// 下载链接
+        @SerializedName("button_text")
+        var buttonText: String,// 按钮文案
+    )
+    data class GameSpecialDownloadInfo(
+        @SerializedName("game_id")
+        var gameId: String = "",
+        @SerializedName("bbs_id")
+        var bbsId: String = "",
+        @SerializedName("top_id")
+        var topId: String = "",
+        @SerializedName("hint_text")
+        var hintText: String = ""
+    )
 }

app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt

@@ -19,6 +19,8 @@ object RegionSettingHelper {
     private var mChannelControl: RegionSetting.ChannelControl? = null
     private var mFilterGameIdSet: HashSet<String>? = hashSetOf()
     private var mDisplayMirrorIfoGameIdSet: HashSet<String>? = hashSetOf()
+    private var mGameH5DownloadList: List<RegionSetting.GameH5Download>? = listOf()
+    private var mGameSpecialDownloadInfoList: List<RegionSetting.GameSpecialDownloadInfo>? = listOf()
 
     private const val SP_SETTING = "region_setting"
 
@@ -31,6 +33,11 @@ object RegionSettingHelper {
         return mFilterGameIdSet?.contains(gameId) ?: false
     }
 
+    fun shouldThisGameShowSpecialDownload(gameId: String) = mGameSpecialDownloadInfoList?.any { it.gameId == gameId } ?: false
+
+    @JvmStatic
+    fun getGameSpecialDownloadInfo(gameId: String) = mGameSpecialDownloadInfoList?.find { it.gameId == gameId }
+
     @JvmStatic
     fun filterGame(list: List<GameEntity>?): ArrayList<GameEntity> {
         if (list == null) return arrayListOf()
@@ -58,27 +65,33 @@ object RegionSettingHelper {
         }
     }
 
+    @JvmStatic
+    fun getGameH5DownloadByGameId(gameId: String): RegionSetting.GameH5Download? {
+        if (mGameH5DownloadList.isNullOrEmpty()) return null
+        return mGameH5DownloadList!!.find { it.gameId == gameId }
+    }
+
     @SuppressLint("CheckResult")
     @JvmStatic
     fun getRegionSetting() {
         debounceActionWithInterval(R.string.app_name, 5000) {
             // 使用默认的 Schdulers.io() 可能会触发 OOM
             RetrofitManager.getInstance()
-                    .api
-                    .getRegionSetting(HaloApp.getInstance().channel)
-                    .subscribeOn(Schedulers.io())
-                    .subscribe(object : BiResponse<RegionSetting>() {
-                        override fun onSuccess(data: RegionSetting) {
-                            updateSettingsInMemory(data)
-                            SPUtils.setString(SP_SETTING, data.toJson())
-                        }
+                .api
+                .getRegionSetting(HaloApp.getInstance().channel)
+                .subscribeOn(Schedulers.io())
+                .subscribe(object : BiResponse<RegionSetting>() {
+                    override fun onSuccess(data: RegionSetting) {
+                        updateSettingsInMemory(data)
+                        SPUtils.setString(SP_SETTING, data.toJson())
+                    }
 
-                        override fun onFailure(exception: Exception) {
-                            SPUtils.getString(SP_SETTING)?.toObject<RegionSetting>()?.let {
-                                updateSettingsInMemory(it)
-                            }
+                    override fun onFailure(exception: Exception) {
+                        SPUtils.getString(SP_SETTING)?.toObject<RegionSetting>()?.let {
+                            updateSettingsInMemory(it)
                         }
-                    })
+                    }
+                })
         }
     }
 
@@ -86,6 +99,8 @@ object RegionSettingHelper {
         mFilterGameIdSet = data.filterGameIdSet
         mDisplayMirrorIfoGameIdSet = data.mirrorGameIdSet
         mChannelControl = data.channelControl
+        mGameH5DownloadList = data.gameH5DownloadList
+        mGameSpecialDownloadInfoList = data.gameSpecialDownloadInfoList
     }
 
     /**

app/src/main/java/com/gh/common/provider/ActivationProviderImpl.kt

@@ -7,9 +7,9 @@ import com.gh.gamecenter.common.constant.RouteConsts
 import com.gh.gamecenter.core.provider.IActivationProvider
 
 @Route(path = RouteConsts.provider.activation, name = "ActivationHelper暴露服务")
-interface ActivationProviderImpl : IActivationProvider {
+class ActivationProviderImpl : IActivationProvider {
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 
     override fun sendActivationInfo() {

app/src/main/java/com/gh/common/provider/AppProviderImpl.kt

@@ -10,7 +10,7 @@ import com.halo.assistant.HaloApp
 @Route(path = RouteConsts.provider.app, name = "Application暴露服务")
 class AppProviderImpl : IAppProvider {
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 
     override fun getAppName(): String {
@@ -21,6 +21,10 @@ class AppProviderImpl : IAppProvider {
         return HaloApp.getInstance().gid ?: ""
     }
 
+    override fun refreshGid() {
+        HaloApp.getInstance().refreshGid()
+    }
+
     override fun getOaid(): String {
         return HaloApp.getInstance().oaid ?: ""
     }

app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt

@@ -9,7 +9,7 @@ import com.gh.gamecenter.core.provider.IBuildConfigProvider
 @Route(path = RouteConsts.provider.buildConfig, name = "BuildConfig暴露服务")
 class BuildConfigImpl : IBuildConfigProvider {
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 
     override fun getApplicationId(): String = BuildConfig.APPLICATION_ID
@@ -28,4 +28,7 @@ class BuildConfigImpl : IBuildConfigProvider {
 
     override fun getNewDevApiHost(): String = BuildConfig.NEW_DEV_API_HOST
 
+    override fun getVApiHost(): String = BuildConfig.VAPI_HOST
+
+    override fun getVDevApiHost(): String = BuildConfig.DEV_VAPI_HOST
 }

app/src/main/java/com/gh/common/provider/CheckLoginProviderImpl.kt

@@ -13,6 +13,6 @@ class CheckLoginProviderImpl : ICheckLoginProvider {
     }
 
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt

@@ -16,6 +16,10 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.WECHAT_APPID
     }
 
+    override fun getWechatSecret(): String {
+        return Config.WECHAT_SECRET
+    }
+
     override fun getUploadLimitSize(): Long {
         return Config.getSettings()?.image?.uploadLimitSize ?: 0L
     }
@@ -56,7 +60,19 @@ class ConfigProviderImpl : IConfigProvider {
         return Config.getSettings()?.support?.qq ?: ""
     }
 
-    override fun init(context: Context?) {
+    override fun getQuickLoginAppId(): String {
+        return Config.QUICK_LOGIN_APPID
+    }
 
+    override fun getQuickLoginAppKey(): String {
+        return Config.QUICK_LOGIN_APPKEY
+    }
+
+    override fun getWeiboAppKey(): String {
+        return Config.WEIBO_APPKEY
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/DataUtilsProviderImpl.kt

@@ -0,0 +1,20 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DataUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDataUtilsProvider
+import com.halo.assistant.HaloApp
+
+@Route(path = RouteConsts.provider.dataUtils, name = "DataUtils暴露服务")
+class DataUtilsProviderImpl : IDataUtilsProvider {
+
+    override fun getDeviceCertification() {
+        DataUtils.getDeviceCertification(HaloApp.getInstance().gid)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt

@@ -9,11 +9,16 @@ import com.gh.gamecenter.core.provider.IDefaultUrlHandlerProvider
 @Route(path = RouteConsts.provider.defaultUrlHandler, name = "DefaultUrlHandler暴露服务")
 class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
 
-    override fun interceptUrl(context: Context, url: String, entrance: String):Boolean {
-        return DefaultUrlHandler.interceptUrl(context, url, entrance)
+    override fun interceptUrl(
+        context: Context,
+        url: String,
+        entrance: String,
+        bringAppToFront: Boolean
+    ): Boolean {
+        return DefaultUrlHandler.interceptUrl(context, url, entrance, bringAppToFront)
     }
 
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt

@@ -23,6 +23,6 @@ class DialogUtilsProviderImpl : IDialogUtilsProvider {
     }
 
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt

@@ -21,7 +21,35 @@ class DirectProviderImpl : IDirectProvider {
         DirectUtils.directToQqConversation(context, qq)
     }
 
-    override fun init(context: Context?) {
+    override fun directToCommodityDetail(context: Context, commodityId: String) {
+        DirectUtils.directToCommodityDetail(context, commodityId)
+    }
 
+    override fun directToEnergyRecord(context: Context) {
+        DirectUtils.directToEnergyRecord(context)
+    }
+
+    override fun directToEnergyRulePage(context: Context) {
+        DirectUtils.directToEnergyRulePage(context)
+    }
+
+    override fun directToInviteFriends(context: Context) {
+        DirectUtils.directToInviteFriends(context)
+    }
+
+    override fun directToExchangeRulePage(context: Context) {
+        DirectUtils.directToExchangeRulePage(context)
+    }
+
+    override fun directToExchangeCommodityPage(context: Context) {
+        DirectUtils.directToExchangeCommodityPage(context)
+    }
+
+    override fun directToLotteryParadisePage(context: Context) {
+        DirectUtils.directToLotteryParadisePage(context)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt

@@ -14,8 +14,12 @@ class DownloadManagerProviderImpl : IDownloadManagerProvider {
         return DownloadManager.getInstance().getDownloadEntityByUrl(url)
     }
 
-    override fun init(context: Context?) {
+    override fun resumeAllInvisiblePendingTask() {
+        DownloadManager.getInstance().resumeAllInvisiblePendingTask()
+    }
 
+    override fun init(context: Context?) {
+        // Do nothing
     }
 
 }

app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt

@@ -18,6 +18,6 @@ class EntranceUtilsProviderImpl: IEntranceUtilsProvider {
     }
 
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/ErrorHelperProviderImpl.kt

@@ -0,0 +1,28 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.ErrorHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IErrorHelperProvider
+import retrofit2.HttpException
+
+@Route(path = RouteConsts.provider.errorHelper, name = "ErrorHelper暴露服务")
+class ErrorHelperProviderImpl : IErrorHelperProvider {
+
+    override fun handleError(
+        context: Context,
+        errorString: String?,
+        showHighPriorityHint: Boolean
+    ) {
+        ErrorHelper.handleError(context, errorString, showHighPriorityHint)
+    }
+
+    override fun handleLoginError(context: Context, httpException: HttpException?) {
+        ErrorHelper.handleLoginError(context, httpException)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/FloatingBackViewManagerProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.FloatingBackViewManager
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IFloatingBackViewManagerProvider
+
+@Route(path = RouteConsts.provider.floatingBackViewManager, name = "FloatingViewBackManager暴露服务")
+class FloatingBackViewManagerProviderImpl : IFloatingBackViewManagerProvider {
+
+    override fun enableBackViewForTaskType() {
+        FloatingBackViewManager.enableBackView(FloatingBackViewManager.TYPE_TASK)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/GameSubstituteRepositoryProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.GameSubstituteRepositoryHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IGameSubstituteRepositoryProvider
+
+@Route(path = RouteConsts.provider.gameSubstituteRepository, name = "GameSubstituteRepositoryHelper暴露服务")
+class GameSubstituteRepositoryProviderImpl : IGameSubstituteRepositoryProvider {
+
+    override fun updateSubstitutableGames() {
+        GameSubstituteRepositoryHelper.updateSubstitutableGames()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/HandleGameResponseProviderImpl.kt

@@ -0,0 +1,44 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.filter.RegionSettingHelper
+import com.gh.common.util.ApkActiveUtils
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.utils.countOccurrences
+import com.gh.gamecenter.core.provider.IHandleGameResponseProvider
+import com.gh.gamecenter.entity.GameEntity
+
+@Route(path = RouteConsts.provider.handleGameResponse, name = "处理游戏类型返回")
+class HandleGameResponseProviderImpl : IHandleGameResponseProvider {
+
+    override fun handleGameResponse(response: List<Any>, entrance: String): List<Any> {
+        // 针对游戏的一些操作(过滤隐藏游戏，过滤隐藏APK吗，增加下载数据)
+        if (response.isNotEmpty() && response[0] is GameEntity) {
+            val responseResult = RegionSettingHelper.filterGame(response as? List<GameEntity>?)
+            if (responseResult.isNotEmpty()) {
+                for (entity in responseResult) {
+                    val game: GameEntity = entity
+                    game.setEntryMap(DownloadManager.getInstance().getEntryMap(game.name))
+
+                    // 当页面是由启动弹窗过来的第一或第二个页面的时候添加启动弹窗信息
+                    if (entrance.contains(EntranceConsts.ENTRANCE_WELCOME)
+                        && entrance.countOccurrences("+") <= 1
+                    ) {
+                        game.setWelcomeDialogInfoIfAvailable()
+                    }
+                    ApkActiveUtils.filterHideApk(game)
+                }
+            }
+            return responseResult
+        }
+        return response
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+
+}

app/src/main/java/com/gh/common/provider/LinkDirectUtilsProviderImpl.kt

@@ -0,0 +1,26 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.provider.ILinkDirectUtilsProvider
+
+@Route(path = RouteConsts.provider.linkDirectUtils, name = "DirectUtils暴露服务，主要是暴露directToLinkPage方法")
+class LinkDirectUtilsProviderImpl : ILinkDirectUtilsProvider {
+
+    override fun directToLinkPage(
+        context: Context,
+        linkEntity: LinkEntity,
+        entrance: String,
+        path: String
+    ) {
+        DirectUtils.directToLinkPage(context, linkEntity, entrance, path)
+    }
+
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/LogUtilsProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.*
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.*
+
+@Route(path = RouteConsts.provider.logUtils, name = "LogUtils暴露服务")
+class LogUtilsProviderImpl : ILogUtilsProvider {
+
+    override fun login(loginStep: String, loginType: String, entrance: String) {
+        LogUtils.login(loginStep, loginType, entrance)
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/MessageUnreadRepositoryProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IMessageUnreadRepositoryProvider
+import com.gh.gamecenter.message.MessageUnreadRepository
+
+@Route(path = RouteConsts.provider.messageUnreadRepository, name = "MessageUnreadRepository暴露服务")
+class MessageUnreadRepositoryProviderImpl : IMessageUnreadRepositoryProvider {
+
+    override fun loadMessageUnreadData() {
+        MessageUnreadRepository.loadMessageUnreadData()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt

@@ -14,6 +14,6 @@ class PackageHelperProviderImpl : IPackageHelperProvider {
     }
 
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt

@@ -19,6 +19,6 @@ class PackageInstallerProviderImpl : IPackageInstallerProvider {
     }
 
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt

@@ -34,6 +34,6 @@ class PackageUtilsProviderImpl : IPackageUtilsProvider {
     }
 
     override fun init(context: Context?) {
-
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt

@@ -1,19 +0,0 @@
-package com.gh.common.provider
-
-import android.content.Context
-import com.alibaba.android.arouter.facade.annotation.Route
-import com.gh.common.util.QuickLoginHelper
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IQuickLoginProvider
-
-@Route(path = RouteConsts.provider.quickLogin, name = "一键登录暴露服务")
-class QuickLoginProviderImpl : IQuickLoginProvider {
-
-    override fun startLogin(context: Context, entrance: String) {
-        QuickLoginHelper.startLogin(context, entrance)
-    }
-
-    override fun init(context: Context?) {
-
-    }
-}

app/src/main/java/com/gh/common/provider/ReservationRepositoryProviderImpl.kt

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.repository.ReservationRepository
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IReservationRepositoryProvider
+
+@Route(path = RouteConsts.provider.reservationRepository, name = "ReservationRepository暴露服务")
+class ReservationRepositoryProviderImpl : IReservationRepositoryProvider {
+
+    override fun refreshReservations() {
+        ReservationRepository.refreshReservations()
+    }
+
+    override fun clearReservations() {
+        ReservationRepository.clearReservations()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/TimeUtilProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.exposure.time.TimeUtil
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.ITimeUtilProvider
+
+@Route(path = RouteConsts.provider.timeUtil, name = "TimeUtil暴露服务")
+class TimeUtilProviderImpl : ITimeUtilProvider {
+
+    override fun currentTimeMillis() = TimeUtil.currentTimeMillis()
+
+    override fun currentTime() = TimeUtil.currentTime()
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/provider/WebProviderImpl.kt

@@ -13,7 +13,11 @@ class WebProviderImpl : IWebProvider {
         return WebActivity.getIntent(context, url, autoCompletionTitle)
     }
 
-    override fun init(context: Context?) {
+    override fun getWebIntent(context: Context, title: String, url: String): Intent {
+        return WebActivity.getWebIntent(context, title, url)
+    }
 
+    override fun init(context: Context?) {
+        // Do nothing
     }
 }

app/src/main/java/com/gh/common/provider/WechatHelperProviderImpl.kt

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.WechatBindHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IWechatBindHelperProvider
+
+@Route(path = RouteConsts.provider.wechatHelper, name = "WechatHelper暴露服务")
+class WechatHelperProviderImpl : IWechatBindHelperProvider {
+    override fun getWechatConfig() {
+        WechatBindHelper.getWechatConfig()
+    }
+
+    override fun init(context: Context?) {
+        // Do nothing
+    }
+}

app/src/main/java/com/gh/common/repository/ReservationRepository.kt

@@ -2,7 +2,7 @@ package com.gh.common.repository
 
 import android.annotation.SuppressLint
 import com.gh.common.util.CheckLoginUtils
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp

app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt

@@ -9,14 +9,15 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.g00fy2.versioncompare.Version
-import com.gh.gamecenter.core.AppExecutor.uiExecutor
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.base.TrackableDialog
-import com.gh.common.util.*
 import com.gh.common.util.LogUtils
+import com.gh.common.util.PackageInstaller
+import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.base.TrackableDialog
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.AppExecutor.uiExecutor
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.SimulatorEntity
@@ -73,7 +74,7 @@ class SimulatorDownloadManager private constructor() {
                         val fileName = downloadEntity.path.substring(downloadEntity.path.lastIndexOf('/') + 1).removeSuffix(".apk")
                         val startTime = downloadEntity.getMetaExtra(Constants.SIMULATOR_DOWNLOAD_START_TIME)
                         LogUtils.uploadSimulatorDownload("simulator_download_complete", fileName, simulator?.id, downloadEntity.name, gameId, locationStr, downloadType, startTime)
-                        DownloadManager.getInstance().cancel(downloadEntity.url, false, true)
+                        DownloadManager.getInstance().cancel(downloadEntity.url, false, true, false)
                         val activity = mContextRef?.get() as? AppCompatActivity
                         if (activity?.isFinishing == false) {
                             downloadDialog?.dismiss()
@@ -97,6 +98,9 @@ class SimulatorDownloadManager private constructor() {
                     DownloadStatus.unavailable == downloadEntity.status -> {
                         ToastUtils.showToast("该游戏未接入防沉迷系统，暂不支持下载")
                     }
+                    DownloadStatus.banned == downloadEntity.status -> {
+                        ToastUtils.showToast("网络异常")
+                    }
                     DownloadStatus.hijack == downloadEntity.status -> {
                         ToastUtils.showToast("网络劫持，请稍后重试")
                     }
@@ -111,53 +115,59 @@ class SimulatorDownloadManager private constructor() {
 
     fun showDownloadDialog(context: Context?, simulator: SimulatorEntity?, location: SimulatorLocation, gameId: String = "", gameName: String = "", cancelCallback: (() -> Unit)? = null) {
         if (context == null) return
+
         mContextRef = WeakReference(context)
         this.simulatorLocation = location
         this.simulator = simulator
         this.gameId = gameId
         this.gameName = gameName
-        //判断是否隐藏
-        if (simulator?.active == false) {
-            showNoneEmulatorDialog(context)
-            return
-        }
-        val isInstalled = PackageUtils.isInstalledFromAllPackage(context, simulator?.apk?.packageName)
-        val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator?.apk?.packageName)
-        val shouldShowUpdate = Version(simulator?.apk?.version).isHigherThan(versionFromInstalledApp)
-        val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"
-        val message = if (shouldShowUpdate && isInstalled) "检测到模拟器存在更高版本，是否前往更新" else "模拟器游戏需要先下载安装对应的模拟器，才可以运行"
-        val positiveText = if (shouldShowUpdate && isInstalled) "更新（${simulator?.apk?.size}）" else "下载（${simulator?.apk?.size}）"
-        val negativeText = if (shouldShowUpdate && isInstalled) "下次再说" else "取消"
-        downloadType = if (shouldShowUpdate && isInstalled) "update" else "download"
 
-        val trackableEntity = TrackableEntity("模拟器下载",
-                key = if (shouldShowUpdate && isInstalled) "更新弹窗" else "下载弹窗",
-                logShowEvent = true
-        )
-        DialogHelper.showDialog(
-            context,
-            title,
-            message,
-            positiveText,
-            negativeText,
-            trackMtaEvent = true,
-            cancelClickCallback = {
-                if (shouldShowUpdate && isInstalled) {
-                    cancelCallback?.invoke()
-                    MtaHelper.onEvent(trackableEntity.event, trackableEntity.key, "点击下次再说")
+        PermissionHelper.checkGetInstalledAppsListBeforeAction(context, object : EmptyCallback {
+            override fun onCallback() {
+                //判断是否隐藏
+                if (simulator?.active == false) {
+                    showNoneEmulatorDialog(context)
+                    return
                 }
-            },
-            confirmClickCallback = {
-                showDownloadingDialog(context, simulator)
-                MtaHelper.onEvent(
-                    trackableEntity.event,
-                    trackableEntity.key,
-                    if (shouldShowUpdate && isInstalled) "点击更新" else "点击下载"
+                val isInstalled = PackageUtils.isInstalledFromAllPackage(context, simulator?.apk?.packageName)
+                val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator?.apk?.packageName)
+                val shouldShowUpdate = Version(simulator?.apk?.version).isHigherThan(versionFromInstalledApp)
+                val title = if (shouldShowUpdate && isInstalled) "更新模拟器" else "安装模拟器"
+                val message = if (shouldShowUpdate && isInstalled) "检测到模拟器存在更高版本，是否前往更新" else "模拟器游戏需要先下载安装对应的模拟器，才可以运行"
+                val positiveText = if (shouldShowUpdate && isInstalled) "更新（${simulator?.apk?.size}）" else "下载（${simulator?.apk?.size}）"
+                val negativeText = if (shouldShowUpdate && isInstalled) "下次再说" else "取消"
+                downloadType = if (shouldShowUpdate && isInstalled) "update" else "download"
+
+                val trackableEntity = TrackableEntity("模拟器下载",
+                    key = if (shouldShowUpdate && isInstalled) "更新弹窗" else "下载弹窗",
+                    logShowEvent = true
                 )
-            },
-            mtaEvent = trackableEntity.event, mtaKey = trackableEntity.key,
-            extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-        )
+                DialogHelper.showDialog(
+                    context,
+                    title,
+                    message,
+                    positiveText,
+                    negativeText,
+                    trackMtaEvent = true,
+                    cancelClickCallback = {
+                        if (shouldShowUpdate && isInstalled) {
+                            cancelCallback?.invoke()
+                            MtaHelper.onEvent(trackableEntity.event, trackableEntity.key, "点击下次再说")
+                        }
+                    },
+                    confirmClickCallback = {
+                        showDownloadingDialog(context, simulator)
+                        MtaHelper.onEvent(
+                            trackableEntity.event,
+                            trackableEntity.key,
+                            if (shouldShowUpdate && isInstalled) "点击更新" else "点击下载"
+                        )
+                    },
+                    mtaEvent = trackableEntity.event, mtaKey = trackableEntity.key,
+                    extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+                )
+            }
+        })
     }
 
     private fun showDownloadingDialog(context: Context, simulator: SimulatorEntity?) {
@@ -218,7 +228,7 @@ class SimulatorDownloadManager private constructor() {
                 ToastUtils.showToast("该模拟器暂未提供下载")
             },
             uiModificationCallback = { binding ->
-                binding.confirmTv.setTextColor(R.color.text_body.toColor())
+                binding.confirmTv.setTextColor(R.color.text_body.toColor(context))
             },
             extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true))
     }

app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt

@@ -7,19 +7,21 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.text.TextUtils
 import com.g00fy2.versioncompare.Version
-import com.gh.gamecenter.common.json.json
-import com.gh.common.util.*
+import com.gh.common.util.ApkActiveUtils
 import com.gh.common.util.LogUtils
+import com.gh.common.util.PackageUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.common.callback.BiCallback
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
-import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.SimulatorGameRecordEntity
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.common.json.json
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.EmptyResponse
 import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.core.utils.UrlFilterUtils
+import com.gh.gamecenter.entity.GameEntity
+import com.gh.gamecenter.entity.SimulatorGameRecordEntity
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.room.AppDatabase
 import com.halo.assistant.HaloApp
@@ -72,7 +74,7 @@ object SimulatorGameManager {
 
     @JvmStatic
     fun findDownloadEntityByUrl(url: String?): DownloadEntity? {
-        val downloadEntity = DownloadDao.getInstance(HaloApp.getInstance().application).get(url)
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(url)
         if (downloadEntity != null) {
             val isFileCompleted = DownloadManager.getInstance().isDownloadCompleted(url)
             if (downloadEntity.isSimulatorGame() && isFileCompleted) {

app/src/main/java/com/gh/common/util/BbsReportHelper.kt

@@ -94,7 +94,7 @@ object BbsReportHelper {
             binding.otherReasonEt.doOnTextChanged { text, start, before, count ->
                 val tvCount: Int = text.toString().length
                 if (tvCount >= 500) {
-                    binding.tvCount.setTextColor(R.color.theme_red.toColor())
+                    binding.tvCount.setTextColor(R.color.theme_red.toColor(binding.tvCount.context))
                 }
                 binding.tvCount.text = "$tvCount/500"
             }

app/src/main/java/com/gh/common/util/CertificationSwitchHelper.kt

@@ -0,0 +1,25 @@
+package com.gh.common.util
+
+import android.annotation.SuppressLint
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.retrofit.RetrofitManager
+import com.google.gson.JsonObject
+
+object CertificationSwitchHelper {
+
+    @JvmStatic
+    @SuppressLint("CheckResult")
+    fun getCertificationSwitch() {
+        RetrofitManager.getInstance().api
+            .certificationSwitch
+            .compose(singleToMain())
+            .subscribe(object : BiResponse<JsonObject>() {
+                override fun onSuccess(data: JsonObject) {
+                    SPUtils.setBoolean(Constants.SP_CERTIFICATION_SWITCH, data["authentication_display_switch"].asString == "on")
+                }
+            })
+    }
+}

app/src/main/java/com/gh/common/util/CheckLoginUtils.java

@@ -8,10 +8,11 @@ import android.text.TextUtils;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.core.utils.CurrentActivityHolder;
 import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.LoginActivity;
+import com.gh.gamecenter.login.utils.QuickLoginHelper;
+import com.gh.gamecenter.login.view.LoginActivity;
 import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.manager.UserManager;
+import com.gh.gamecenter.login.user.UserManager;
 import com.lightgame.utils.Utils;
 
 
@@ -28,14 +29,7 @@ public class CheckLoginUtils {
             LogUtils.login("activity", null, entrance);
 
             if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(context)) {
-                // 需要确保传入的 context 不为 application
-                if (!(context instanceof Activity)) {
-                    context = CurrentActivityHolder.getCurrentActivity();
-                }
-
-                if (context != null) {
-                    QuickLoginHelper.startLogin(context, entrance);
-                }
+                startQuickLogin(context, entrance);
             } else {
                 // 有可能App未启动
                 Bundle bundle = new Bundle();
@@ -50,6 +44,17 @@ public class CheckLoginUtils {
         }
     }
 
+    private static void startQuickLogin(Context context, String entrance) {
+        // 需要确保传入的 context 不为 application
+        if (!(context instanceof Activity)) {
+            context = CurrentActivityHolder.getCurrentActivity();
+        }
+
+        if (context != null) {
+            QuickLoginHelper.startLogin(context, entrance);
+        }
+    }
+
     public static void checkLogin(final Context context, Bundle nextToBundle, boolean isTriggerNextStep, String entrance, OnLoginListener listener) {
         if (!isLogin()) {
             if (listener != null) Utils.toast(context, "需要登录");

app/src/main/java/com/gh/common/util/CollectionUtils.kt

@@ -2,7 +2,7 @@ package com.gh.common.util
 
 import android.content.Context
 import com.gh.gamecenter.eventbus.EBCollectionChanged
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.Observable

app/src/main/java/com/gh/common/util/CommentHelper.kt

@@ -5,21 +5,21 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.json.json
 import com.gh.common.util.CommentUtils.copyText
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.CommentDetailActivity
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.json.json
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.ifLogin
 import com.gh.gamecenter.common.utils.showAutoOrientation
+import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.entity.CommentEntity
 import com.gh.gamecenter.entity.MeEntity
 import com.gh.gamecenter.entity.Permissions
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener
-import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
@@ -237,8 +237,6 @@ object CommentHelper {
                                     }
                                     articleId != null -> {
                                         PostCommentUtils.reportCommunityArticleComment(
-                                            communityId,
-                                            articleId,
                                             commentEntity.id,
                                             reportType,
                                             commentListener
@@ -440,11 +438,7 @@ object CommentHelper {
                             context, highlight, highlightDialogHintContent,
                             "确定", "取消", {
                                 RetrofitManager.getInstance().api
-                                    .highlightCommunityArticleComment(
-                                        communityId,
-                                        articleId,
-                                        comment.id
-                                    )
+                                    .highlightCommunityArticleComment(comment.id)
                                     .observeOn(AndroidSchedulers.mainThread())
                                     .subscribeOn(Schedulers.io())
                                     .subscribe(highlightObserver)
@@ -502,7 +496,7 @@ object CommentHelper {
                             context, hide, hideDialogHintContent,
                             "确定", "取消", {
                                 RetrofitManager.getInstance().api
-                                    .hideCommunityArticleComment(communityId, articleId, comment.id)
+                                    .hideCommunityArticleComment(comment.id)
                                     .observeOn(AndroidSchedulers.mainThread())
                                     .subscribeOn(Schedulers.io())
                                     .subscribe(hideObserver)

app/src/main/java/com/gh/common/util/CommentUtils.java

@@ -27,8 +27,8 @@ import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.entity.MeEntity;
-import com.gh.gamecenter.entity.UserInfoEntity;
-import com.gh.gamecenter.manager.UserManager;
+import com.gh.gamecenter.login.entity.UserInfoEntity;
+import com.gh.gamecenter.login.user.UserManager;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
@@ -111,7 +111,7 @@ public class CommentUtils {
 
         LinearLayout container = new LinearLayout(context);
         container.setOrientation(LinearLayout.VERTICAL);
-        container.setBackgroundColor(Color.WHITE);
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.background_white));
         container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
 
         List<String> dialogType = new ArrayList<>();
@@ -168,7 +168,7 @@ public class CommentUtils {
         LinearLayout container = new LinearLayout(context);
         container.setOrientation(LinearLayout.VERTICAL);
         container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12));
-        container.setBackgroundColor(Color.WHITE);
+        container.setBackgroundColor(ContextCompat.getColor(context, R.color.background_white));
 
         for (final String s : arrReportType) {
             TextView reportTypeTv = new TextView(context);
@@ -298,7 +298,7 @@ public class CommentUtils {
             commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote()));
             commentLikeCountTv.setVisibility(View.VISIBLE);
 
-            PostCommentUtils.likeComment(answerId, articleId, articleCommunityId, videoId, questionId, commentEntity.getId(),
+            PostCommentUtils.likeComment(answerId, articleId, videoId, questionId, commentEntity.getId(),
                     new PostCommentUtils.PostCommentListener() {
                         @Override
                         public void postSuccess(JSONObject response) {
@@ -352,7 +352,7 @@ public class CommentUtils {
         String entrance = "视频流-评论-点赞";
         CheckLoginUtils.checkLogin(context, entrance, () -> {
 
-            PostCommentUtils.likeComment(answerId, articleId, articleCommunityId, videoId, "", commentEntity.getId(),
+            PostCommentUtils.likeComment(answerId, articleId, videoId, "", commentEntity.getId(),
                     new PostCommentUtils.PostCommentListener() {
                         @Override
                         public void postSuccess(JSONObject response) {
@@ -420,7 +420,7 @@ public class CommentUtils {
                             commentLikeCountTv.setVisibility(View.VISIBLE);
                             try {
                                 if (e != null && e.response().errorBody() != null) {
-                                    ErrorHelper.handleError(context, e.response().errorBody().string(), false);
+                                    ErrorHelper.handleError(context, e.response().errorBody().string(), false, null);
                                 }
                             } catch (IOException ex) {
                                 ex.printStackTrace();

app/src/main/java/com/gh/common/util/ConcernUtils.kt

@@ -3,7 +3,7 @@ package com.gh.common.util
 import android.content.Context
 import android.text.TextUtils
 import com.gh.gamecenter.eventbus.EBConcernChanged
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/com/gh/common/util/DataUtils.java

@@ -12,7 +12,6 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import com.gh.base.GlobalActivityManager;
-import androidx.annotation.RequiresApi;
 
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.common.base.activity.BaseActivity;
@@ -23,8 +22,9 @@ import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.utils.GsonUtils;
 import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.entity.IdCardEntity;
-import com.gh.gamecenter.entity.UserInfoEntity;
+import com.gh.gamecenter.core.utils.SentryHelper;
+import com.gh.gamecenter.login.entity.IdCardEntity;
+import com.gh.gamecenter.login.entity.UserInfoEntity;
 import com.gh.gamecenter.provider.GhContentProvider;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.gid.GidCallback;
@@ -33,9 +33,6 @@ import com.halo.assistant.HaloApp;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.utils.Utils;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import io.reactivex.schedulers.Schedulers;
 import io.sentry.Sentry;
 import io.sentry.android.core.SentryAndroid;
@@ -43,10 +40,14 @@ import kotlin.Pair;
 
 /**
  * Created by LGT on 2016/6/15.
- * 数据收集 工具类 （TalkingData、MTA）
+ * 数据收集工具类
  */
 public class DataUtils {
 
+    private DataUtils() {
+        throw new IllegalStateException("Utility class");
+    }
+
     /**
      * 初始化各种统计工具，仅在release build（非debug）模式启用统计
      */
@@ -63,16 +64,17 @@ public class DataUtils {
         SentryAndroid.init(context, options -> {
             // Sentry 疯狂报 ANR (很大一部分还是莫名奇妙的 ANR)严重影响到其它闪退日志的收集
             // 这里将它局限到只有官网渠道的包才统计 ANR
-            if ("GH_206".equals(channel) || "GH_BETA".equals(channel)) {
+            if ("GH_206".equals(channel) || "GH_BETA".equals(channel) || com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0) {
                 options.setAnrEnabled(true);
                 options.setAnrTimeoutIntervalMillis(6000);
             } else {
                 options.setAnrEnabled(false);
             }
-        
+
             options.setDebug(BuildConfig.DEBUG);
-            options.setEnableSessionTracking(true);
+            options.setEnableAutoSessionTracking(true);
             options.setEnvironment(BuildConfig.FLAVOR);
+            options.setEnableSystemEventBreadcrumbs(false);
             options.setDsn("https://6b1caf0d17c1408e8680f3f73ff80bd0@sentry.shanqu.cc/22");
         
             options.setBeforeSend((event, hint) -> {
@@ -161,8 +163,15 @@ public class DataUtils {
                             values.put(GhContentProvider.KEY_IS_ADULT, false);
                         }
 
-                     new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
-//                        HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
+//                     new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
+                        try {
+                            // Unknown URL content://com.gh.gamecenter.provider/certification
+                            // TODO 将 com.gh.gamecenter 改成 BuildConfig.ApplicationID
+                            HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
+                        } catch (Exception exception) {
+                            SentryHelper.INSTANCE.onEvent("CERTIFICATION_INSERT_ERROR", "exception_digest", exception.getLocalizedMessage());
+                            exception.printStackTrace();
+                        }
                     }
                 });
     }

app/src/main/java/com/gh/common/util/DetailDownloadUtils.java

@@ -4,19 +4,22 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.gh.common.constant.Config;
-import com.gh.gamecenter.common.constant.Constants;
+import com.gh.common.filter.RegionSetting;
+import com.gh.common.filter.RegionSettingHelper;
 import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorGameManager;
-import com.gh.common.view.DownloadProgressBar;
+import com.gh.common.view.DownloadButton;
 import com.gh.common.xapk.XapkInstaller;
 import com.gh.common.xapk.XapkUnzipStatus;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
+import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.entity.LinkEntity;
+import com.gh.gamecenter.common.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 
 /**
@@ -29,6 +32,10 @@ public class DetailDownloadUtils {
     public static void detailInitDownload(DetailViewHolder viewHolder, boolean isCheck) {
         String downloadAddWord = viewHolder.gameEntity.getDownloadAddWord();
 
+        if (viewHolder.getOverlayTv() != null) {
+            viewHolder.getOverlayTv().setVisibility(View.GONE);
+        }
+
         if (viewHolder.gameEntity != null
                 && Config.isShowDownload(viewHolder.gameEntity.getId())
                 && !"光环助手".equals(viewHolder.gameEntity.getName())) {
@@ -40,26 +47,79 @@ public class DetailDownloadUtils {
 
         if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
             viewHolder.mDownloadPb.setText("查看");
-            viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.TEENAGER_MODEL);
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.TEENAGER_MODE);
+            return;
+        }
+
+        if (viewHolder.gameEntity.isSpecialDownload()) {
+            viewHolder.mDownloadPb.setText("查看下载资源");
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.SPECIAL_DOWNLOAD);
             return;
         }
 
         if (viewHolder.gameEntity.isReservable()) {
             if (!ReservationRepository.thisGameHasBeenReserved(viewHolder.gameEntity.getId())) {
-
                 if (TextUtils.isEmpty(downloadAddWord)) {
                     viewHolder.mDownloadPb.setText(String.format("预约" + "《%s》", viewHolder.gameEntity.getName()));
                 } else {
                     viewHolder.mDownloadPb.setText(String.format("预约" + "《%s》%s", viewHolder.gameEntity.getName(), downloadAddWord));
                 }
-                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.RESERVABLE);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.RESERVABLE);
             } else {
                 viewHolder.mDownloadPb.setText("已预约《" + viewHolder.gameEntity.getName() + "》");
-                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.RESERVED);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.RESERVED);
             }
             return;
         }
 
+        final RegionSetting.GameH5Download gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(viewHolder.gameEntity.getId());
+        if (gameH5Download != null) {
+            viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "查看详情" : viewHolder.gameEntity.getDownloadOffText());
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+            return;
+        }
+
+        if (viewHolder.gameEntity.isVGame() && !viewHolder.gameEntity.getApk().isEmpty()) {
+            String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity, PluginLocation.only_game);
+            if (viewHolder.context.getString(R.string.launch).equals(status)) {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+            } else if (viewHolder.context.getString(R.string.install).equals(status)) {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+            } else {
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
+            }
+
+            String downloadText;
+            if (viewHolder.context.getString(R.string.launch).equals(status) || viewHolder.context.getString(R.string.install).equals(status) || viewHolder.context.getString(R.string.download).equals(status)) {
+                downloadText = "";
+                if (viewHolder.getOverlayTv() != null) {
+                    viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
+                }
+            } else if (viewHolder.context.getString(R.string.attempt).equals(status)) {
+                downloadText = status + getDownloadSizeText(viewHolder);
+            } else {
+                downloadText = status + (TextUtils.isEmpty(downloadAddWord) ? "" : downloadAddWord) + getDownloadSizeText(viewHolder);
+            }
+            viewHolder.mDownloadPb.setText(downloadText);
+
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(viewHolder.gameEntity);
+
+            // 在下载管理找不到下载实体，到畅玩数据库里找
+            if (downloadEntity == null && viewHolder.gameEntity.isVGame()) {
+                String packageName = viewHolder.gameEntity.getUniquePackageName();
+                if (!TextUtils.isEmpty(packageName)) {
+                    downloadEntity = VHelper.getDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
+                }
+            }
+
+            if (downloadEntity != null) {
+                viewHolder.downloadEntity = downloadEntity;
+                detailInvalidate(viewHolder);
+            }
+
+            return;
+        }
+
         if (viewHolder.gameEntity.getApk().isEmpty() || viewHolder.gameEntity.getDownloadOffStatus() != null) {
             LinkEntity h5LinkEntity = viewHolder.gameEntity.getH5Link();
 
@@ -70,29 +130,29 @@ public class DetailDownloadUtils {
                 } else {
                     viewHolder.mDownloadPb.setText(TextUtils.isEmpty(h5LinkEntity.getText()) ? "查看" : h5LinkEntity.getText());
                 }
-                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.H5_GAME);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.H5_GAME);
             } else {
                 if ("dialog".equals(viewHolder.gameEntity.getDownloadOffStatus())) {
                     viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "查看详情" : viewHolder.gameEntity.getDownloadOffText());
-                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NONE_WITH_HINT);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NONE_WITH_HINT);
                 } else if ("updating".equals(viewHolder.gameEntity.getDownloadOffStatus())) {
                     viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "更新中" : viewHolder.gameEntity.getDownloadOffText());
-                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.UPDATING);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.UPDATING);
                 } else {
                     viewHolder.mDownloadPb.setText(TextUtils.isEmpty(viewHolder.gameEntity.getDownloadOffText()) ? "暂无下载" : viewHolder.gameEntity.getDownloadOffText());
-                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NONE);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NONE);
                 }
             }
         } else if (viewHolder.gameEntity.getApk().size() == 1) {
             String status = GameUtils.getDownloadBtnText(viewHolder.context, viewHolder.gameEntity, PluginLocation.only_game);
             if (viewHolder.context.getString(R.string.pluggable).equals(status)) {
-                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.PLUGIN);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
             } else if (viewHolder.context.getString(R.string.launch).equals(status)) {
-                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
             } else if (viewHolder.context.getString(R.string.install).equals(status)) {
-                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
             } else {
-                viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NORMAL);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
             }
 
             String downloadText;
@@ -112,11 +172,20 @@ public class DetailDownloadUtils {
             viewHolder.mDownloadPb.setText(downloadText);
         } else {
             viewHolder.mDownloadPb.setText("选择下载你的版本" + (TextUtils.isEmpty(downloadAddWord) ? "" : "-" + downloadAddWord) + "  >");
-            viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.NORMAL);
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
         }
+
         if (isCheck && viewHolder.gameEntity.getApk().size() == 1) {
-            String url = viewHolder.gameEntity.getApk().get(0).getUrl();
-            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(url);
+            DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(viewHolder.gameEntity);
+
+            // 在下载管理找不到下载实体，到畅玩数据库里找
+            if (downloadEntity == null && viewHolder.gameEntity.isVGame()) {
+                String packageName = viewHolder.gameEntity.getUniquePackageName();
+                if (!TextUtils.isEmpty(packageName)) {
+                    downloadEntity = VHelper.getDownloadEntitySnapshot(viewHolder.gameEntity.getId(), packageName);
+                }
+            }
+
             if (downloadEntity != null) {
                 viewHolder.downloadEntity = downloadEntity;
                 detailInvalidate(viewHolder);
@@ -136,11 +205,20 @@ public class DetailDownloadUtils {
             String percent = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_PERCENT);
             viewHolder.mDownloadPb.setText("解压中（" + percent + "%）");
             viewHolder.mDownloadPb.setProgress((int) (Float.valueOf(percent) * 10));
-            viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.XAPK_UNZIPPING);
+            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.XAPK_UNZIPPING);
             return;
         }
 
         viewHolder.mDownloadPb.setProgress((int) (viewHolder.downloadEntity.getPercent() * 10));
+        if (viewHolder.getOverlayTv() != null) {
+            viewHolder.getOverlayTv().setVisibility(View.GONE);
+        }
+
+        if (viewHolder.gameEntity.isVGame()) {
+            updateVStyleButton(viewHolder);
+            return;
+        }
+
         switch (downloadEntity.getStatus()) {
             case downloading:
             case pause:
@@ -151,9 +229,9 @@ public class DetailDownloadUtils {
                     viewHolder.mDownloadPb.setText(R.string.downloading);
                 }
                 if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                 } else {
-                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                 }
                 break;
             case timeout:
@@ -162,9 +240,9 @@ public class DetailDownloadUtils {
             case subscribe:
                 viewHolder.mDownloadPb.setText(R.string.waiting);
                 if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) {
-                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_PLUGIN);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN);
                 } else {
-                    viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.DOWNLOADING_NORMAL);
+                    viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
                 }
                 break;
             case done:
@@ -172,14 +250,27 @@ public class DetailDownloadUtils {
                     boolean isInstalled = PackageUtils.isInstalledFromAllPackage(viewHolder.context, viewHolder.gameEntity.getSimulator().getApk().getPackageName());
                     if (isInstalled) {
                         viewHolder.mDownloadPb.setText(R.string.launch);
-                        viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.LAUNCH_OR_OPEN);
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
                     } else {
                         if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) {
                             viewHolder.mDownloadPb.setText(R.string.browser_install_install);
                         } else {
                             viewHolder.mDownloadPb.setText(R.string.install);
                         }
-                        viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                    }
+                } else if (viewHolder.gameEntity.isVGame()) {
+                    if (!viewHolder.mDownloadPb.getText().toString().contains("更新")) {
+                        if (VHelper.isInstalled(downloadEntity.getPackageName())) {
+                            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                        } else {
+                            viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                        }
+
+                        viewHolder.mDownloadPb.setText("");
+                        if (viewHolder.getOverlayTv() != null) {
+                            viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
+                        }
                     }
                 } else {
                     if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) {
@@ -189,9 +280,9 @@ public class DetailDownloadUtils {
                     }
                     if (downloadEntity.isPluggable()
                             && PackagesManager.isInstalled(downloadEntity.getPackageName())) {
-                        viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_PLUGIN);
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_PLUGIN);
                     } else {
-                        viewHolder.mDownloadPb.setDownloadType(DownloadProgressBar.DownloadType.INSTALL_NORMAL);
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
                     }
                 }
 
@@ -202,10 +293,48 @@ public class DetailDownloadUtils {
             case uncertificated:
             case unqualified:
             case unavailable:
+            case banned:
                 detailInitDownload(viewHolder, false);
                 break;
             default:
                 break;
         }
     }
+
+    private static void updateVStyleButton(DetailViewHolder viewHolder) {
+        switch (viewHolder.downloadEntity.getStatus()) {
+            case downloading:
+            case overflow:
+                viewHolder.mDownloadPb.setText("游戏加载中 " + viewHolder.downloadEntity.getPercent() + "%");
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                break;
+            case timeout:
+            case neterror:
+            case waiting:
+            case subscribe:
+                viewHolder.mDownloadPb.setText(R.string.waiting);
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                break;
+            case pause:
+                viewHolder.mDownloadPb.setText("继续加载 " + viewHolder.downloadEntity.getPercent() + "%");
+                viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL);
+                break;
+            case done:
+                if (!viewHolder.mDownloadPb.getText().toString().contains("更新")) {
+                    if (VHelper.isInstalled(viewHolder.downloadEntity.getPackageName())) {
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.LAUNCH_OR_OPEN);
+                    } else {
+                        viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL);
+                    }
+
+                    viewHolder.mDownloadPb.setText("");
+                    if (viewHolder.getOverlayTv() != null) {
+                        viewHolder.getOverlayTv().setVisibility(View.VISIBLE);
+                    }
+                }
+                break;
+            default:
+                break;
+        }
+    }
 }

app/src/main/java/com/gh/common/util/DialogUtils.java

@@ -37,7 +37,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -50,7 +49,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.common.constant.Config;
+import com.gh.common.filter.RegionSetting;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.ShellActivity;
 import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.adapter.ReportReasonAdapter;
 import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder;
@@ -72,21 +73,20 @@ import com.gh.gamecenter.core.AppExecutor;
 import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.core.utils.EmptyCallback;
 import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.core.utils.SpanBuilder;
 import com.gh.gamecenter.core.utils.StringUtils;
 import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.databinding.DialogBindPhoneBinding;
-import com.gh.gamecenter.databinding.DialogEnergySignBinding;
 import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding;
 import com.gh.gamecenter.databinding.DialogPackageParseErrorBinding;
-import com.gh.gamecenter.databinding.DialogQuickLoginPermissionBinding;
 import com.gh.gamecenter.databinding.DialogReceiveLibaoSuccessBinding;
+import com.gh.gamecenter.databinding.DialogRelievePhoneBinding;
 import com.gh.gamecenter.databinding.DialogReportReasonBinding;
 import com.gh.gamecenter.databinding.DialogWechatReserveSuccessBinding;
 import com.gh.gamecenter.databinding.ImprintContentItemBinding;
 import com.gh.gamecenter.databinding.PrivacyItemBinding;
 import com.gh.gamecenter.entity.ApkEntity;
-import com.gh.gamecenter.entity.Badge;
 import com.gh.gamecenter.entity.BadgeEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.PermissionsEntity;
@@ -94,9 +94,10 @@ import com.gh.gamecenter.entity.PrivacyPolicyEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.entity.SimpleGameEntity;
 import com.gh.gamecenter.entity.TrackableEntity;
+import com.gh.gamecenter.login.entity.Badge;
+import com.gh.gamecenter.security.BindPhoneActivity;
 import com.gh.gamecenter.setting.GameDownloadSettingFragment;
 import com.gh.gamecenter.suggest.SuggestType;
-import com.halo.assistant.HaloApp;
 import com.lightgame.adapter.BaseRecyclerAdapter;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.utils.AppManager;
@@ -210,17 +211,14 @@ public class DialogUtils {
     }
 
 
-
-
     public static void checkDownload(Context context, String size, CheckDownloadCallBack callBack) {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
         if (!NetworkUtils.isNetworkConnected(context)) {
             showNoConnectionDownloadDialog(context, null,
                     () -> callBack.onResponse(true));
         } else if (NetworkUtils.isWifiConnected(context)
                 || filter4GorSize(context, size)) {
             callBack.onResponse(false);
-        } else if (!preferences.getBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), true)) {
+        } else if (!SPUtils.getBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), true)) {
             AppExecutor.getUiExecutor().executeWithDelay(() -> Utils.toast(context, "当前使用移动网络下载，请注意流量消耗"), 500);
             callBack.onResponse(false);
         } else {
@@ -292,11 +290,7 @@ public class DialogUtils {
 //            MtaHelper.onEvent("移动网络下载", NetworkUtils.getMobileNetworkType(finalContext), "连上WiFi后自动下载");
         });
         allowAlways.setOnClickListener(v -> {
-            PreferenceManager
-                    .getDefaultSharedPreferences(finalContext)
-                    .edit()
-                    .putBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), false)
-                    .apply();
+            SPUtils.setBoolean(GameDownloadSettingFragment.getTrafficDownloadHintKey(), false);
             AppExecutor.getUiExecutor().executeWithDelay(() -> {
                 // 显示了弹窗以后，即便下面这个 toast 放在 listener.onConfirm 后调用也是显示 listener.onConfirm 里的 toast
                 // 喷了，延时包治疑难杂症
@@ -412,7 +406,6 @@ public class DialogUtils {
     }
 
 
-
     public static Dialog showDialogWithHtmlContent(Context context, String title, String content
             , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
         context = checkDialogContext(context);
@@ -1310,18 +1303,18 @@ public class DialogUtils {
 
             binding.gameIcon.displayGameIcon(gameEntity);
             binding.gameNameTv.setText(context.getString(R.string.dialog_oversea_hint, gameEntity.getName()));
-            binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
             binding.closeIv.setOnClickListener(v -> dialog.dismiss());
+
+            if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
+                gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
+            }
+            binding.urlTv.setText(gameEntity.getOverseasAddressDialog().getLink());
             binding.downloadBtn.setText("下载（" + gameEntity.getApk().get(0).getSize() + "）");
             binding.downloadBtn.setOnClickListener(v -> {
                 listener.onConfirm();
                 dialog.dismiss();
             });
 
-            if ("show&download".equals(gameEntity.getOverseasAddressDialog().getStatus())) {
-                gameEntity.getApk().get(0).setUrl(gameEntity.getOverseasAddressDialog().getLink());
-            }
-
             Window window = dialog.getWindow();
             if (window != null) {
                 window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
@@ -1332,6 +1325,36 @@ public class DialogUtils {
             dialog.show();
         }
     }
+    public static void showGameH5DownloadDialog(Context context, GameEntity gameEntity, RegionSetting.GameH5Download gameH5Download) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
+
+        DialogOverseaConfirmationBinding binding = DialogOverseaConfirmationBinding.inflate(LayoutInflater.from(context), null, false);
+
+        View contentView = binding.getRoot();
+
+        binding.gameIcon.displayGameIcon(gameEntity);
+        binding.gameNameTv.setText(context.getString(R.string.dialog_oversea_hint, gameEntity.getName()));
+        binding.closeIv.setOnClickListener(v -> dialog.dismiss());
+
+        Context finalContext = context;
+        binding.urlTv.setText(gameH5Download.getDownloadLink());
+        binding.downloadBtn.setText(gameH5Download.getButtonText());
+        binding.downloadBtn.setOnClickListener(v -> {
+            DirectUtils.directToExternalBrowser(finalContext, gameH5Download.getH5Link());
+            dialog.dismiss();
+        });
+
+        Window window = dialog.getWindow();
+        if (window != null) {
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+        }
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(contentView);
+        dialog.show();
+    }
 
     public static void showImprintDialog(Context context, GameEntity gameEntity, String titleName) {
         context = checkDialogContext(context);
@@ -1863,41 +1886,13 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showEnergyTaskNoticeDialog(Context context, String title, String content) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_notice, null);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView okTv = contentView.findViewById(R.id.dialog_ok);
-
-        if (title == null) {
-            titleTv.setVisibility(View.GONE);
-        } else {
-            titleTv.setVisibility(View.VISIBLE);
-            titleTv.setText(title);
-        }
-        contentTv.setText(content);
-
-        okTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font));
-        okTv.setOnClickListener(v -> {
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
     public static void showSimulatorParseErrorDialog(Context context, String gameId, String gameName, ConfirmListener confirmListener) {
         context = checkDialogContext(context);
         final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
 
         DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false);
         Context finalContext = context;
-        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(6, 10, R.color.theme_font, true, new Function0<Unit>() {
+        SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.theme_font, true, new Function0<Unit>() {
             @Override
             public Unit invoke() {
                 SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, "");
@@ -1981,31 +1976,6 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showSignSuccessDialog(Context context, ConfirmListener listener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_sign_success, null);
-
-        ImageView signBg = contentView.findViewById(R.id.signBg);
-        RelativeLayout signContainer = contentView.findViewById(R.id.signContainer);
-
-        Animation animation1 = AnimationUtils.loadAnimation(context, R.anim.anim_badge_light_bg);
-        signBg.startAnimation(animation1);
-
-        Animation animation2 = AnimationUtils.loadAnimation(context, R.anim.anim_sign_dialog_dismiss);
-        signContainer.postDelayed(() -> signContainer.startAnimation(animation2), 2000);
-
-        signContainer.postDelayed(dialog::dismiss, 3000);
-
-        dialog.setOnDismissListener(dialogInterface -> listener.onConfirm());
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-    }
-
     public static void showSignRuleDialog(Context context) {
         context = checkDialogContext(context);
 
@@ -2070,59 +2040,6 @@ public class DialogUtils {
         }
     }
 
-    public static void showQuickLoginPermissionDialog(Context context, ConfirmListener confirmListener, CancelListener cancelListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
-        DialogQuickLoginPermissionBinding binding = DialogQuickLoginPermissionBinding.inflate(LayoutInflater.from(context));
-
-        binding.confirmBtn.setOnClickListener(v -> {
-            dialog.dismiss();
-            confirmListener.onConfirm();
-        });
-
-        binding.cancelBtn.setOnClickListener(v -> {
-            dialog.dismiss();
-            cancelListener.onCancel();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(binding.getRoot());
-        dialog.show();
-    }
-
-    public static void showEnergySignDialog(Context context, int sevenDaySerialSign) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
-        DialogEnergySignBinding binding = DialogEnergySignBinding.inflate(LayoutInflater.from(context));
-
-        if (sevenDaySerialSign > 7) sevenDaySerialSign = 7;
-
-        for (int i = 1; i <= sevenDaySerialSign; i++) {
-            int index = (i - 1) * 2;
-            LinearLayout dayContainer = (LinearLayout) binding.signDaysContainer.getChildAt(index);
-            ImageView dayIv = (ImageView) dayContainer.getChildAt(1);
-            dayIv.setImageResource(R.drawable.ic_energy_center_signed);
-
-            if (i != 7) {
-                int rIndex = (i - 1) * 2 + 1;
-                LinearLayout lineContainer = (LinearLayout) binding.signDaysContainer.getChildAt(rIndex);
-                View straightLine = lineContainer.getChildAt(0);
-                View dottedLine = lineContainer.getChildAt(1);
-                if (i != sevenDaySerialSign) {
-                    straightLine.setVisibility(View.VISIBLE);
-                } else {
-                    dottedLine.setVisibility(View.VISIBLE);
-                }
-            }
-        }
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(binding.getRoot());
-        dialog.show();
-    }
-
     public static void showReserveSuccess2WechatBindDialog(Context context, ConfirmListener confirmListener, CancelListener cancelListener) {
         context = checkDialogContext(context);
 
@@ -2172,6 +2089,32 @@ public class DialogUtils {
         }
     }
 
+    public static void showRelievePhoneDialog(Context context) {
+        context = checkDialogContext(context);
+
+        final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
+        DialogRelievePhoneBinding binding = DialogRelievePhoneBinding.inflate(LayoutInflater.from(context));
+
+        Context finalContext = context;
+        binding.realNameBtn.setOnClickListener(v -> {
+            dialog.dismiss();
+            Intent intent = ShellActivity.getIntent(finalContext, ShellActivity.Type.REAL_NAME_INFO);
+            finalContext.startActivity(intent);
+        });
+
+        binding.bindPhoneBtn.setOnClickListener(v -> {
+            dialog.dismiss();
+            Intent intent = BindPhoneActivity.getNormalIntent(finalContext, false);
+            finalContext.startActivity(intent);
+        });
+
+        binding.cancelBtn.setOnClickListener(v -> dialog.dismiss());
+
+        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+        dialog.setContentView(binding.getRoot());
+        dialog.show();
+    }
+
     /**
      * @param context may be is application context
      * @return activity context

app/src/main/java/com/gh/common/util/DirectUtils.kt

@@ -29,8 +29,12 @@ import com.gh.gamecenter.catalog.CatalogActivity
 import com.gh.gamecenter.category.CategoryDirectoryActivity
 import com.gh.gamecenter.category2.CategoryV2Activity
 import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.entity.CommunityEntity
+import com.gh.gamecenter.common.entity.Display
+import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.RunningUtils
+import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBSkip
@@ -46,7 +50,7 @@ import com.gh.gamecenter.gamedetail.GameDetailFragment
 import com.gh.gamecenter.gamedetail.fuli.kaifu.ServersCalendarActivity
 import com.gh.gamecenter.gamedetail.history.HistoryApkListActivity
 import com.gh.gamecenter.gamedetail.rating.RatingReplyActivity
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.mygame.PlayedGameActivity
 import com.gh.gamecenter.personalhome.UserHomeActivity
 import com.gh.gamecenter.personalhome.background.PersonalityBackgroundActivity
@@ -57,7 +61,6 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
-import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.security.BindPhoneActivity
 import com.gh.gamecenter.servers.GameServerTestActivity
@@ -71,6 +74,7 @@ import com.gh.gamecenter.video.detail.VideoDetailActivity
 import com.gh.gamecenter.video.detail.VideoDetailContainerViewModel
 import com.gh.gamecenter.video.game.GameVideoActivity
 import com.gh.gamecenter.video.videomanager.VideoManagerActivity
+import com.gh.vspace.VDownloadManagerActivity
 import com.halo.assistant.HaloApp
 import com.halo.assistant.fragment.WebFragment
 import com.lightgame.utils.Utils
@@ -153,7 +157,8 @@ object DirectUtils {
         "category_v2",
         "common_collection",
         "game_list",
-        "game_list_detail"
+        "game_list_detail",
+        "bbs_video"
     )
 
     fun directToLinkPage(
@@ -189,7 +194,7 @@ object DirectUtils {
 
             "column", "游戏专题" -> directToSubject(
                 context, linkEntity.link
-                    ?: "", linkEntity.text, BaseActivity.mergeEntranceAndPath(entrance, path)
+                    ?: "", linkEntity.text, BaseActivity.mergeEntranceAndPath(entrance, path), exposureEvent
             )
 
             "question", "社区问题" -> directToQuestionDetail(
@@ -228,7 +233,7 @@ object DirectUtils {
 
             "qqqun", "QQ群" -> directToQqGroup(context, linkEntity.link!!)
 
-            "tag" -> context.startActivity(TagsActivity.getIntent(context, linkEntity.text!!, linkEntity.title, entrance, path))
+            "tag" -> context.startActivity(TagsActivity.getIntent(context, linkEntity.text!!, linkEntity.title, entrance, path, exposureEvent?.source))
 
             "all_community_article" -> directSimpleArticleList(
                 context, linkEntity.link
@@ -239,7 +244,7 @@ object DirectUtils {
 
             "catalog" -> directCatalog(context, linkEntity.link!!, linkEntity.text!!, entrance, path)
 
-            "category_v2" -> directCategoryV2(context, linkEntity.link!!, linkEntity.text!!, entrance, path)
+            "category_v2" -> directCategoryV2(context, linkEntity.link!!, linkEntity.text!!, entrance, path, exposureEvent)
 
             "block", "版块" -> {
                 if (linkEntity.link.isNullOrEmpty()) return
@@ -263,7 +268,7 @@ object DirectUtils {
 
             "wechat_bind" -> context.startActivity(WebActivity.getBindWechatIntent(context))
 
-            "video", "video_stream", "视频" -> directToVideoDetail(
+            "video", "bbs_video", "video_stream", "视频" -> directToVideoDetail(
                 context,
                 videoId = linkEntity.link!!,
                 fromLocation = VideoDetailContainerViewModel.Location.VIDEO_CHOICENESS.value,
@@ -629,13 +634,14 @@ object DirectUtils {
 
     // 专栏
     @JvmStatic
-    fun directToSubject(context: Context, id: String, subjectName: String? = "", entrance: String? = null) {
+    fun directToSubject(context: Context, id: String, subjectName: String? = "", entrance: String? = null, exposureEvent: ExposureEvent? = null) {
         if (id.isEmpty()) return
         val bundle = Bundle()
         val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false)
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
         bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData)
+        if (exposureEvent != null) bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source))
         jumpActivity(context, bundle)
     }
 
@@ -663,10 +669,11 @@ object DirectUtils {
             bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
         } else {
             bundle.putString(KEY_CONTENT, content)
-            bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
             if (TextUtils.isEmpty(hintType)) {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.gameQuestion)
                 bundle.putString(KEY_SUGGEST_HINT_TYPE, KEY_PLUGIN)
             } else {
+                bundle.putSerializable(KEY_SUGGESTTYPE, SuggestType.normal)
                 bundle.putString(KEY_SUGGEST_HINT_TYPE, hintType)
             }
         }
@@ -803,7 +810,11 @@ object DirectUtils {
             if (context !is AppCompatActivity) {
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             }
-            context.startActivity(intent)
+            try {
+                context.startActivity(intent)
+            } catch (e: ActivityNotFoundException) {
+                ToastUtils.toast("无法跳转至QQ，请稍后再试")
+            }
         } else {
             // 没有安装QQ 复制账号
             qq?.copyTextAndToast("已复制 QQ $qq")
@@ -1179,6 +1190,7 @@ object DirectUtils {
         categoryTitle: String,
         entrance: String? = null,
         path: String? = "",
+        exposureEvent: ExposureEvent? = null,
     ) {
         if (categoryId.isEmpty()) return
         val bundle = Bundle()
@@ -1186,6 +1198,7 @@ object DirectUtils {
         bundle.putString(KEY_CATEGORY_ID, categoryId)
         bundle.putString(KEY_CATEGORY_TITLE, categoryTitle)
         bundle.putString(KEY_ENTRANCE, BaseActivity.mergeEntranceAndPath(entrance, path))
+        if (exposureEvent != null) bundle.putParcelableArrayList(KEY_EXPOSURE_SOURCE_LIST, ArrayList(exposureEvent.source))
         jumpActivity(context, bundle)
     }
 
@@ -1317,9 +1330,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToHomeTab(context: Context) {
-        if (RunningUtils.isRunning(context)
-            && MainActivity::class.java.name == RunningUtils.getBaseActivity(context)
-        ) {
+        if (HaloApp.getInstance().isRunningForeground) {
             val intent = Intent(context, MainActivity::class.java)
             intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
             context.startActivity(intent)
@@ -1340,9 +1351,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToForum(context: Context, position: Int = 0) {
-        if (RunningUtils.isRunning(context)
-            && MainActivity::class.java.name == RunningUtils.getBaseActivity(context)
-        ) {
+        if (HaloApp.getInstance().isRunningForeground) {
             val intent = Intent(context, MainActivity::class.java)
             intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
             context.startActivity(intent)
@@ -1365,9 +1374,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToVideoTab(context: Context) {
-        if (RunningUtils.isRunning(context)
-            && MainActivity::class.java.name == RunningUtils.getBaseActivity(context)
-        ) {
+        if (HaloApp.getInstance().isRunningForeground) {
             val intent = Intent(context, MainActivity::class.java)
             intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
             context.startActivity(intent)
@@ -1386,9 +1393,7 @@ object DirectUtils {
      */
     @JvmStatic
     fun directToPersonalTab(context: Context) {
-        if (RunningUtils.isRunning(context)
-            && MainActivity::class.java.name == RunningUtils.getBaseActivity(context)
-        ) {
+        if (HaloApp.getInstance().isRunningForeground) {
             val intent = Intent(context, MainActivity::class.java)
             intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
             context.startActivity(intent)
@@ -1699,7 +1704,13 @@ object DirectUtils {
      * 跳转至游戏单广场
      */
     @JvmStatic
-    fun directToGameCollectionSquare(context: Context, entrance: String = "", forumName: String = "", gameCollectionTitle: String = "", gameCollectionId: String = "") {
+    fun directToGameCollectionSquare(
+        context: Context,
+        entrance: String = "",
+        forumName: String = "",
+        gameCollectionTitle: String = "",
+        gameCollectionId: String = ""
+    ) {
         val bundle = Bundle()
         bundle.putString(KEY_TO, GameCollectionSquareActivity::class.java.name)
         bundle.putString(KEY_ENTRANCE, entrance)
@@ -1761,6 +1772,15 @@ object DirectUtils {
         }
     }
 
+    @JvmStatic
+    fun directToVGameDownload(context: Context, switchToDownloadingTab: Boolean = false) {
+        val bundle = Bundle()
+        bundle.putString(KEY_ENTRANCE, ENTRANCE_BROWSER)
+        bundle.putString(KEY_TO, VDownloadManagerActivity::class.java.name)
+        bundle.putInt(KEY_POSITION, if (switchToDownloadingTab) 1 else 0)
+        jumpActivity(context, bundle)
+    }
+
     @JvmStatic
     fun directToSuggestion(context: Context, type: SuggestType) {
         directToSuggestion(context = context, type = type, requestCode = null)

app/src/main/java/com/gh/common/util/DownloadItemUtils.kt

@@ -1,43 +1,44 @@
 package com.gh.common.util
 
 import android.content.Context
-import android.graphics.Color
 import android.os.Message
 import android.text.TextUtils
 import android.view.View
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.collection.ArrayMap
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
+import com.gh.common.chain.*
 import com.gh.common.constant.Config
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.common.dialog.CertificationDialog
 import com.gh.common.dialog.DeviceRemindDialog
-import com.gh.common.dialog.PackageCheckDialogFragment
 import com.gh.common.exposure.ExposureEvent
+import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.history.HistoryHelper
 import com.gh.common.repository.ReservationRepository
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
+import com.gh.common.view.DownloadButton
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
-import com.gh.download.server.BrowserInstallHelper
 import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
-import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.callback.CancelListener
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.*
 import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.entity.LinkEntity
+import com.gh.gamecenter.common.entity.LinkEntity
+import com.gh.gamecenter.energy.utils.EnergyTaskHelper
 import com.gh.gamecenter.entity.PluginLocation
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 import com.gh.gamecenter.manager.PackagesManager
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
+import com.gh.vspace.VDownloadManagerActivity
+import com.gh.vspace.VHelper
 import com.lightgame.download.DownloadConfig
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
@@ -115,10 +116,9 @@ object DownloadItemUtils {
             updateItem(holder.gameDes.context, gameEntity, holder, false)
         } else if ("appointment" == gameEntity.reserveStatus) {
             // 已预约
-            holder.gameDownloadBtn.visibility = View.VISIBLE
             holder.gameDownloadBtn.text = "已预约"
-            holder.gameDownloadBtn.setTextColor(R.color.text_subtitleDesc.toColor(holder.gameDownloadBtn.context))
-            holder.gameDownloadBtn.background = R.drawable.button_round_f5f5f5.toDrawable(holder.gameDownloadBtn.context)
+            holder.gameDownloadBtn.visibility = View.VISIBLE
+            holder.gameDownloadBtn.buttonStyle = DownloadButton.ButtonStyle.RESERVED
             updateItemViewStatus(holder, false, null, null)
         }
     }
@@ -140,8 +140,11 @@ object DownloadItemUtils {
     @JvmStatic
     @JvmOverloads
     fun updateItem(
-        context: Context, gameEntity: GameEntity, holder: GameViewHolder,
-        isShowPlatform: Boolean, pluginLocation: PluginLocation? = PluginLocation.only_game,
+        context: Context,
+        gameEntity: GameEntity,
+        holder: GameViewHolder,
+        isShowPlatform: Boolean,
+        pluginLocation: PluginLocation? = PluginLocation.only_game,
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
         briefStyle: String? = null,
         isShowRecommendStar: Boolean = false
@@ -164,33 +167,40 @@ object DownloadItemUtils {
 
     fun updateDownloadButton(
         context: Context,
-        downloadBtn: TextView,
+        downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         hideDownloadBtnIfNoAvailableContent: Boolean = false,
         pluginLocation: PluginLocation? = PluginLocation.only_game
     ) {
-        downloadBtn.background = R.drawable.download_button_normal_style.toDrawable(context)
         // 控制是否显示下载按钮
         downloadBtn.goneIf(!Config.isShowDownload(gameEntity.id) || context.getString(R.string.app_name) == gameEntity.name)
-        // 青少年模式显示查看
-        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
+        // 青少年模式或者需要特殊处理显示查看
+        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) || gameEntity.isSpecialDownload()) {
             downloadBtn.text = "查看"
+            downloadBtn.buttonStyle = DownloadButton.ButtonStyle.TEENAGER_MODE
             return
         }
         if (gameEntity.isReservable) {
             downloadBtn.apply {
                 if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) {
                     text = "预约"
-                    setTextColor(Color.WHITE)
-                    setBackgroundResource(R.drawable.button_reserve)
+                    buttonStyle = DownloadButton.ButtonStyle.RESERVABLE
                 } else {
                     text = "已预约"
-                    setTextColor(R.color.text_subtitleDesc.toColor())
-                    setBackgroundResource(R.drawable.bg_shape_f5_radius_999)
+                    buttonStyle = DownloadButton.ButtonStyle.RESERVED
                 }
             }
             return
         }
+        if (RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id) != null) {
+            downloadBtn.apply {
+                isClickable = true
+                text = context.getString(R.string.check)
+                setBackgroundResource(R.drawable.download_button_normal_style)
+                setTextColor(R.color.white.toColor(context))
+            }
+            return
+        }
         if (gameEntity.getApk().isEmpty() || gameEntity.downloadOffStatus != null) {
             val h5LinkEntity = gameEntity.h5Link
             val offStatus = gameEntity.downloadOffStatus
@@ -207,12 +217,10 @@ object DownloadItemUtils {
                         text = context.getString(R.string.check)
                     } else if ("updating" == offStatus) {
                         text = context.getString(R.string.updating)
-                        setTextColor(R.color.white.toColor())
-                        setBackgroundResource(R.drawable.download_button_updating_style)
+                        buttonStyle = DownloadButton.ButtonStyle.UPDATING
                     } else {
                         text = context.getString(R.string.none)
-                        setTextColor(R.color.button_gray.toColor())
-                        setBackgroundResource(R.drawable.button_border_gray_oval)
+                        buttonStyle = DownloadButton.ButtonStyle.NONE
                         if (hideDownloadBtnIfNoAvailableContent) {
                             visibility = View.GONE
                         }
@@ -221,44 +229,46 @@ object DownloadItemUtils {
                 }
             }
         } else if (gameEntity.getApk().size == 1) {
-            val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(gameEntity.getApk()[0].url)
+            var downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
+
+            if (downloadEntity == null && gameEntity.isVGame()) {
+                downloadEntity = VHelper.getDownloadEntitySnapshot(gameEntity.id, gameEntity.getUniquePackageName())
+            }
+
             if (downloadEntity != null) {
                 downloadBtn.apply {
                     val status = downloadEntity.status
                     if (status == DownloadStatus.downloading) {
                         setText(R.string.downloading)
-                        setBackgroundResource(R.drawable.game_item_btn_downloading_style)
-                        setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style))
+                        buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
                     } else if (status == DownloadStatus.waiting) {
                         setText(R.string.waiting)
-                        setBackgroundResource(R.drawable.button_round_border_eeeeee)
-                        setTextColor(ContextCompat.getColorStateList(context, R.color.text_subtitleDesc))
+                        buttonStyle = DownloadButton.ButtonStyle.WAITING
                     } else if (status == DownloadStatus.pause || status == DownloadStatus.timeout || status == DownloadStatus.neterror || status == DownloadStatus.subscribe || status == DownloadStatus.overflow) {
-                        if (status == DownloadStatus.waiting) {
-                            setText(R.string.waiting)
-                            setBackgroundResource(R.drawable.button_round_border_eeeeee)
-                            setTextColor(ContextCompat.getColorStateList(context, R.color.text_subtitleDesc))
-                        } else {
-                            setText(R.string.downloading)
-                            setBackgroundResource(R.drawable.game_item_btn_downloading_style)
-                            setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style))
-                        }
+                        setText(R.string.downloading)
+                        buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
                     } else if (status == DownloadStatus.done) {
                         val xapkStatus = downloadEntity.meta[XapkInstaller.XAPK_UNZIP_STATUS]
                         if (XapkUnzipStatus.UNZIPPING.name == xapkStatus) {
                             setText(R.string.unzipping)
+                            buttonStyle = DownloadButton.ButtonStyle.NORMAL
                             return
                         }
                         if (downloadEntity.isSimulatorGame() && gameEntity.simulator != null) {
                             GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation)
+                        } else if (downloadEntity.isVGame()) {
+                            if (PackagesManager.isCanUpdate(downloadEntity.gameId, downloadEntity.packageName)) {
+                                setText(R.string.update)
+                            } else {
+                                setText(R.string.launch)
+                            }
                         } else {
                             setText(R.string.install)
                         }
-                        setTextColor(Color.WHITE)
-                        if (downloadEntity.isPluggable && PackagesManager.isInstalled(downloadEntity.packageName)) {
-                            setBackgroundResource(R.drawable.download_button_pluggable_style)
+                        buttonStyle = if (downloadEntity.isPluggable && PackagesManager.isInstalled(downloadEntity.packageName)) {
+                            DownloadButton.ButtonStyle.PLUGIN
                         } else {
-                            setBackgroundResource(R.drawable.download_button_normal_style)
+                            DownloadButton.ButtonStyle.NORMAL
                         }
                     }
                 }
@@ -325,10 +335,14 @@ object DownloadItemUtils {
         context: Context, holder: GameViewHolder, downloadEntity: DownloadEntity,
         isShowPlatform: Boolean, isNormal: Boolean, isShowRecommendStar: Boolean = false
     ) {
-        updateItemViewStatus(holder, true, null, null, isShowRecommendStar)
-        holder.gameProgressbar.progressDrawable = R.drawable.progressbar_bg_style.toDrawable()
-        val platform = PlatformUtils.getInstance(context).getPlatformName(downloadEntity.platform)
         val status = downloadEntity.status
+        // 畅玩游戏下载完成时不再需要显示进度条
+        val shouldShowDownload = !(downloadEntity.isVGame() && status == DownloadStatus.done)
+        val platform = PlatformUtils.getInstance(context).getPlatformName(downloadEntity.platform)
+
+        updateItemViewStatus(holder, shouldShowDownload, null, null, isShowRecommendStar)
+        holder.gameProgressbar.progressDrawable = R.drawable.progressbar_bg_style.toDrawable()
+
         if (status == DownloadStatus.downloading) {
             if (DownloadStatus.pause != DownloadManager.getInstance().getStatus(downloadEntity.url)) {
                 holder.gameProgressbar.progress = (downloadEntity.percent * 10).toInt()
@@ -384,12 +398,12 @@ object DownloadItemUtils {
 
     private fun updateItemViewStatus(
         holder: GameViewHolder,
-        hasDownload: Boolean,
+        showDownload: Boolean,
         briefStyle: String?,
         recommendStyle: LinkEntity?,
         isShowRecommendStar: Boolean = false
     ) {
-        if (hasDownload) {
+        if (showDownload) {
             if (holder.gameRating != null) holder.gameRating!!.visibility = View.GONE
             holder.gameDes.visibility = View.GONE
             holder.gameProgressbar.visibility = View.VISIBLE
@@ -451,7 +465,7 @@ object DownloadItemUtils {
     @JvmStatic
     fun setOnClickListener(
         context: Context,
-        downloadBtn: TextView,
+        downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
@@ -464,7 +478,7 @@ object DownloadItemUtils {
     @JvmStatic
     fun setOnClickListener(
         context: Context,
-        downloadBtn: TextView,
+        downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
@@ -481,7 +495,7 @@ object DownloadItemUtils {
     @JvmStatic
     fun setOnClickListener(
         context: Context,
-        downloadBtn: TextView,
+        downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
@@ -499,7 +513,7 @@ object DownloadItemUtils {
     @JvmStatic
     fun setOnClickListener(
         context: Context,
-        downloadBtn: TextView,
+        downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
@@ -532,6 +546,33 @@ object DownloadItemUtils {
             }
             return
         }
+        if (gameEntity.isSpecialDownload()) {
+            val info = RegionSettingHelper.getGameSpecialDownloadInfo(gameEntity.id) ?: return
+            downloadBtn.setOnClickListener {
+                DialogHelper.showDialog(
+                    context,
+                    "提示",
+                    info.hintText,
+                    "前往论坛",
+                    "",
+                    {
+                        if (info.bbsId.isNotBlank()) {
+                            if (info.topId.isNotBlank()) {
+                                val data = hashMapOf(EntranceConsts.KEY_TOP_ID to info.topId)
+                                PageSwitchDataHelper.pushCurrentPageData(data)
+                            }
+                            DirectUtils.directForumDetail(context, info.bbsId, entrance)
+                        }
+                    },
+                    {},
+                    DialogHelper.Config(
+                        centerTitle = true,
+                        centerContent = true
+                    )
+                )
+            }
+            return
+        }
         if (gameEntity.isReservable) {
             if (!ReservationRepository.thisGameHasBeenReserved(gameEntity.id)) {
                 downloadBtn.setOnClickListener {
@@ -565,6 +606,11 @@ object DownloadItemUtils {
                     } else {
                         ReservationHelper.showCancelReservationDialog(context, object : EmptyCallback {
                             override fun onCallback() {
+                                NewFlatLogUtils.logMyGameCancelReserveDialogClick(
+                                    "确定取消",
+                                    gameEntity.id,
+                                    gameEntity.name ?: ""
+                                )
                                 ReservationHelper.cancelReservation(gameEntity, object : EmptyCallback {
                                     override fun onCallback() {
                                         adapter?.notifyItemChanged(position)
@@ -572,12 +618,27 @@ object DownloadItemUtils {
                                     }
                                 })
                             }
+                        },object : CancelListener {
+                            override fun onCancel() {
+                                NewFlatLogUtils.logMyGameCancelReserveDialogClick(
+                                    "关闭弹窗",
+                                    gameEntity.id,
+                                    gameEntity.name ?: ""
+                                )
+                            }
                         })
                     }
                 }
             }
             return
         }
+        val gameH5Download = RegionSettingHelper.getGameH5DownloadByGameId(gameEntity.id)
+        if (gameH5Download != null) {
+            downloadBtn.setOnClickListener {
+                DialogUtils.showGameH5DownloadDialog(context, gameEntity, gameH5Download)
+            }
+            return
+        }
         if (gameEntity.getApk().size == 0 && gameEntity.h5Link != null) {
             downloadBtn.setOnClickListener {
                 allStateClickCallback?.onCallback()
@@ -611,27 +672,18 @@ object DownloadItemUtils {
             downloadBtn.setOnClickListener { view: View ->
                 allStateClickCallback?.onCallback()
                 clickCallback?.onCallback()
-                RealNameHelper.checkIfAuth(view.context, gameEntity, object : EmptyCallback {
-                    override fun onCallback() {
-                        GamePermissionDialogFragment.show(context, gameEntity, gameEntity.info, object : ConfirmListener {
-                            override fun onConfirm() {
-                                PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
-                                    override fun onCallback() {
-                                        CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
-                                            override fun onConfirm() {
-                                                DialogUtils.showVersionNumberDialog(context, gameEntity, object : ConfirmListener {
-                                                    override fun onConfirm() {
-                                                        DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
-                                                    }
-                                                })
-                                            }
-                                        })
-                                    }
-                                })
-                            }
-                        })
+
+                ChainBuilder().apply {
+                    addHandler(GamePermissionHandler())
+                    addHandler(CheckStoragePermissionHandler())
+                    addHandler(CertificationHandler())
+                    addHandler(VersionNumberHandler())
+                }
+                    .setProcessEndCallback {
+                        DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
                     }
-                })
+                    .buildHandlerChain()
+                    ?.handleRequest(context, gameEntity)
             }
         }
     }
@@ -639,7 +691,7 @@ object DownloadItemUtils {
     @JvmOverloads
     fun onNormalClick(
         context: Context,
-        downloadBtn: TextView,
+        downloadBtn: DownloadButton,
         gameEntity: GameEntity,
         position: Int,
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?,
@@ -652,96 +704,54 @@ object DownloadItemUtils {
         if (gameEntity.getApk().isEmpty()) return
         val apk = gameEntity.getApk().safelyGetInRelease(0) ?: return
         if (str == context.getString(R.string.download)) {
-            // 先弹下载弹窗(如果需要的话)
-            RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback {
-                override fun onCallback() {
-                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
-                        override fun onConfirm() {
-                            BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback {
-                                override fun onCallback() {
-                                    PackageCheckDialogFragment.show(context, gameEntity, object : ConfirmListener {
-                                        override fun onConfirm() {
-                                            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-                                                override fun onCallback() {
-                                                    CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
-                                                        override fun onConfirm() {
-                                                            DialogUtils.showOverseaDownloadDialog(context, gameEntity, object : ConfirmListener {
-                                                                override fun onConfirm() {
-                                                                    DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                                                        download(
-                                                                            context,
-                                                                            gameEntity,
-                                                                            downloadBtn,
-                                                                            entrance,
-                                                                            location,
-                                                                            isSubscribe,
-                                                                            traceEvent
-                                                                        )
-                                                                    }
-                                                                }
-                                                            })
-                                                        }
-                                                    })
-                                                }
-                                            })
-                                        }
-                                    })
-                                }
-                            })
-
-                        }
-                    })
+            ChainBuilder().apply {
+                addHandler(GamePermissionHandler())
+                addHandler(BrowserInstallHandler())
+                addHandler(PackageCheckHandler())
+                addHandler(DownloadDialogHelperHandler())
+                addHandler(CertificationHandler())
+                addHandler(OverseaDownloadHandler())
+                addHandler(CheckDownloadHandler())
+            }
+                .setProcessEndCallback {
+                    download(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
                 }
-            })
+                .buildHandlerChain()
+                ?.handleRequest(context, gameEntity)
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
         } else if (str == context.getString(R.string.attempt)) {
-            RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback {
-                override fun onCallback() {
-                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
-                        override fun onConfirm() {
-                            BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback {
-                                override fun onCallback() {
-                                    PackageCheckDialogFragment.show(context, gameEntity, object : ConfirmListener {
-                                        override fun onConfirm() {
-                                            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-                                                override fun onCallback() {
-                                                    CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
-                                                        override fun onConfirm() {
-                                                            DialogUtils.showVersionNumberDialog(context, gameEntity, object : ConfirmListener {
-                                                                override fun onConfirm() {
-                                                                    DialogUtils.showOverseaDownloadDialog(
-                                                                        context,
-                                                                        gameEntity,
-                                                                        object : ConfirmListener {
-                                                                            override fun onConfirm() {
-                                                                                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                                                                    download(
-                                                                                        context,
-                                                                                        gameEntity,
-                                                                                        downloadBtn,
-                                                                                        entrance,
-                                                                                        location,
-                                                                                        isSubscribe,
-                                                                                        traceEvent
-                                                                                    )
-                                                                                }
-                                                                            }
-                                                                        })
-                                                                }
-                                                            })
-                                                        }
-                                                    })
-                                                }
-                                            })
-                                        }
-                                    })
-                                }
-                            })
-                        }
-                    })
+            ChainBuilder().apply {
+                addHandler(GamePermissionHandler())
+                addHandler(BrowserInstallHandler())
+                addHandler(PackageCheckHandler())
+                addHandler(DownloadDialogHelperHandler())
+                addHandler(CertificationHandler())
+                addHandler(VersionNumberHandler())
+                addHandler(OverseaDownloadHandler())
+                addHandler(CheckDownloadHandler())
+            }
+                .setProcessEndCallback {
+                    download(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
                 }
-            })
+                .buildHandlerChain()
+                ?.handleRequest(context, gameEntity)
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
+        } else if (str == context.getString(R.string.smooth)) {
+            ChainBuilder().apply {
+                addHandler(GamePermissionHandler())
+                addHandler(PackageCheckHandler())
+                addHandler(DownloadDialogHelperHandler())
+                addHandler(CertificationHandler())
+                addHandler(VersionNumberHandler())
+                addHandler(OverseaDownloadHandler())
+                addHandler(ValidateVSpaceHandler())
+                addHandler(CheckDownloadHandler())
+            }
+                .setProcessEndCallback {
+                    download(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
+                }
+                .buildHandlerChain()
+                ?.handleRequest(context, gameEntity)
         } else if (str.contains("化")) {
             if (entrance.contains("我的游戏")) {
                 MtaHelper.onEvent("我的游戏_启动", "插件化", gameEntity.name)
@@ -749,17 +759,16 @@ object DownloadItemUtils {
             if (gameEntity.pluggableCollection != null) {
                 DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
             } else {
-                DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-                    override fun onCallback() {
-                        CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
-                            override fun onConfirm() {
-                                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                    plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)
-                                }
-                            }
-                        })
+                ChainBuilder().apply {
+                    addHandler(DownloadDialogHelperHandler())
+                    addHandler(CertificationHandler())
+                    addHandler(CheckDownloadHandler())
+                }
+                    .setProcessEndCallback {
+                        plugin(context, gameEntity, downloadBtn, entrance, location, it as Boolean, traceEvent)
                     }
-                })
+                    .buildHandlerChain()
+                    ?.handleRequest(context, gameEntity)
             }
         } else if (str == context.getString(R.string.install)) {
             val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(apk.url)
@@ -773,8 +782,15 @@ object DownloadItemUtils {
                     return
                 }
             }
-            install(context, gameEntity, position, adapter, refreshCallback)
+
+            if (gameEntity.isVGame()) {
+                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
+            } else {
+                install(context, gameEntity, position, adapter, refreshCallback)
+            }
         } else if (str == context.getString(R.string.launch)) {
+            EnergyTaskHelper.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
+
             //启动模拟器游戏
             if (SimulatorGameManager.isSimulatorGame(gameEntity)) {
                 val downloadEntity = SimulatorGameManager.findDownloadEntityByUrl(gameEntity.getApk()[0].url)
@@ -788,15 +804,24 @@ object DownloadItemUtils {
                 }
                 return
             }
+
+            if (gameEntity.isVGame()) {
+                VHelper.installOrLaunch((context as AppCompatActivity), gameEntity.getUniquePackageName() ?: "")
+                return
+            }
+
             if (entrance.contains("我的游戏")) {
                 MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
             }
             PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
-            EnergyTaskHelper.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
         } else if (str == context.getString(R.string.update)) {
             if (entrance.contains("我的游戏")) {
                 MtaHelper.onEvent("我的游戏_启动", "更新", gameEntity.name)
             }
+            if (gameEntity.isVGame()) {
+                VHelper.updateOrReDownload(gameEntity)
+                return
+            }
             DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
                 override fun onCallback() {
                     DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
@@ -805,12 +830,16 @@ object DownloadItemUtils {
                 }
             })
         } else {
-            context.startActivity(
-                DownloadManagerActivity.getDownloadMangerIntent(
-                    context,
-                    apk.url, entrance + "+(" + location.split(":").toTypedArray()[0] + ")"
+            if (gameEntity.isVGame()) {
+                context.startActivity(VDownloadManagerActivity.getIntent(context, true))
+            } else {
+                context.startActivity(
+                    DownloadManagerActivity.getDownloadMangerIntent(
+                        context,
+                        apk.url, entrance + "+(" + location.split(":").toTypedArray()[0] + ")"
+                    )
                 )
-            )
+            }
         }
     }
 
@@ -818,19 +847,20 @@ object DownloadItemUtils {
     private fun download(
         context: Context,
         gameEntity: GameEntity,
-        downloadBtn: TextView,
+        downloadBtn: DownloadButton,
         entrance: String,
         location: String,
         isSubscribe: Boolean,
         traceEvent: ExposureEvent?
     ) {
+        if (gameEntity.getApk().isEmpty()) return
+
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
         if (TextUtils.isEmpty(msg)) {
             DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location, isSubscribe, traceEvent)
             Utils.toast(context, gameEntity.name + "已加入下载队列")
             downloadBtn.setText(R.string.downloading)
-            downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style)
-            downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style))
+            downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL
             DeviceRemindDialog.showDeviceRemindDialog(context, gameEntity)
         } else {
             Utils.toast(context, msg)
@@ -839,7 +869,7 @@ object DownloadItemUtils {
 
     //插件化
     private fun plugin(
-        context: Context, gameEntity: GameEntity, downloadBtn: TextView, entrance: String,
+        context: Context, gameEntity: GameEntity, downloadBtn: DownloadButton, entrance: String,
         location: String, isSubscribe: Boolean, traceEvent: ExposureEvent?
     ) {
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
@@ -847,8 +877,7 @@ object DownloadItemUtils {
             DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
             Utils.toast(context, gameEntity.name + "已加入下载队列")
             downloadBtn.setText(R.string.downloading)
-            downloadBtn.setBackgroundResource(R.drawable.game_item_btn_downloading_style)
-            downloadBtn.setTextColor(ContextCompat.getColorStateList(context, R.color.text_downloading_style))
+            downloadBtn.buttonStyle = DownloadButton.ButtonStyle.DOWNLOADING_PLUGIN
         } else {
             Utils.toast(context, msg)
         }
@@ -860,7 +889,7 @@ object DownloadItemUtils {
         adapter: RecyclerView.Adapter<out RecyclerView.ViewHolder?>?, refreshCallback: EmptyCallback?
     ) {
         val apkEntity = gameEntity.getApk()[0]
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(apkEntity.url)
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
         if (downloadEntity != null) {
             val path = downloadEntity.path
             when {

app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt

@@ -8,21 +8,20 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.common.utils.getMetaExtra
 import com.gh.gamecenter.common.utils.isSimulatorGame
-import com.gh.gamecenter.common.utils.toJson
+import com.gh.gamecenter.common.utils.isVGame
 import com.gh.gamecenter.common.utils.tryCatchInRelease
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.core.utils.SpeedUtils
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
-import com.walkud.rom.checker.RomIdentifier
 
 object DownloadNotificationHelper {
 
@@ -34,9 +33,9 @@ object DownloadNotificationHelper {
 
     const val ACTION_INSTALL = "com.gh.gamecenter.INSTALL"
     const val ACTION_DOWNLOAD = "com.gh.gamecenter.DOWNLOAD"
+    const val ACTION_VDOWNLOAD = "com.gh.gamecenter.VDOWNLOAD"
 
     private val mNotifyMap: MutableMap<String, Long> = mutableMapOf()
-    private val mShouldUseAlternativeNotificationIcon by lazy { RomIdentifier.getRom().versionName == null }
 
     private fun getNotificationManager(): NotificationManager {
         return HaloApp.getInstance().application.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
@@ -55,9 +54,11 @@ object DownloadNotificationHelper {
 
         val intent = Intent()
         if (entity.status == DownloadStatus.done && xapkStatus != XapkUnzipStatus.FAILURE.name) {
-            intent.putExtra(EntranceConsts.KEY_DATA, entity.toJson())
+            intent.putExtra(EntranceConsts.KEY_URL, entity.url)
             intent.putExtra(EntranceConsts.KEY_PATH, entity.path)
             intent.action = ACTION_INSTALL
+        } else if (entity.isVGame()) {
+            intent.action = ACTION_VDOWNLOAD
         } else {
             intent.action = ACTION_DOWNLOAD
         }
@@ -119,6 +120,7 @@ object DownloadNotificationHelper {
                     || entity.status == DownloadStatus.hijack
                     || entity.status == DownloadStatus.unqualified
                     || entity.status == DownloadStatus.unavailable
+                    || entity.status == DownloadStatus.banned
                     || entity.status == DownloadStatus.uncertificated
                     || entity.status == DownloadStatus.notfound
                     || entity.status == DownloadStatus.overflow
@@ -193,6 +195,6 @@ object DownloadNotificationHelper {
     }
 
     private fun getNotificationIcon(): Int {
-        return if (mShouldUseAlternativeNotificationIcon) R.drawable.ic_download_notification else R.mipmap.logo
+        return R.mipmap.logo
     }
 }

app/src/main/java/com/gh/common/util/DownloadObserver.kt

@@ -15,9 +15,8 @@ import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.eventbus.EBShowDialog
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.MtaHelper
-import com.gh.gamecenter.core.utils.StringUtils
+import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.energy.utils.EnergyTaskHelper
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.SimpleGameEntity
 import com.gh.gamecenter.entity.SimulatorEntity
@@ -25,6 +24,7 @@ import com.gh.gamecenter.eventbus.EBDownloadStatus
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.setting.GameDownloadSettingFragment
 import com.gh.gamecenter.suggest.SuggestType
+import com.gh.vspace.VHelper
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DataWatcher
 import com.lightgame.download.DownloadEntity
@@ -115,14 +115,19 @@ object DownloadObserver {
                     downloadManager.cancel(downloadEntity.url)
                 } else if (DownloadStatus.unavailable == downloadEntity.status) {
                     // 未接入防沉迷系统
-                    val currentActivity = AppManager.getInstance().currentActivity() ?: return
+                    val currentActivity = AppManager.getInstance().currentActivity()
 
-                    DialogHelper.showDialog(
-                        context = currentActivity,
-                        title = "温馨提示",
-                        content = "该游戏未接入防沉迷系统，暂不支持下载",
-                        confirmText = "知道了",
-                        cancelText = "")
+                    if (currentActivity != null) {
+                        DialogHelper.showDialog(
+                            context = currentActivity,
+                            title = "温馨提示",
+                            content = "该游戏未接入防沉迷系统，暂不支持下载",
+                            confirmText = "知道了",
+                            cancelText = ""
+                        )
+                    } else {
+                        ToastUtils.toast("该游戏未接入防沉迷系统，暂不支持下载")
+                    }
 
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
@@ -131,6 +136,11 @@ object DownloadObserver {
                     // 未实名
                     RealNameHelper.showRealNameUncertificatedDialog(downloadEntity)
 
+                    // 删除任务
+                    downloadEntity.status = DownloadStatus.cancel
+                    downloadManager.cancel(downloadEntity.url)
+                }else if (DownloadStatus.banned == downloadEntity.status) {
+                    ToastUtils.showToast("网络异常")
                     // 删除任务
                     downloadEntity.status = DownloadStatus.cancel
                     downloadManager.cancel(downloadEntity.url)
@@ -210,10 +220,20 @@ object DownloadObserver {
                             )
                         )
                     downloadEntity.isPlugin -> Utils.toast(mApplication, downloadEntity.name + " - " + platform + " - 下载完成")
-                    else -> Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
+                    else -> {
+                        if (downloadEntity.isVGame()) {
+                            VHelper.showFloatingWindow(downloadEntity.packageName)
+                        } else {
+                            Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
+                        }
+                    }
                 }
             } else {
-                Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
+                if (downloadEntity.isVGame()) {
+                    VHelper.showFloatingWindow(downloadEntity.packageName)
+                } else {
+                    Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
+                }
             }
             if (!downloadEntity.isPluggable) {
                 if (downloadEntity.isSimulatorGame()) {
@@ -236,15 +256,13 @@ object DownloadObserver {
                 } else {
                     val downloadType = downloadEntity.getMetaExtra(Constants.EXTRA_DOWNLOAD_TYPE)
                     // 是否是自动安装
-                    val isAutoInstall = PreferenceManager.getDefaultSharedPreferences(mApplication).getBoolean(
-                        GameDownloadSettingFragment.AUTO_INSTALL_SP_KEY, true
-                    )
+                    val isAutoInstall = SPUtils.getBoolean(GameDownloadSettingFragment.AUTO_INSTALL_SP_KEY, true)
                     if (downloadType == Constants.SIMULATOR_DOWNLOAD || isAutoInstall) {
                         if (FileUtils.isEmptyFile(downloadEntity.path)) {
                             Utils.toast(mApplication, R.string.install_failure_hint)
                             downloadManager.cancel(downloadEntity.url)
                         } else {
-                            if (PackageUtils.isCanLaunchSetup(mApplication, downloadEntity.path)) {
+                            if (PackageUtils.isCanLaunchSetup(mApplication, downloadEntity.path) || downloadType == Constants.SMOOTH_GAME) {
                                 downloadEntity.meta[Constants.MARK_ALREADY_TRIGGERED_INSTALLATION] = "YES"
                                 tryWithDefaultCatch {
                                     PackageInstaller.install(mApplication, downloadEntity, false)
@@ -295,7 +313,7 @@ object DownloadObserver {
                     override fun onConfirm() {
                         val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity
                             ?: return
-                        DownloadManager.getInstance().cancel(downloadEntity.url, true, true)
+                        DownloadManager.getInstance().cancel(downloadEntity.url, true, true, false)
                         SimulatorDownloadManager.getInstance()
                             .showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME)
                     }
@@ -308,12 +326,20 @@ object DownloadObserver {
     private fun statDoneEvent(downloadEntity: DownloadEntity) {
         var type: ExposureUtils.DownloadType
         if (downloadEntity.isUpdate) {
-            type = ExposureUtils.DownloadType.UPDATE
-            if (downloadEntity.isPlugin) {
-                type = ExposureUtils.DownloadType.PLUGIN_UPDATE
+            if (downloadEntity.isVGame()) {
+                type = ExposureUtils.DownloadType.FUN_UPDATE
+            } else {
+                type = ExposureUtils.DownloadType.UPDATE
+                if (downloadEntity.isPlugin) {
+                    type = ExposureUtils.DownloadType.PLUGIN_UPDATE
+                }
             }
         } else {
-            type = ExposureUtils.DownloadType.DOWNLOAD
+            type = if (downloadEntity.isVGame()) {
+                ExposureUtils.DownloadType.FUN_DOWNLOAD
+            } else {
+                ExposureUtils.DownloadType.DOWNLOAD
+            }
         }
 
         if (downloadEntity.isPluggable) {

app/src/main/java/com/gh/common/util/EntranceUtils.java

@@ -25,7 +25,6 @@ import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
 import com.gh.gamecenter.common.constant.EntranceConsts;
 import com.gh.gamecenter.core.utils.ClassUtils;
 import com.gh.gamecenter.core.utils.GsonUtils;
-import com.gh.gamecenter.core.utils.RunningUtils;
 import com.gh.gamecenter.core.utils.SPUtils;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
@@ -41,9 +40,7 @@ public class EntranceUtils {
     public static void jumpActivity(Context context, Bundle bundle) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
 
-        //TODO 把其他类似的跳转启动逻辑也处理掉
-        if (RunningUtils.isRunning(context)
-                && MainActivity.class.getName().equals(RunningUtils.getBaseActivity(context))) {
+        if (HaloApp.getInstance().isRunningForeground) {
             // 应用正在运行，前台或后台
             String to = bundle.getString(KEY_TO);
             Class<?> clazz = ClassUtils.forName(to);
@@ -69,9 +66,7 @@ public class EntranceUtils {
     public static void jumpActivity(Context context, Bundle nextToBundle, Bundle bundle, Callback callback) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
 
-        //TODO 把其他类似的跳转启动逻辑也处理掉
-        if (RunningUtils.isRunning(context)
-                && MainActivity.class.getName().equals(RunningUtils.getBaseActivity(context))) {
+        if (HaloApp.getInstance().isRunningForeground) {
             // 应用正在运行，前台或后台
             String to = bundle.getString(KEY_TO);
             Class<?> clazz = ClassUtils.forName(to);

app/src/main/java/com/gh/common/util/ErrorHelper.kt

@@ -1,13 +1,28 @@
 package com.gh.common.util
 
+import android.app.Activity
 import android.content.Context
+import android.content.Intent
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.constant.Config
 import com.gh.gamecenter.R
+import com.gh.gamecenter.ShellActivity
+import com.gh.gamecenter.VerifyPhoneActivity
 import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
+import com.gh.gamecenter.common.avoidcallback.Callback
+import com.gh.gamecenter.common.callback.ConfirmListener
 import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.entity.ErrorEntity
+import com.halo.assistant.fragment.user.UserInfoEditFragment
+import com.halo.assistant.fragment.user.VerifyPhoneFragment
+import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils
 import retrofit2.HttpException
 
@@ -26,6 +41,7 @@ object ErrorHelper {
         context: Context,
         errorString: String?,
         showHighPriorityHint: Boolean = false,
+        realNameConfirmListener: ConfirmListener? = null,
         customizedHandler: (code: Int) -> Boolean
     ) {
         val errorEntity = errorString?.toObject<ErrorEntity>()
@@ -44,14 +60,14 @@ object ErrorHelper {
             return
         }
 
-        handleError(context, showHighPriorityHint, errorEntity)
+        handleError(context, showHighPriorityHint, errorEntity, realNameConfirmListener)
     }
 
     /**
      * [showHighPriorityHint] 用来标识有同样错误码可以触发两种处理时，为 true 时选择重要的
      */
     @JvmStatic
-    fun handleError(context: Context, errorString: String?, showHighPriorityHint: Boolean = false) {
+    fun handleError(context: Context, errorString: String?, showHighPriorityHint: Boolean = false, realNameConfirmListener: ConfirmListener? = null) {
         val errorEntity = errorString?.toObject<ErrorEntity>()
 
         if (errorEntity == null) {
@@ -64,7 +80,7 @@ object ErrorHelper {
             return
         }
 
-        handleError(context, showHighPriorityHint, errorEntity)
+        handleError(context, showHighPriorityHint, errorEntity, realNameConfirmListener)
     }
 
     /***
@@ -87,7 +103,8 @@ object ErrorHelper {
     private fun handleError(
         context: Context,
         showHighPriorityHint: Boolean = false,
-        errorEntity: ErrorEntity
+        errorEntity: ErrorEntity,
+        realNameConfirmListener: ConfirmListener? = null
     ) {
         when (errorEntity.code) {
             403050,
@@ -144,17 +161,7 @@ object ErrorHelper {
             403115 -> Utils.toast(context, "请求太频繁了,稍微休息一下")
             403119 -> Utils.toast(context, "不能重复修改实名")
 
-            403020 -> if (showHighPriorityHint) {
-                DialogHelper.showDialog(
-                    context,
-                    "提醒",
-                    "提问过于频繁，请先休息一下哦",
-                    "知道了", "",
-                    extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-                )
-            } else {
-                Utils.toast(context, R.string.comment_failed_toofrequent)
-            }
+            403020 -> handleAskFrequentlyError(context, showHighPriorityHint)
 
             403021 -> Utils.toast(context, R.string.comment_failed_illegal)
 
@@ -163,10 +170,110 @@ object ErrorHelper {
             400802 -> {
                 // 多设备登录同一帐号，不需要这里处理
             }
+
+            403209 -> handleRealNameError(context, errorEntity, realNameConfirmListener)
+
+            403210 -> handleVerifyPhoneError(context, errorEntity, realNameConfirmListener)
+
             else -> Utils.toast(context, R.string.post_failure_hint)
         }
     }
 
+    private fun handleAskFrequentlyError(context: Context, showHighPriorityHint: Boolean) {
+        if (showHighPriorityHint) {
+            DialogHelper.showDialog(
+                context,
+                "提醒",
+                "提问过于频繁，请先休息一下哦",
+                "知道了", "",
+                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
+            )
+        } else {
+            Utils.toast(context, R.string.comment_failed_toofrequent)
+        }
+    }
+
+    private fun handleRealNameError(context: Context, errorEntity: ErrorEntity, realNameConfirmListener: ConfirmListener?) {
+        DialogHelper.showDialog(
+            context,
+            "实名提醒",
+            errorEntity.data?.title ?: "",
+            "前往实名认证", "以后再说",
+            uiModificationCallback = { binding ->
+                binding.hintTv.visibility = View.VISIBLE
+                binding.hintTv.layoutParams =
+                    (binding.hintTv.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 8F.dip2px(), 0, 0) }
+                binding.lineView.layoutParams =
+                    (binding.lineView.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 23F.dip2px(), 0, 0) }
+                binding.hintTv.text = errorEntity.data?.text
+                binding.hintTv.setTextColor(R.color.theme_font.toColor(context))
+                binding.hintTv.setOnClickListener {
+                    errorEntity.data?.toLinkEntity()?.let { entity ->
+                        DirectUtils.directToLinkPage(context, entity, "实名提醒弹窗", "")
+                    }
+                }
+            },
+            confirmClickCallback = {
+                val currentActivity = AppManager.getInstance().currentActivity() ?: return@showDialog
+                AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
+                    .startForResult(
+                        ShellActivity.getIntent(
+                            context,
+                            ShellActivity.Type.REAL_NAME_INFO,
+                        ), object : Callback {
+                            override fun onActivityResult(resultCode: Int, data: Intent?) {
+                                if (resultCode == Activity.RESULT_OK && data != null) {
+                                    val isAuthSuccess =
+                                        data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false)
+                                    if (isAuthSuccess) {
+                                        realNameConfirmListener?.onConfirm()
+                                    }
+                                }
+                            }
+                        })
+            }
+        )
+    }
+
+    private fun handleVerifyPhoneError(context: Context, errorEntity: ErrorEntity, realNameConfirmListener: ConfirmListener?) {
+        DialogHelper.showDialog(
+            context,
+            "手机号验证",
+            errorEntity.data?.title ?: "",
+            "前往手机号验证", "以后再说",
+            uiModificationCallback = { binding ->
+                binding.hintTv.visibility = View.VISIBLE
+                binding.hintTv.layoutParams =
+                    (binding.hintTv.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 8F.dip2px(), 0, 0) }
+                binding.lineView.layoutParams =
+                    (binding.lineView.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(0, 23F.dip2px(), 0, 0) }
+                binding.hintTv.text = errorEntity.data?.text
+                binding.hintTv.setTextColor(R.color.theme_font.toColor(context))
+                binding.hintTv.setOnClickListener {
+                    errorEntity.data?.toLinkEntity()?.let { entity ->
+                        DirectUtils.directToLinkPage(context, entity, "手机号验证", "")
+                    }
+                }
+            },
+            confirmClickCallback = {
+                val currentActivity = AppManager.getInstance().currentActivity() ?: return@showDialog
+                AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity)
+                    .startForResult(
+                        VerifyPhoneActivity.getIntent(context), object : Callback {
+                            override fun onActivityResult(resultCode: Int, data: Intent?) {
+                                if (resultCode == Activity.RESULT_OK && data != null) {
+                                    val isVerifySuccess =
+                                        data.getBooleanExtra(VerifyPhoneFragment.VERIFY_SUCCESS, false)
+                                    if (isVerifySuccess) {
+                                        realNameConfirmListener?.onConfirm()
+                                    }
+                                }
+                            }
+                        })
+            }
+        )
+    }
+
     private fun handleErrorWithGameCollectionBannedDialog(context: Context, errorEntity: ErrorEntity?) {
         val bannedType = if (errorEntity?.data?.alwaysBlock == true) {
             ""
@@ -248,6 +355,9 @@ object ErrorHelper {
                 errorEntity?.code == 403099 -> {
                     Utils.toast(context, "当前账号正在注销，禁止登录")
                 }
+                errorEntity?.code == 403401 -> {//禁止登录
+                    Utils.toast(context, "网络异常")
+                }
                 errorEntity?.toast?.isNotEmpty() == true -> {
                     Utils.toast(context, errorEntity.toast)
                 }

app/src/main/java/com/gh/common/util/FloatingBackViewManager.kt

@@ -7,7 +7,7 @@ import android.widget.TextView
 import com.gh.gamecenter.R
 import com.gh.gamecenter.common.utils.dip2px
 import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.energy.EnergyCenterActivity
+import com.gh.gamecenter.energy.view.EnergyCenterActivity
 import com.lightgame.utils.Util_System_Keyboard
 import com.lzf.easyfloat.EasyFloat
 import com.lzf.easyfloat.enums.ShowPattern

app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt

@@ -5,7 +5,6 @@ import android.content.Context
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.DefaultJsApi
-import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.dialog.CertificationDialog
 import com.gh.common.exposure.ExposureEvent
 import com.gh.common.exposure.ExposureManager
@@ -13,28 +12,31 @@ import com.gh.common.exposure.ExposureSource
 import com.gh.common.exposure.ExposureType
 import com.gh.common.history.HistoryHelper
 import com.gh.common.repository.ReservationRepository
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
-import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.retrofit.ApiResponse
+import com.gh.gamecenter.common.retrofit.EmptyResponse
+import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.DataLogUtils
+import com.gh.gamecenter.common.utils.DialogHelper
 import com.gh.gamecenter.common.utils.observableToMain
 import com.gh.gamecenter.common.utils.singleToMain
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.core.utils.*
+import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
+import com.gh.gamecenter.core.runOnUiThread
+import com.gh.gamecenter.core.utils.EmptyCallback
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.PluginLocation
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
-import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.common.retrofit.EmptyResponse
-import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
-import com.gh.gamecenter.common.retrofit.ApiResponse
-import com.gh.gamecenter.common.utils.DataLogUtils
+import com.gh.vspace.VHelper
 import com.lightgame.download.FileUtils
 
 /**
@@ -165,52 +167,39 @@ object GameActivityDownloadHelper {
         traceEvent: ExposureEvent
     ) {
         val apk = getApk(gameEntity, event, true) ?: return
-        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(apk.url)
+        val downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity)
         if (downloadEntity != null) {
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             val str = GameUtils.getDownloadBtnText(context, gameEntity, PluginLocation.only_game)
-            if (str == context.getString(R.string.download)) {
-                GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
-                    override fun onConfirm() {
-                        CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
-                            override fun onConfirm() {
-                                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                    download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
-                                }
-                            }
-                        })
+            if (str == context.getString(R.string.download) || str == context.getString(R.string.attempt)) {
+                GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
+                    CertificationDialog.showCertificationDialog(context, gameEntity) {
+                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                            download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
+                        }
                     }
-                })
+                }
                 DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
-            } else if (str == context.getString(R.string.attempt)) {
-                RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback {
-                    override fun onCallback() {
-                        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
-                            override fun onConfirm() {
-                                CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
-                                    override fun onConfirm() {
-                                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                            download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
-                                        }
-                                    }
-                                })
+            } else if (str == context.getString(R.string.smooth)) {
+                VHelper.validateVSpaceBeforeAction(context, gameEntity, true) {
+                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
+                        CertificationDialog.showCertificationDialog(context, gameEntity) {
+                            DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                                download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                             }
-                        })
+                        }
                     }
-                })
-                DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
+                }
             } else if (str.contains("化")) {
                 if (gameEntity.pluggableCollection != null) {
                     DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
                 } else {
-                    CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
-                        override fun onConfirm() {
-                            DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
-                            }
+                    CertificationDialog.showCertificationDialog(context, gameEntity) {
+                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                            plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
                         }
-                    })
+                    }
                 }
             } else if (str == context.getString(R.string.install) || str == context.getString(R.string.launch)) {
                 ToastUtils.toast("${gameEntity.name}已加入下载队列")
@@ -275,11 +264,8 @@ object GameActivityDownloadHelper {
     ) {
         val msg = FileUtils.isCanDownload(context, apk.size)
         if (TextUtils.isEmpty(msg)) {
-            DownloadManager.createDownload(
-                context, apk, gameEntity, context.getString(
-                    R.string.download
-                ), entrance, location, isSubscribe, traceEvent
-            )
+            DownloadManager.createDownload(context, apk, gameEntity, context.getString(
+                R.string.download), entrance, location, isSubscribe, traceEvent)
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             ToastUtils.toast(msg)
@@ -383,8 +369,7 @@ object GameActivityDownloadHelper {
                 if (PackageUtils.isInstalled(context, apk.packageName)) {
                     // 是否可更新
                     if (PackageUtils.isCanUpdate(apk, event.gameId)
-                        || PackageUtils.isNonPluginUpdatable(apk, gameEntity)
-                    ) {
+                        || PackageUtils.isNonPluginUpdatable(apk, gameEntity)) {
                         handler.complete(false)
                     } else {
                         // 已安装且无更新

app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt

@@ -9,7 +9,7 @@ import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectEntity
-import com.gh.gamecenter.manager.UserManager
+import com.gh.gamecenter.login.user.UserManager
 import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager

app/src/main/java/com/gh/common/util/GameUtils.java

@@ -5,6 +5,7 @@ import android.graphics.Color;
 import android.text.TextUtils;
 import android.widget.TextView;
 
+import com.gh.common.view.DownloadButton;
 import com.gh.gamecenter.core.AppExecutor;
 import com.gh.common.constant.Config;
 import com.gh.common.simulator.SimulatorGameManager;
@@ -18,6 +19,7 @@ import com.gh.gamecenter.entity.GameUpdateEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.manager.PackagesManager;
+import com.gh.vspace.VHelper;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.DownloadStatus;
 
@@ -54,21 +56,19 @@ public class GameUtils {
     /**
      * 设置下载按钮状态
      */
-    public static void setDownloadBtnStatus(Context context, GameEntity gameEntity, TextView downloadBtn, PluginLocation pluginLocation) {
+    public static void setDownloadBtnStatus(Context context, GameEntity gameEntity, DownloadButton downloadBtn, PluginLocation pluginLocation) {
         // getDownloadBtnText 里包括查询数据库、根据包名读取包体 meta 信息等
         AppExecutor.getLightWeightIoExecutor().execute(() -> {
             String status = getDownloadBtnText(context, gameEntity, pluginLocation);
             AppExecutor.getUiExecutor().execute(() -> {
-                // TODO 切换线程时可能存在页面已销毁 view 已不存在这些乱七八糟的问题
-                downloadBtn.setTextColor(Color.WHITE);
                 downloadBtn.setText(status);
                 if (context.getString(R.string.pluggable).equals(status)) {
-                    downloadBtn.setBackgroundResource(R.drawable.download_button_pluggable_style);
+                    downloadBtn.setButtonStyle(DownloadButton.ButtonStyle.PLUGIN);
                     String pluginDesc = gameEntity.getPluginDesc();
                     if (pluginDesc.length() > 3) pluginDesc = pluginDesc.substring(0, 3);
                     downloadBtn.setText((pluginDesc + "化"));
                 } else {
-                    downloadBtn.setBackgroundResource(R.drawable.download_button_normal_style);
+                    downloadBtn.setButtonStyle(DownloadButton.ButtonStyle.NORMAL);
                 }
             });
         });
@@ -90,7 +90,7 @@ public class GameUtils {
 
         boolean isRelatedEmulatorInstalled = false; // 若该游戏是模拟器游戏时其对应的模拟器是否已经安装
 
-        DownloadEntity downloadEntity;
+        DownloadEntity downloadEntity = null;
         Object gh_id;
         apkFor:
         for (ApkEntity apkEntity : gameEntity.getApk()) {
@@ -105,7 +105,13 @@ public class GameUtils {
                 }
             }
 
-            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(apkEntity.getUrl());
+            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshot(gameEntity);
+
+            // 在下载管理找不到下载实体，并且为畅玩游戏的时候到畅玩数据库里找
+            if (downloadEntity == null && gameEntity.isVGame()) {
+                downloadEntity = VHelper.getDownloadEntitySnapshot(gameEntity.getId(), apkEntity.getPackageName());
+            }
+
             if (downloadEntity != null) {
                 if (downloadEntity.getStatus().equals(DownloadStatus.done)) {
                     doneCount++;
@@ -149,6 +155,19 @@ public class GameUtils {
             return context.getString(R.string.launch);
         }
 
+        if (gameEntity.isVGame()) {
+            // 如果 doneCount 为 0 或者数据库为空
+            // 表明本地并没有此游戏的数据库数据，需要重新下载
+            if (doneCount == 0
+                    || downloadEntity == null
+                    || !VHelper.isInstalled(downloadEntity.getPackageName())) {
+                installCount = 0;
+            } else {
+                doneCount = 0;
+                installCount = 1;
+            }
+        }
+
         if (doneCount != 0) {
             return context.getString(R.string.install);
         } else if (pluginCount != 0 && !SimulatorGameManager.isSimulatorGame(gameEntity)) {
@@ -160,50 +179,11 @@ public class GameUtils {
         } else if ("demo".equals(gameEntity.getDownloadStatus())) {
             return context.getString(R.string.attempt);
         } else {
-            return context.getString(R.string.download);
-        }
-    }
-
-    /**
-     * 获取简单的下载按钮文案，只需要知道是否已下载，是否已安装
-     */
-    public static String getSimpleDownloadBtnText(Context context, GameEntity gameEntity) {
-        int doneCount = 0;      // 下载完成数量
-        int installCount = 0;   // 已安装数量
-
-        DownloadEntity downloadEntity;
-        Object gh_id;
-        apkFor:
-        for (ApkEntity apkEntity : gameEntity.getApk()) {
-            // filter by packageName
-            SettingsEntity settings = Config.getSettings();
-            if (settings != null && gameEntity.getApk().size() > 1) {
-                for (String pkgName : settings.getGameDownloadBlackList()) {
-                    if (pkgName.equals(apkEntity.getPackageName())) {
-                        continue apkFor;
-                    }
-                }
+            if (gameEntity.isVGame()) {
+                return context.getString(R.string.smooth);
+            } else {
+                return context.getString(R.string.download);
             }
-
-            downloadEntity = DownloadManager.getInstance().getDownloadEntitySnapshotByUrl(apkEntity.getUrl());
-            if (downloadEntity != null) {
-                if (downloadEntity.getStatus().equals(DownloadStatus.done)) {
-                    doneCount++;
-                }
-            }
-            if (PackagesManager.INSTANCE.isInstalled(apkEntity.getPackageName())) {
-                gh_id = PackageUtils.getMetaData(context, apkEntity.getPackageName(), "gh_id");
-                if (gh_id == null || gh_id.equals(gameEntity.getId())) {
-                    installCount++;
-                }
-            }
-        }
-        if (doneCount != 0) {
-            return context.getString(R.string.install);
-        } else if (installCount != 0) {
-            return context.getString(R.string.launch);
-        } else {
-            return context.getString(R.string.download);
         }
     }
 

app/src/main/java/com/gh/common/util/HomeBottomBarHelper.kt

@@ -3,7 +3,7 @@ package com.gh.common.util
 import com.gh.gamecenter.core.utils.GsonUtils
 import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.common.utils.toJson
-import com.gh.gamecenter.entity.Display
+import com.gh.gamecenter.common.entity.Display
 import com.gh.gamecenter.entity.SubjectRecommendEntity
 import com.halo.assistant.HaloApp