From 389853ce971a3da0e806dddd909bb43f5928c90c Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 15 九月 2020 19:31:53 +0800
Subject: [PATCH] 路线采集ui
---
app/src/main/res/layout/layout_input_dlg.xml | 64 +++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 32 +
app/src/main/res/drawable/bg_item_select.xml | 6
app/src/main/res/values/colors.xml | 1
app/src/main/java/safeluck/drive/evaluation/widget/MyWidgetDialog.java | 186 ++++++++++
app/src/main/java/safeluck/drive/evaluation/customview/SelectDialogThree.java | 8
app/src/main/java/safeluck/drive/evaluation/fragment/shop/ContentFragment.java | 23
app/src/main/res/layout/layout_train_fragment.xml | 7
app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java | 39 +-
app/src/main/res/layout/dialog_status.xml | 69 +++
app/src/main/java/safeluck/drive/evaluation/widget/StatusDialog.java | 171 +++++++++
app/src/main/res/mipmap-xxhdpi/icon_dialog_success.png | 0
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java | 16
app/src/main/res/values/dimens.xml | 12
app/src/main/res/layout/layout_select_dlg_three.xml | 10
app/src/main/res/mipmap-xxhdpi/icon_dialog_error.png | 0
app/src/main/java/safeluck/drive/evaluation/fragment/shop/MenuListFragment.java | 4
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/BaseSettingFragment.java | 12
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 1
app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java | 12
app/src/main/res/drawable/background_alert_dialog.xml | 6
app/src/main/res/layout/layout_project_collect.xml | 161 ++++++++
app/src/main/res/layout/fragment_content.xml | 11
app/src/main/res/drawable/btn_item_collect_bg.xml | 5
app/src/main/res/layout/layout_road_collect.xml | 49 ++
app/src/main/java/safeluck/drive/evaluation/customview/MyInputDialog.kt | 133 +++++++
26 files changed, 983 insertions(+), 55 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 4d41694..a265048 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -259,6 +259,7 @@
}
+
@Override
protected void onDestroy() {
super.onDestroy();
diff --git a/app/src/main/java/safeluck/drive/evaluation/customview/MyInputDialog.kt b/app/src/main/java/safeluck/drive/evaluation/customview/MyInputDialog.kt
new file mode 100644
index 0000000..ae84c75
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/MyInputDialog.kt
@@ -0,0 +1,133 @@
+package safeluck.drive.evaluation.customview
+
+import android.app.Dialog
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Build
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
+import android.util.DisplayMetrics
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import android.widget.Button
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textfield.TextInputLayout
+import safeluck.drive.evaluation.R
+
+/**
+ *
+ * @ProjectName: DriveJudge
+ * @Package: safeluck.drive.evaluation.customview
+ * @ClassName: MyDialog
+ * @Description: java绫讳綔鐢ㄦ弿杩�
+ * @Author: 鏉庡崰浼�
+ * @CreateDate: 2020-04-29 16:46
+ * @UpdateUser: 鏇存柊鑰�
+ * @UpdateDate: 2020-04-29 16:46
+ * @UpdateRemark: 鏇存柊璇存槑
+ * @Version: 1.0
+ */
+
+class MyInputDialog : DialogFragment() {
+ lateinit var button: Button
+ lateinit var button_cancle: Button
+ lateinit var textInput: TextInputEditText
+ lateinit var textInputLayout: TextInputLayout
+ var mess: String? = null
+ lateinit var onClick:MyOnClickListener
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ if(dialog!=null){
+ var windown = dialog!!.window;
+ windown?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+ windown?.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+ dialog?.setOnShowListener { windown?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
+ hideBottomUIMenu()}
+ }
+ var view = inflater.inflate(R.layout.layout_input_dlg,container,false)
+ initView(view)
+
+ return view
+ }
+ override fun onStart() {
+ super.onStart()
+ val dialog: Dialog? = dialog
+ if (dialog != null) {
+ val dm = DisplayMetrics()
+ activity!!.windowManager.defaultDisplay.getMetrics(dm)
+ var width:Int = (dm.widthPixels * 0.5).toInt()
+
+ dialog.window.setLayout(width , ViewGroup.LayoutParams.WRAP_CONTENT)
+ }
+ }
+ private fun initView(view: View?) {
+ mess = arguments?.getString("message")
+ button = view!!.findViewById(R.id.btn_sure_)
+ textInput = view!!.findViewById(R.id.tiet_road_num)
+
+ textInput.addTextChangedListener(object : TextWatcher {
+ override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+ override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+ override fun afterTextChanged(s: Editable?) {
+ if (textInput.text?.length!! > 0) {
+ textInputLayout.isErrorEnabled = false
+ }
+ }
+ })
+
+ textInputLayout = view!!.findViewById(R.id.til_password)
+ button_cancle = view!!.findViewById(R.id.btn_cancle_)
+ button.setOnClickListener {
+ var str = textInput.text.toString().trim()
+ if (!TextUtils.isEmpty(str)) {
+ onClick.onSure(str)
+ dismiss()
+ } else {
+ textInputLayout.error = "绾胯矾鍚嶇О涓嶈兘涓虹┖"
+ }
+ }
+ button_cancle.setOnClickListener {
+ onClick.onCancle()
+ dismiss()
+ }
+
+ }
+
+ /**
+ * 闅愯棌铏氭嫙鎸夐敭锛屽苟涓斿叏灞�
+ */
+ protected fun hideBottomUIMenu() { //闅愯棌铏氭嫙鎸夐敭锛屽苟涓斿叏灞�
+ if (Build.VERSION.SDK_INT > 11 && Build.VERSION.SDK_INT < 19) { // lower api
+ val v = this.dialog?.window?.decorView
+ v?.systemUiVisibility = View.GONE
+ } else if (Build.VERSION.SDK_INT >= 19) { //for new api versions.
+ val decorView = dialog?.window?.decorView
+ val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+ or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY or View.SYSTEM_UI_FLAG_FULLSCREEN)
+ decorView?.systemUiVisibility = uiOptions
+ }
+ }
+
+ companion object{
+ fun newInstance(message:String):MyInputDialog{
+ var myDialog= MyInputDialog()
+ var bundle = Bundle()
+ bundle.putString("message",message)
+ myDialog.arguments = bundle
+ return myDialog
+
+ }
+ }
+
+ interface MyOnClickListener{
+ fun onSure(string: String)
+ fun onCancle()
+ }
+
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/safeluck/drive/evaluation/customview/SelectDialogThree.java b/app/src/main/java/safeluck/drive/evaluation/customview/SelectDialogThree.java
index 31d1819..8d290b5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/customview/SelectDialogThree.java
+++ b/app/src/main/java/safeluck/drive/evaluation/customview/SelectDialogThree.java
@@ -45,9 +45,10 @@
public static final int FIRST = 0;
public static final int SECOND = 1;
public static final int THIRD = 2;
+ public static final int FORTH= 3;
public static final int SELECT_NONE = -1;
private int result = SELECT_NONE;
- private RadioButton rb_1,rb_2,rb_3;
+ private RadioButton rb_1,rb_2,rb_3,rb_4;
private ArrayList<String> stringArrayList;
@@ -82,10 +83,12 @@
rb_1 = view.findViewById(R.id.rb1);
rb_2 = view.findViewById(R.id.rb2);
rb_3 = view.findViewById(R.id.rb3);
+ rb_4 = view.findViewById(R.id.rb4);
if (stringArrayList != null){
rb_1.setText(stringArrayList.get(0));
rb_2.setText(stringArrayList.get(1));
rb_3.setText(stringArrayList.get(2));
+ rb_4.setText(stringArrayList.get(3));
}
rgb = view.findViewById(R.id.radiogroub);
rgb.setOnCheckedChangeListener((RadioGroup group, int checkedId)-> {
@@ -101,6 +104,9 @@
case R.id.rb3:
result = THIRD;
break;
+ case R.id.rb4:
+ result = FORTH;
+ break;
default:break;
}
});
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
index ca8b992..5d1d90e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/HomeFragment.java
@@ -24,6 +24,7 @@
import safeluck.drive.evaluation.R;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.customview.MyDialog;
+import safeluck.drive.evaluation.customview.MyInputDialog;
/**
@@ -110,25 +111,25 @@
break;
case R.id.exit_sys:
- MyDialog myDialog = MyDialog.Companion.newInstance("鎮ㄥ皢閫�鍑虹郴缁�,璇风‘璁ゆ暟鎹凡淇濆瓨");
-
- myDialog.setOnClick(new MyDialog.MyOnClickListener() {
- @Override
- public void onSure() {
- AYSdk.getInstance().uninit();
- _mActivity.finish();
- System.exit(0);
-
-
- }
-
- @Override
- public void onCancle() {
-
- }
- });
-
- myDialog.show(getFragmentManager(),"mydialog");
+// MyDialog myDialog = MyDialog.Companion.newInstance("鎮ㄥ皢閫�鍑虹郴缁�,璇风‘璁ゆ暟鎹凡淇濆瓨");
+//
+// myDialog.setOnClick(new MyDialog.MyOnClickListener() {
+// @Override
+// public void onSure() {
+// AYSdk.getInstance().uninit();
+// _mActivity.finish();
+// System.exit(0);
+//
+//
+// }
+//
+// @Override
+// public void onCancle() {
+//
+// }
+// });
+//
+// myDialog.show(getFragmentManager(),"mydialog");
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index 46d1402..2e54272 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -66,6 +66,7 @@
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
+import safeluck.drive.evaluation.customview.MyInputDialog;
import safeluck.drive.evaluation.customview.QRCodeDialog;
import safeluck.drive.evaluation.customview.SelectDialog;
import safeluck.drive.evaluation.customview.SelectDialogThree;
@@ -75,6 +76,7 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0204;
import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
import safeluck.drive.evaluation.util.Utils;
+import safeluck.drive.evaluation.widget.StatusDialog;
/**鍗曟満璁粌UI
* MyApplication2
@@ -575,15 +577,17 @@
// //TODO 鍙戦�丣KMessage0202 缁欏钩鍙帮紝寮�濮嬭�冭瘯
if (btn_start_exam.getText().toString().equalsIgnoreCase("寮�濮嬭缁�")){
- SelectDialogThree selectDialog = SelectDialogThree.newInstance("鍦哄湴璁粌","閬撹矾璁粌","閬撹矾璁粌(涓嶅惈鐏厜)");
+ SelectDialogThree selectDialog = SelectDialogThree.newInstance("鍦哄湴璁粌","閬撹矾璁粌","閬撹矾璁粌(涓嶅惈鐏厜)","绾胯矾閲囬泦");
selectDialog.setSelectedListener((int res)->{
if (res != SelectDialog.SELECT_NONE){
if (res== SelectDialogThree.FIRST){
sendJK0202(2);
}else if (res== SelectDialogThree.SECOND){
sendJK0202(3);
- }else {
+ }else if (res == SelectDialogThree.THIRD){
sendJK0202(4);
+ }else{
+ Toast.makeText(_mActivity, "绾胯矾閲囬泦", Toast.LENGTH_SHORT).show();
}
}
});
@@ -599,10 +603,28 @@
case R.id.view_map:
- String url = getArcGisUrl(ExamPlatformData.getInstance().getExamType());
- Log.i(TAG,"map head lulao gps url="+url);
- startArcGisMapFragment(url);
+// String url = getArcGisUrl(ExamPlatformData.getInstance().getExamType());
+// Log.i(TAG,"map head lulao gps url="+url);
+// startArcGisMapFragment(url);
+// StatusDialog.with(_mActivity).setCancelable(true).setPrompt("鍔犺浇涓紝璇风◢鍚�...").setType(StatusDialog.Type.PROGRESS).show();
+ MyInputDialog myDialog = MyInputDialog.Companion.newInstance("鎮ㄥ皢閫�鍑虹郴缁�,璇风‘璁ゆ暟鎹凡淇濆瓨");
+
+ myDialog.setOnClick(new MyInputDialog.MyOnClickListener() {
+ @Override
+ public void onSure(String string) {
+
+ Log.i(TAG,"鏀跺埌鐨勶細"+string);
+
+ }
+
+ @Override
+ public void onCancle() {
+
+ }
+ });
+
+ myDialog.show(getFragmentManager(),"mydialog");
break;
case R.id.iv_head:
MyLog.i(TAG,"瀛﹀憳绛惧埌");
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/BaseSettingFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/BaseSettingFragment.java
new file mode 100644
index 0000000..99ea993
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/BaseSettingFragment.java
@@ -0,0 +1,12 @@
+package safeluck.drive.evaluation.fragment.rulefragments;
+
+import me.yokeyword.fragmentation.SupportFragment;
+
+/**
+ * DriveJudge
+ * Created by lzw on 2020/9/14. 10:22:25
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+class BaseSettingFragment extends SupportFragment {
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/LargeItemSettingFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java
similarity index 81%
rename from app/src/main/java/safeluck/drive/evaluation/fragment/LargeItemSettingFragment.java
rename to app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java
index cfd1bdb..8420598 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/LargeItemSettingFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting0.java
@@ -1,4 +1,4 @@
-package safeluck.drive.evaluation.fragment;
+package safeluck.drive.evaluation.fragment.rulefragments;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -16,7 +16,7 @@
/**
* Created by YoKeyword on 16/2/7.
*/
-public class LargeItemSettingFragment extends SupportFragment {
+public class FragmentSetting0 extends SupportFragment {
private static final String ARG_NUMBER = "arg_number";
private Toolbar mToolbar;
@@ -25,10 +25,10 @@
private int mNumber;
- public static LargeItemSettingFragment newInstance(int number) {
- LargeItemSettingFragment fragment = new LargeItemSettingFragment();
+ public static FragmentSetting0 newInstance(String number) {
+ FragmentSetting0 fragment = new FragmentSetting0();
Bundle args = new Bundle();
- args.putInt(ARG_NUMBER, number);
+ args.putInt(ARG_NUMBER, Integer.parseInt(number));
fragment.setArguments(args);
return fragment;
}
@@ -38,7 +38,7 @@
super.onCreate(savedInstanceState);
Bundle args = getArguments();
if (args != null) {
- mNumber = args.getInt(ARG_NUMBER);
+ mNumber =Integer.parseInt(args.getString(ARG_NUMBER)) ;
}
}
@@ -65,13 +65,13 @@
mBtnNext.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- start(LargeItemSettingFragment.newInstance(mNumber + 1));
+ start(FragmentSetting0.newInstance(mNumber + 1+""));
}
});
mBtnNextWithFinish.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startWithPop(LargeItemSettingFragment.newInstance(mNumber + 1));
+ startWithPop(FragmentSetting0.newInstance(mNumber + 1+""));
}
});
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java
new file mode 100644
index 0000000..7839fad
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/rulefragments/FragmentSetting1.java
@@ -0,0 +1,12 @@
+package safeluck.drive.evaluation.fragment.rulefragments;
+
+import me.yokeyword.fragmentation.SupportFragment;
+
+/**
+ * DriveJudge
+ * Created by lzw on 2020/9/14. 10:16:39
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class FragmentSetting1 extends SupportFragment {
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/shop/ContentFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/shop/ContentFragment.java
index 2ee1c05..9a21a8e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/shop/ContentFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/shop/ContentFragment.java
@@ -44,6 +44,16 @@
if (args != null) {
mMenu = args.getString(ARG_MENU);
}
+ switch (mMenu){
+ case "妗ｄ綅鐩稿叧璁剧疆":
+ break;
+ case "甯哥敤鍙傛暟璁剧疆":
+ break;
+ case "閫氱敤璇勫垽璁剧疆":
+ break;
+ case "涓婅溅璧锋璁剧疆":
+ break;
+ }
}
@Override
@@ -60,20 +70,9 @@
}
private void initView(View view) {
- mTvContent = (TextView) view.findViewById(R.id.tv_content);
- mBtnNext = (Button) view.findViewById(R.id.btn_next);
+// mTvContent = (TextView) view.findViewById(R.id.tv_content);
- mTvContent.setText("Content:\n" + mMenu);
- mBtnNext.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- // 鍜孧sgFragment鍚岀骇鍒殑璺宠浆 浜ょ粰MsgFragment澶勭悊
- if (getParentFragment() instanceof ShopFragment) {
-// ((ShopFragment) getParentFragment()).start(CycleFragment.newInstance(1));
- }
- }
- });
}
@Override
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/shop/MenuListFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/shop/MenuListFragment.java
index becab68..ffd120c 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/shop/MenuListFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/shop/MenuListFragment.java
@@ -94,7 +94,6 @@
mAdapter.setItemChecked(0);
}
}
-
private void showContent(int position) {
if (position == mCurrentPosition) {
return;
@@ -105,8 +104,9 @@
mAdapter.setItemChecked(position);
ContentFragment fragment = ContentFragment.newInstance(mMenus.get(position));
-
((ShopFragment) getParentFragment()).switchContentFragment(fragment);
+
+
}
@Override
diff --git a/app/src/main/java/safeluck/drive/evaluation/widget/MyWidgetDialog.java b/app/src/main/java/safeluck/drive/evaluation/widget/MyWidgetDialog.java
new file mode 100644
index 0000000..9a3fa65
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/widget/MyWidgetDialog.java
@@ -0,0 +1,186 @@
+package safeluck.drive.evaluation.widget;
+
+import android.app.Dialog;
+import android.content.res.Configuration;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
+
+
+/**
+ * DriveJudge
+ * Created by lzw on 2020/9/15. 10:49:12
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class MyWidgetDialog extends DialogFragment {
+
+
+ protected DialogParams mDialogParams;
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ Window window = getDialog().getWindow();
+ WindowManager.LayoutParams params = window.getAttributes();
+ params.width = WindowManager.LayoutParams.WRAP_CONTENT;
+ params.height = WindowManager.LayoutParams.WRAP_CONTENT;
+ hideBottomUIMenu();
+ window.setAttributes(params);
+ }
+
+ protected void show(AppCompatActivity activity,String tag){
+ if (!TextUtils.isEmpty(tag)){
+ show(activity.getSupportFragmentManager(),tag);
+ }else{
+ show(activity.getSupportFragmentManager(),activity.getClass().getSimpleName());
+ }
+ }
+ /**
+ * 闅愯棌铏氭嫙鎸夐敭锛屽苟涓斿叏灞�
+ */
+ protected void hideBottomUIMenu() { //闅愯棌铏氭嫙鎸夐敭锛屽苟涓斿叏灞�
+ if (Build.VERSION.SDK_INT > 11 && Build.VERSION.SDK_INT < 19) { // lower api
+ View v = getDialog().getWindow().getDecorView();
+ v.setSystemUiVisibility(View.GONE);
+ } else if (Build.VERSION.SDK_INT >= 19) { //for new api versions.
+ View decorView =getDialog().getWindow().getDecorView();
+ int uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY | View.SYSTEM_UI_FLAG_FULLSCREEN);
+ decorView.setSystemUiVisibility(uiOptions);
+ }
+ }
+ protected boolean isNonEmpty(String content) {
+ return !TextUtils.isEmpty(content);
+ }
+
+ @Override
+ public void onConfigurationChanged(Configuration newConfig) {
+ dismiss();
+ super.onConfigurationChanged(newConfig);
+ }
+
+ @NonNull
+ @Override
+ public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+ View dialogLayout = LayoutInflater.from(getContext()).inflate(setLayoutRes(),null);
+ builder.setView(dialogLayout);
+ onViewCreated(dialogLayout, null);
+ return builder.create();
+ }
+
+ public class DialogParams {
+ AppCompatActivity activity;
+ int style;
+ int animations;
+ int contentView;
+ String tag;
+ boolean isCancelable;
+ String prompt;
+ int type = -1;
+ }
+ protected int setLayoutRes() {
+ return mDialogParams.contentView;
+ }
+ @StyleRes
+ protected int setAnimations() {
+ return mDialogParams.animations;
+ }
+
+
+ @Nullable
+ @Override
+ public final View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+ getDialog().setCanceledOnTouchOutside(setCancelable());
+ Window window = getDialog().getWindow();
+ int animationsRes = setAnimations();
+ if (animationsRes != 0 && animationsRes != -1) {
+ window.setWindowAnimations(animationsRes);
+ }
+ setCancelable(setCancelable());
+ //璁剧疆鑳屾櫙閫忔槑
+ window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+ int gravity = setGravity();
+
+ //鍗虫湭璁剧疆
+ if (gravity != -1 && gravity != 0) {
+ window.setGravity(gravity);
+ }
+ return super.onCreateView(inflater, container, savedInstanceState);
+ }
+
+ private int setGravity() {
+
+ return Gravity.CENTER;
+ }
+
+
+ private boolean setCancelable() {
+ return mDialogParams.isCancelable;
+ }
+ public MyWidgetDialog() {
+ this.mDialogParams = new DialogParams();
+ }
+ protected static class Builder{
+ private MyWidgetDialog dialog;
+ private DialogParams params;
+
+
+ public Builder(AppCompatActivity activity){
+ dialog = new MyWidgetDialog();
+ params = dialog.mDialogParams;
+ params.activity = activity;
+ }
+
+
+
+ public Builder setStyle(int val){
+ params.style = val;
+ return this;
+ }
+ public Builder setAnimations(int val) {
+ params.animations = val;
+ return this;
+ }
+
+ public Builder setContentView(@LayoutRes int val) {
+ params.contentView = val;
+ return this;
+ }
+
+ public Builder setCancelable(boolean val) {
+ params.isCancelable = val;
+ return this;
+ }
+
+ public MyWidgetDialog build() {
+ if (params.contentView == -1) {
+ throw new IllegalArgumentException("Please set setContentView");
+ }
+ dialog.show(params.activity, params.tag);
+ return dialog;
+ }
+
+ }
+
+ protected void show(AppCompatActivity activity) {
+ show(activity.getSupportFragmentManager(), activity.getClass().getSimpleName());
+ }
+
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/widget/StatusDialog.java b/app/src/main/java/safeluck/drive/evaluation/widget/StatusDialog.java
new file mode 100644
index 0000000..272820f
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/widget/StatusDialog.java
@@ -0,0 +1,171 @@
+package safeluck.drive.evaluation.widget;
+
+import android.graphics.PorterDuff;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+import safeluck.drive.evaluation.R;
+import safeluck.drive.evaluation.customview.MyDialog;
+
+/**
+ * DriveJudge
+ * Created by lzw on 2020/9/15. 10:42:53
+ * 閭锛�632393724@qq.com
+ * All Rights Saved! Chongqing AnYun Tech co. LTD
+ */
+public class StatusDialog extends MyWidgetDialog {
+
+ private static final String TAG = "StatusDialog";
+
+ private Handler mMainHandler = new Handler();
+ /**
+ * 鎴愬姛鎴栭敊璇�2绉掑悗dismiss
+ */
+ public static final int DELAY_TIME = 2000;
+ private Timer mDelayTimer;
+
+ public StatusDialog() {
+ super();
+ }
+
+ public static Builder with(AppCompatActivity activity) {
+ return new Builder(activity);
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ TextView tvDialogStatusContent = view.findViewById(R.id.tv_dialog_status_prompt);
+ ImageView imgDialogStatusShow = view.findViewById(R.id.img_dialog_status_show);
+ ProgressBar pbDialogStatusShow = view.findViewById(R.id.pb_dialog_status_show);
+
+ //鏇存崲鍦嗗舰杩涘害鏉￠鑹�
+ pbDialogStatusShow.getIndeterminateDrawable()
+ .setColorFilter(getResources().getColor(R.color.colorPrimaryDark), PorterDuff.Mode.SRC_ATOP);
+
+ //濉厖鏁版嵁
+ if (isNonEmpty(mDialogParams.prompt)) {
+ Log.i(TAG,""+mDialogParams.prompt);
+ tvDialogStatusContent.setText(mDialogParams.prompt);
+ }
+
+ switch (mDialogParams.type) {
+ case Type.ERROR:
+ pbDialogStatusShow.setVisibility(View.GONE);
+ imgDialogStatusShow.setVisibility(View.VISIBLE);
+ imgDialogStatusShow.setImageResource(R.mipmap.icon_dialog_error);
+ break;
+ case Type.SUCCESS:
+ pbDialogStatusShow.setVisibility(View.GONE);
+ imgDialogStatusShow.setVisibility(View.VISIBLE);
+ imgDialogStatusShow.setImageResource(R.mipmap.icon_dialog_success);
+ break;
+ case Type.PROGRESS:
+ imgDialogStatusShow.setVisibility(View.GONE);
+ pbDialogStatusShow.setVisibility(View.VISIBLE);
+ break;
+ }
+ }
+ public interface Type {
+
+ int PROGRESS = 0x000000000211;
+
+ int ERROR = 0x000000000985;
+
+ int SUCCESS = 0x00000000011;
+
+ }
+ @Override
+ protected int setLayoutRes() {
+ return R.layout.dialog_status;
+ }
+ @Override
+ public void dismiss() {
+ super.dismiss();
+ cancelTimer();
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ cancelTimer();
+ }
+ private void cancelTimer() {
+ if (mDelayTimer != null) {
+ mDelayTimer.cancel();
+ }
+ }
+
+ protected boolean setCancelable() {
+ return mDialogParams.isCancelable;
+ }
+ @Override
+ public void onStart() {
+ super.onStart();
+ /**
+ * 鏄剧ず瀹氭椂闂村悗鑷姩dismiss
+ */
+ if (mDialogParams.type == Type.SUCCESS || mDialogParams.type == Type.ERROR) {
+ cancelTimer();
+ mDelayTimer = new Timer();
+ mDelayTimer.schedule(new TimerTask() {
+ @Override
+ public void run() {
+ mMainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ dismiss();
+ }
+ });
+ }
+ }, DELAY_TIME);
+ }
+ }
+ public static class Builder {
+ AppCompatActivity activity;
+ DialogParams P;
+ StatusDialog progressDialog;
+
+ public Builder(AppCompatActivity activity) {
+ progressDialog = new StatusDialog();
+ this.P = progressDialog.mDialogParams;
+ this.activity = activity;
+ }
+
+ public Builder setPrompt(String val) {
+ P.prompt = val;
+ return this;
+ }
+
+ public Builder setCancelable(boolean val) {
+ P.isCancelable = val;
+ return this;
+ }
+
+ public Builder setType(int val) {
+ P.type = val;
+ return this;
+ }
+
+ public StatusDialog show() {
+ if (P.type == -1) {
+ throw new IllegalArgumentException("Please set type");
+ }
+ progressDialog.show(activity);
+ return progressDialog;
+ }
+
+ }
+}
diff --git a/app/src/main/res/drawable/background_alert_dialog.xml b/app/src/main/res/drawable/background_alert_dialog.xml
new file mode 100644
index 0000000..b81ddcd
--- /dev/null
+++ b/app/src/main/res/drawable/background_alert_dialog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <solid android:color="@color/dialog_background"/>
+ <corners android:radius="@dimen/dialog_corners"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_item_select.xml b/app/src/main/res/drawable/bg_item_select.xml
new file mode 100644
index 0000000..a213dc6
--- /dev/null
+++ b/app/src/main/res/drawable/bg_item_select.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+ <solid android:color="@color/color_0ab0ef" />
+ <corners android:radius="5dp" />
+</shape>
diff --git a/app/src/main/res/drawable/btn_item_collect_bg.xml b/app/src/main/res/drawable/btn_item_collect_bg.xml
new file mode 100644
index 0000000..2dcd8af
--- /dev/null
+++ b/app/src/main/res/drawable/btn_item_collect_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item android:state_pressed="true" android:drawable="@drawable/bg_item_select"></item>
+ <item android:drawable="@drawable/btn_exam_item_bg"></item>
+</selector>
diff --git a/app/src/main/res/layout/dialog_status.xml b/app/src/main/res/layout/dialog_status.xml
new file mode 100644
index 0000000..404d874
--- /dev/null
+++ b/app/src/main/res/layout/dialog_status.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:background="@drawable/background_alert_dialog"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintDimensionRatio="7:4"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintWidth_percent="0.6">
+
+ <ProgressBar
+ android:id="@+id/pb_dialog_status_show"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ app:layout_constraintBottom_toTopOf="@+id/gl_dialog_status_line"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.7"/>
+
+ <ImageView
+ android:id="@+id/img_dialog_status_show"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:scaleType="fitXY"
+ android:src="@mipmap/icon_dialog_success"
+ app:layout_constraintBottom_toTopOf="@+id/gl_dialog_status_line"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintHeight_percent="0.3"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.7"/>
+
+ <androidx.constraintlayout.widget.Guideline
+ android:id="@+id/gl_dialog_status_line"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ app:layout_constraintGuide_percent="0.6"/>
+
+ <TextView
+ android:id="@+id/tv_dialog_status_prompt"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="@dimen/dialog_margin_left_right"
+ android:layout_marginStart="@dimen/dialog_margin_left_right"
+ android:ellipsize="end"
+ android:gravity="center"
+ android:maxLines="1"
+ android:text="鍔犺浇涓��"
+ android:textColor="@android:color/black"
+ android:textSize="@dimen/dialog_text_size"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/gl_dialog_status_line"
+ app:layout_constraintVertical_bias="0.3"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_content.xml b/app/src/main/res/layout/fragment_content.xml
index 906b49a..d536773 100644
--- a/app/src/main/res/layout/fragment_content.xml
+++ b/app/src/main/res/layout/fragment_content.xml
@@ -2,10 +2,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="vertical">
- <TextView
+ android:orientation="vertical">
+<FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/fl_content_container"/>
+<!-- <TextView
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -24,6 +27,6 @@
android:layout_marginRight="16dp"
android:layout_marginTop="32dp"
android:textAllCaps="false"
- android:text="start_cycler"/>
+ android:text="start_cycler"/>-->
</LinearLayout>
diff --git a/app/src/main/res/layout/layout_input_dlg.xml b/app/src/main/res/layout/layout_input_dlg.xml
new file mode 100644
index 0000000..c5a856a
--- /dev/null
+++ b/app/src/main/res/layout/layout_input_dlg.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+
+ android:layout_height="wrap_content"
+ android:gravity="center"
+
+ android:background="@drawable/bg_select_dlg"
+ android:orientation="vertical" >
+<TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:textSize="@dimen/network_train_textsize20px"
+ android:textColor="@android:color/white"
+ android:layout_margin="@dimen/ui_margin_10dp"
+ android:text="绾胯矾鍚嶇О锛�"/>
+ <com.google.android.material.textfield.TextInputLayout
+ android:id="@+id/til_password"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="@dimen/ui_margin_10dp">
+
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/tiet_road_num"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="璇疯緭鍏ョ嚎璺悕绉�"
+ android:textColorHint="@android:color/white"
+ android:textColor="@android:color/white"
+ android:inputType="text"/>
+
+ </com.google.android.material.textfield.TextInputLayout>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ >
+ <Button
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:text="纭畾"
+ android:padding="@dimen/ui_margin_20dp"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:background="@drawable/bg_rgb_dlg"
+ android:textColor="@android:color/white"
+ android:id="@+id/btn_sure_"/>
+ <Button
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:padding="@dimen/ui_margin_20dp"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:text="鍙栨秷"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:visibility="gone"
+ android:background="@drawable/bg_rgb_dlg"
+ android:textColor="@android:color/white"
+ android:id="@+id/btn_cancle_"/>
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_project_collect.xml b/app/src/main/res/layout/layout_project_collect.xml
new file mode 100644
index 0000000..8dd5507
--- /dev/null
+++ b/app/src/main/res/layout/layout_project_collect.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" android:orientation="vertical"
+ android:background="@drawable/stu_score_bg">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="38dp"
+ android:background="@drawable/stu_score_title"
+ android:id="@+id/tv_item"
+ android:gravity="center_vertical"
+ android:textColor="#FFFFFF"
+ android:drawablePadding="5dp"
+ android:paddingLeft="19dp"
+ android:textSize="@dimen/network_train_textsize22px"
+ android:drawableLeft="@mipmap/duobianxing"
+ android:text="椤圭洰鍒楄〃"/>
+
+
+ <GridLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:columnCount="5"
+ android:orientation="horizontal"
+ android:rowCount="4">
+
+ <Button android:text="@string/pull_over"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_marginBottom="10dp"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:layout_rowWeight="1"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:background="@drawable/btn_item_collect_bg"
+ />
+
+ <Button android:text="@string/add_subtract"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
+
+ <Button android:text="@string/turn_around"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
+
+ <Button android:text="@string/by_crossing"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:background="@drawable/btn_item_collect_bg"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ />
+
+ <Button android:text="@string/lane_change"
+ android:layout_marginTop="@dimen/ui_margin_10dp"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
+
+ <Button android:text="@string/side_by_side"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:background="@drawable/btn_item_collect_bg"
+ />
+
+ <Button android:text="@string/over_take"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/school_area"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/bus_area"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/junction_left"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/junction_right"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/crosswalk"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:textColor="@color/color_ffffff"
+ android:layout_width="wrap_content"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="@string/straight_line"
+ android:textColor="@color/color_ffffff"
+ android:layout_columnWeight="1"
+ android:layout_rowWeight="1"
+ android:layout_marginLeft="@dimen/ui_margin_20dp"
+ android:layout_marginRight="@dimen/ui_margin_20dp"
+ android:layout_marginBottom="10dp"
+ android:background="@drawable/btn_item_collect_bg"/>
+ </GridLayout>
+
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/layout_road_collect.xml b/app/src/main/res/layout/layout_road_collect.xml
new file mode 100644
index 0000000..bfc3620
--- /dev/null
+++ b/app/src/main/res/layout/layout_road_collect.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/GridLayout1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:columnCount="4"
+ android:orientation="horizontal"
+ android:rowCount="6" >
+
+
+
+
+
+ <Button android:text="+" />
+
+ <Button android:text="1" />
+
+ <Button android:text="2" />
+
+ <Button android:text="3" />
+
+ <Button android:text="-" />
+
+ <Button android:text="4" />
+
+ <Button android:text="5" />
+
+ <Button android:text="6" />
+
+ <Button android:text="*" />
+
+ <Button android:text="7" />
+
+ <Button android:text="8" />
+
+ <Button android:text="9" android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="/" />
+
+ <Button
+ android:layout_width="wrap_content"
+ android:text="." />
+
+ <Button android:text="0" android:background="@drawable/btn_item_collect_bg"/>
+
+ <Button android:text="=" />
+
+</GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_select_dlg_three.xml b/app/src/main/res/layout/layout_select_dlg_three.xml
index 2216de2..07cc147 100644
--- a/app/src/main/res/layout/layout_select_dlg_three.xml
+++ b/app/src/main/res/layout/layout_select_dlg_three.xml
@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="260dp"
- android:layout_height="320dp"
+ android:layout_height="360dp"
android:gravity="center"
android:background="@drawable/bg_select_dlg"
@@ -46,6 +46,14 @@
android:text="璺�冨湴鍥�(涓嶅惈鐏厜)"
android:layout_marginLeft="@dimen/ui_margin_10dp"
android:textColor="@android:color/white"/>
+ <RadioButton
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/ui_margin_70dp"
+ android:id="@+id/rb4"
+ android:textSize="@dimen/network_train_textsize24px"
+ android:text="璺�冨湴鍥�(涓嶅惈鐏厜)"
+ android:layout_marginLeft="@dimen/ui_margin_10dp"
+ android:textColor="@android:color/white"/>
</RadioGroup>
diff --git a/app/src/main/res/layout/layout_train_fragment.xml b/app/src/main/res/layout/layout_train_fragment.xml
index 6dd57b8..15d8e93 100644
--- a/app/src/main/res/layout/layout_train_fragment.xml
+++ b/app/src/main/res/layout/layout_train_fragment.xml
@@ -8,13 +8,14 @@
>
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
android:id="@+id/ll"
android:orientation="vertical">
<include android:layout_marginBottom="2dp" android:layout_width="match_parent" android:layout_height="110dp" android:id="@+id/profile" layout="@layout/profile_layout"/>
- <include android:layout_marginBottom="2dp" android:layout_width="match_parent" android:layout_height="140dp" layout="@layout/layout_net_train"/>
+ <include android:layout_marginBottom="2dp" android:layout_width="match_parent" android:layout_height="140dp" layout="@layout/layout_net_train" android:visibility="gone" />
- <include android:layout_marginBottom="2dp" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_stu_score"/>
+ <include android:layout_marginBottom="2dp" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_stu_score" android:visibility="gone"/>
+ <include android:layout_marginBottom="2dp" android:layout_width="match_parent" android:layout_height="match_parent" layout="@layout/layout_project_collect"/>
</LinearLayout>
diff --git a/app/src/main/res/mipmap-xxhdpi/icon_dialog_error.png b/app/src/main/res/mipmap-xxhdpi/icon_dialog_error.png
new file mode 100644
index 0000000..47d7e5e
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/icon_dialog_error.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/icon_dialog_success.png b/app/src/main/res/mipmap-xxhdpi/icon_dialog_success.png
new file mode 100644
index 0000000..59fd30d
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/icon_dialog_success.png
Binary files differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 18e8a79..94e8976 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,6 +5,7 @@
<color name="colorAccent">#D81B60</color>
+ <color name="dialog_background">#ffffff</color>
<color name="home_bg_color">#137b98</color>
<color name="home_version_show">#b47242</color>
<color name="train_item_bg">#6a75be</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 8f6ea85..cc83eaa 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -22,4 +22,16 @@
<dimen name="ui_margin_45dp">45dp</dimen>
<dimen name="ui_margin_35dp">35dp</dimen>
<dimen name="ui_margin_70dp">70dp</dimen>
+
+
+ <dimen name="dialog_corners">12dp</dimen>
+
+ <dimen name="dialog_title_size">18sp</dimen>
+ <dimen name="dialog_text_size">18sp</dimen>
+ <dimen name="dialog_divider">0.5sp</dimen>
+ <dimen name="dialog_margin_left_right">25dp</dimen>
+ <dimen name="dialog_content_line_space">8dp</dimen>
+
+ <dimen name="dialog_item_image_height_width">60dp</dimen>
+
</resources>
\ No newline at end of file
--
Gitblit v1.8.0