From ce2026d324bbb975624bbf9edd67000c4dbb3cd5 Mon Sep 17 00:00:00 2001
From: 姚旭斌 <15805828761@163.com>
Date: Fri, 20 Apr 2018 18:12:59 +0800
Subject: [PATCH] no message

---
 app/libs/processor.jar                                                          | Bin 5681 -> 0 bytes
 app/src/main/java/com/shunzhi/parent/AppConfig.java                             | 14 +++++++-------
 app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java            |  4 +++-
 app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java | 78 +++++++++++++++++++++++++++++++++++++++---------------------------------------
 4 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/app/libs/processor.jar b/app/libs/processor.jar
index adae491..46b1996 100644
Binary files a/app/libs/processor.jar and b/app/libs/processor.jar differ
diff --git a/app/src/main/java/com/shunzhi/parent/AppConfig.java b/app/src/main/java/com/shunzhi/parent/AppConfig.java
index 967aab6..0f79642 100644
--- a/app/src/main/java/com/shunzhi/parent/AppConfig.java
+++ b/app/src/main/java/com/shunzhi/parent/AppConfig.java
@@ -39,16 +39,16 @@ public class AppConfig {
     public static String APP_IS_START = "app_is_start";
 
     //测试
-    public static String BASE_URL="http://60.190.202.57:1000/";
-    public static String BASE_URL_ORDER="http://60.190.202.57:8101/";
-    public static String BASE_URL_FILE="http://60.190.202.57:8196";
+//    public static String BASE_URL="http://60.190.202.57:1000/";
+//    public static String BASE_URL_ORDER="http://60.190.202.57:8101/";
+//    public static String BASE_URL_FILE="http://60.190.202.57:8196";
 
 
     //正式
-//    public static String BASE_URL="http://campus.myjxt.com/";
-//    public static String BASE_URL_ORDER="http://parent.myjxt.com/";
-//    public static String BASE_URL_FILE="http://manage.myjxt.com";
-//    public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3";
+    public static String BASE_URL="http://campus.myjxt.com/";
+    public static String BASE_URL_ORDER="http://parent.myjxt.com/";
+    public static String BASE_URL_FILE="http://manage.myjxt.com";
+    public static final String url_version = BASE_URL + "api/Common/AppVersion?appType=3";
 
 
     //默认日志保存的路径
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
index 6598594..18a072c 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
@@ -195,7 +195,9 @@ public class ReportFragment extends BaseMVPCompatFragment<MyChildContract.MyChil
                 }
                 tvName.setText(childBean.getStudentName());
             }
-            chengZhangFragment1.setChildJson(jsonStr);
+            if(chengZhangFragment1!=null) {
+                chengZhangFragment1.setChildJson(jsonStr);
+            }
             AppConfig.getAppConfig(AppContext.getInstance()).set(AppConfig.CURRCHILDJSONSTR, jsonStr);
             createSchoolMenu();
         }
diff --git a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
index 3f110ec..2b0a4ba 100644
--- a/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
+++ b/app/src/main/java/com/shunzhi/parent/ui/fragment/report/ChengZhangFragment.java
@@ -102,7 +102,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
         show();
     }
 
-    private void show(){
+    private void show() {
         Gson g = new Gson();
         if (type.equals(TYPE_CHENGZHANG)) {
             layout_chengzhang.setVisibility(View.VISIBLE);
@@ -174,43 +174,43 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
 
     @Override
     public void onClick(View view) {
-//        if (childBean.getCount() == 0) {
-//            final PopupWindow popupWindow = new PopupWindow();
-//            popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
-//            popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
-//            backgroundAlpha(0.5f);
-//            View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
-//            TextView dialog_info = view1.findViewById(R.id.dialog_info);
-//            dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能");
-//            dialog_info.setGravity(Gravity.CENTER);
-//            TextView right_btn = view1.findViewById(R.id.right_btn);
-//            right_btn.setText("前往订购");
-//            right_btn.setOnClickListener(new View.OnClickListener() {
-//                @Override
-//                public void onClick(View v) {
-//                    popupWindow.dismiss();
-//                    backgroundAlpha(1f);
-//                    Bundle bundle = new Bundle();
-//                    bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
-//                            AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
-//                    bundle.putInt("type", AppConfig.ORDER_CENTER);
-//                    startNewActivity(WebViewActivity.class, bundle);
-//
-//                }
-//            });
-//            TextView cancel_btn = view1.findViewById(R.id.cancel_btn);
-//            cancel_btn.setOnClickListener(new View.OnClickListener() {
-//                @Override
-//                public void onClick(View v) {
-//                    popupWindow.dismiss();
-//                    backgroundAlpha(1f);
-//                }
-//            });
-//
-//            popupWindow.setContentView(view1);
-//            popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0);
-//            return;
-//        }
+        if (childBean.getCount() == 0) {
+            final PopupWindow popupWindow = new PopupWindow();
+            popupWindow.setWidth(ViewGroup.LayoutParams.WRAP_CONTENT);
+            popupWindow.setHeight(ViewGroup.LayoutParams.WRAP_CONTENT);
+            backgroundAlpha(0.5f);
+            View view1 = LayoutInflater.from(getActivity()).inflate(R.layout.dialog_view, null);
+            TextView dialog_info = view1.findViewById(R.id.dialog_info);
+            dialog_info.setText("请前往订购中心\n订购“智能校卫”\n才能够使用相关应用功能");
+            dialog_info.setGravity(Gravity.CENTER);
+            TextView right_btn = view1.findViewById(R.id.right_btn);
+            right_btn.setText("前往订购");
+            right_btn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    popupWindow.dismiss();
+                    backgroundAlpha(1f);
+                    Bundle bundle = new Bundle();
+                    bundle.putString("url", AppConfig.BASE_URL_ORDER + "ParentOrderCenter.aspx?userid=" +
+                            AppConfig.getAppConfig(getContext()).get(AppConfig.USER_ID));
+                    bundle.putInt("type", AppConfig.ORDER_CENTER);
+                    startNewActivity(WebViewActivity.class, bundle);
+
+                }
+            });
+            TextView cancel_btn = view1.findViewById(R.id.cancel_btn);
+            cancel_btn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    popupWindow.dismiss();
+                    backgroundAlpha(1f);
+                }
+            });
+
+            popupWindow.setContentView(view1);
+            popupWindow.showAtLocation(recyclerView, Gravity.CENTER, 0, 0);
+            return;
+        }
 
         if (TextUtils.isEmpty(childBean.getCardNumber())) {
 
@@ -253,7 +253,7 @@ public class ChengZhangFragment extends BaseMVPCompatFragment<ReportContract.Rep
     }
 
     public void setChildJson(String jsonStr) {
-        this.jsonStr=jsonStr;
+        this.jsonStr = jsonStr;
         show();
     }
 }
--
libgit2 0.21.0