Merge branch 'dev' of wangchaoqun/ich-android into dev

app/build.gradle

@@ -45,6 +45,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             buildConfigField "String", "EMQX_HOST", "\"tcp://183.3.221.143:1883\""
             buildConfigField "String", "ICSP_HOST", "\"http://icsp-testend.ds-bay.com\""
+            //buildConfigField "String", "ICSP_HOST", "\"http://vc7y2k.natappfree.cc\""
         }
     }
     compileOptions {

app/src/main/java/com/emato/ich/MainActivity.java

@@ -128,8 +128,12 @@ public class MainActivity extends AppCompatActivity  {
         MessageHandler.executeShell(ichSubscribeClient, ichPublishClient);
         List<String> list = new ArrayList<>();
         Banner.init(new ImageFactory());
-        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MW7GaAKBJZAAFsNNDnV10679.jpg");
+//        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MW7GaAKBJZAAFsNNDnV10679.jpg");
 //        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MW7GaAbB0vAAqanlvlafA572.jpg");
+        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MYfDaAKEKAAANp3QGoGwQ251.jpg");
+        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MYfDaAIyukAATXUZaFRD4817.jpg");
+        list.add("http://183.3.221.143/group1/M00/00/09/twPdj2MYfDaAPiodAAL86B3X1Mk613.jpg");
+
 
         banner = findViewById(R.id.banner);
 

app/src/main/java/com/emato/ich/fragment/ExceptionFragment.java

@@ -232,7 +232,24 @@ public class ExceptionFragment extends Fragment {
                                                             break;
                                                         case DecisionConstant.REOPEN_02:
                                                             // 门没开换柜门
+                                                            // 更新柜门信息 跳转到成功页面
+                                                            // 响应信息
+                                                            if (responseData.getCode().equals(ICSPConstant.OK)) {
+                                                                bundle.putString("preparedOrderResponse", objectMapper.writeValueAsString(data));
 
+                                                                // 跳转到确认投递
+                                                                try {
+//                                                                    MainActivity activity = (MainActivity) getActivity();
+//                                                                    activity.getBundleMap().put(InputInfoKeyBoardFragment.class.getName(), bundle);
+                                                                } catch (RuntimeException e) {
+                                                                    Log.e(TAG, "onResponse: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
+                                                                    LoggingUtils.sendErrorLog("业务异常: InputInfoFragment页面获取SendInfoConfirmFragment传值错误! ", e);
+                                                                }
+                                                                if (null != timer) {
+                                                                    timer.cancel();
+                                                                }
+                                                                NavUtils.navigate(ExceptionFragment.this, R.id.action_InputInfoKeyBoardFragment_to_sendInfoConfirmFragment);
+                                                            }
                                                             break;
                                                         case DecisionConstant.REOPEN_03:
                                                             // 门没开再开一次

app/src/main/res/navigation/nav_graph.xml

@@ -155,6 +155,9 @@
         <action
             android:id="@+id/action_exceptionFragment_to_sendSuccessFragment"
             app:destination="@id/SendSuccessFragment"/>
+        <action
+            android:id="@+id/action_InputInfoKeyBoardFragment_to_sendInfoConfirmFragment"
+            app:destination="@id/SendInfoConfirmFragment" />
     </fragment>
 
     <!--  投递确认页面  -->